diff options
author | arcadia-devtools <arcadia-devtools@yandex-team.ru> | 2022-02-11 11:49:58 +0300 |
---|---|---|
committer | arcadia-devtools <arcadia-devtools@yandex-team.ru> | 2022-02-11 11:49:58 +0300 |
commit | 40a7214ee0ade2d35b5a1757c23879ff41eb9056 (patch) | |
tree | eb78860d6a4ce3be4839d6cc85f1dd1274edfd6a | |
parent | c184e3cffe4bd92b3a1a6a778320079f53b1d7a1 (diff) | |
download | ydb-40a7214ee0ade2d35b5a1757c23879ff41eb9056.tar.gz |
intermediate changes
ref:43184b1711d28748420ba5df5d86c8e37ddfd7c5
-rw-r--r-- | build/platform/cuda/ya.make | 8 | ||||
-rw-r--r-- | build/ya.conf.json | 2 | ||||
-rw-r--r-- | build/ymake.core.conf | 1 | ||||
-rwxr-xr-x | build/ymake_conf.py | 2 | ||||
-rw-r--r-- | contrib/libs/apache/ya.make | 1 | ||||
-rw-r--r-- | contrib/libs/ya.make | 1 |
6 files changed, 4 insertions, 11 deletions
diff --git a/build/platform/cuda/ya.make b/build/platform/cuda/ya.make index 3615f682cd9..7ce728ced76 100644 --- a/build/platform/cuda/ya.make +++ b/build/platform/cuda/ya.make @@ -15,12 +15,6 @@ IF (USE_ARCADIA_CUDA) DECLARE_EXTERNAL_RESOURCE(CUDA sbr:2410761119) # CUDA Toolkit 11.4.2 for Linux x86-64 ELSEIF (CUDA_VERSION == "11.3") DECLARE_EXTERNAL_RESOURCE(CUDA sbr:2213063565) # CUDA Toolkit 11.3.1 for Linux x86-64 - ELSEIF (CUDA_VERSION == "11.2") - DECLARE_EXTERNAL_RESOURCE(CUDA sbr:2073566375) # CUDA Toolkit 11.2.2 for Linux x86-64 - ELSEIF (CUDA_VERSION == "11.1") - DECLARE_EXTERNAL_RESOURCE(CUDA sbr:1882836946) # CUDA Toolkit 11.1.1 for Linux x86-64 - ELSEIF (CUDA_VERSION == "11.0") - DECLARE_EXTERNAL_RESOURCE(CUDA sbr:1647896014) # CUDA Toolkit 11.0.2 for Linux x86-64 ELSEIF (CUDA_VERSION == "10.1") DECLARE_EXTERNAL_RESOURCE(CUDA sbr:2077988857) # CUDA Toolkit 10.1.168 for Linux x86-64 ELSE() @@ -64,8 +58,6 @@ IF (USE_ARCADIA_CUDA) IF (OS_WINDOWS AND ARCH_X86_64) IF (CUDA_VERSION == "11.3") DECLARE_EXTERNAL_RESOURCE(CUDA sbr:2215101513) # CUDA Toolkit 11.3.1 for Windows x86-64 - ELSEIF (CUDA_VERSION == "11.1") - DECLARE_EXTERNAL_RESOURCE(CUDA sbr:1896564605) # CUDA Toolkit 11.1.1 for Windows x86-64 ELSEIF (CUDA_VERSION == "10.1") DECLARE_EXTERNAL_RESOURCE(CUDA sbr:978734165) # CUDA Toolkit 10.1.168 for Windows x86-64 ELSE() diff --git a/build/ya.conf.json b/build/ya.conf.json index 0696b0694af..dc68872e1b4 100644 --- a/build/ya.conf.json +++ b/build/ya.conf.json @@ -6827,7 +6827,7 @@ "yp-util": { "formula": { "sandbox_id": [ - 1211019862 + 1211926728 ], "match": "yp_util" }, diff --git a/build/ymake.core.conf b/build/ymake.core.conf index 460c9e6aed2..99610f88146 100644 --- a/build/ymake.core.conf +++ b/build/ymake.core.conf @@ -6991,6 +6991,7 @@ macro SYMLINK(From, To) { ### Note that Tool is always built for the host platform, so be careful to provide that tool can be built for all Arcadia major host platforms (Linux, MacOS and Windows). macro RUN_PROGRAM(Tool, IN{input}[], OUT{output}[], OUT_NOAUTO{output}[], TOOL{tool}[], OUTPUT_INCLUDES[], IN_DEPS[], STDOUT="", STDOUT_NOAUTO="", CWD="", ENV[], REQUIREMENTS[], Args...) { .CMD=${cwd:CWD} ${env:ENV} ${tool:Tool} $Args ${input;hide:IN} ${input;hide:IN_DEPS} ${output_include;hide:OUTPUT_INCLUDES} ${tool;hide:TOOL} ${output;hide:OUT} ${output;noauto;hide:OUT_NOAUTO} ${output;stdout:STDOUT} ${output;stdout;noauto:STDOUT_NOAUTO} ${requirements;hide:REQUIREMENTS} ${requirements;hide:"network:restricted"} ${kv;hide:"p PR"} ${kv;hide:"pc yellow"} ${kv;hide:"show_out"} + .SEM=add_custom_command OUTPUT ${output:OUT} ${output;noauto:OUT_NOAUTO} ${output:STDOUT} ${output;noauto:STDOUT_NOAUTO} DEPENDS ${input:IN} ${tool:Tool} ${tool:TOOL} ${pre=WORKING_DIRECTORY :CWD} COMMAND ${tool:Tool} $Args ${pre=> :STDOUT} ${pre=> :STDOUT_NOAUTO} } # tag:lua-specific diff --git a/build/ymake_conf.py b/build/ymake_conf.py index 30219eb85ed..6392a087d49 100755 --- a/build/ymake_conf.py +++ b/build/ymake_conf.py @@ -3079,7 +3079,7 @@ class Cuda(object): if self.cuda_version.value in ('8.0', '9.0', '9.1', '9.2', '10.0'): raise ConfigureError('CUDA versions 8.x, 9.x and 10.0 are no longer supported.\nSee DEVTOOLS-7108.') - if self.cuda_version.value in ('10.1', '11.0', '11.1', '11.2', '11.3', '11.4'): + if self.cuda_version.value in ('10.1', '11.3', '11.4'): return True return False diff --git a/contrib/libs/apache/ya.make b/contrib/libs/apache/ya.make index 0a05eec0976..528ffbe5e34 100644 --- a/contrib/libs/apache/ya.make +++ b/contrib/libs/apache/ya.make @@ -4,6 +4,7 @@ OWNER( ) RECURSE( + apr-util arrow avro orc diff --git a/contrib/libs/ya.make b/contrib/libs/ya.make index 62088154b3f..bbbea3eba36 100644 --- a/contrib/libs/ya.make +++ b/contrib/libs/ya.make @@ -8,7 +8,6 @@ RECURSE( antlr4_cpp_runtime apache apr - apr-util asio asmlib authparser |