Browse Source

Restoring authorship annotation for <shadchin@yandex-team.ru>. Commit 1 of 2.

shadchin 3 years ago
parent
commit
2598ef1d0a

+ 1 - 1
build/conf/license.conf

@@ -228,7 +228,7 @@ LICENSES_PERMISSIVE= \
     BSD-derived \
     BSD-ORIGINAL-UC-1986 \
     BSD-Source-Code \
-    Bsd-Simplified-Darwin \
+    Bsd-Simplified-Darwin \ 
     Bsd-Unchanged \
     Bsd-Unmodified \
     bzip2-1.0.6 \

+ 1 - 1
build/config/tests/flake8/flake8.conf

@@ -27,7 +27,7 @@ ignore =
     E731,  # do not assign a lambda expression, use a def
     E741,  # do not use variables named 'l', 'O', or 'I'
 
-    F722,  # syntax error in forward annotation
+    F722,  # syntax error in forward annotation 
 
     W503,  # line break before binary operator
     W504,  # line break after binary operator

+ 5 - 5
build/external_resources/flake8_py2/ya.make

@@ -13,11 +13,11 @@ ENDIF()
 
 DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE(
     FLAKE8_PY2
-    sbr:2488549842 FOR DARWIN-ARM64
-    sbr:2488553184 FOR DARWIN
-    sbr:2488550572 FOR LINUX-PPC64LE
-    sbr:2488555532 FOR LINUX
-    sbr:2488554786 FOR WIN32
+    sbr:2488549842 FOR DARWIN-ARM64 
+    sbr:2488553184 FOR DARWIN 
+    sbr:2488550572 FOR LINUX-PPC64LE 
+    sbr:2488555532 FOR LINUX 
+    sbr:2488554786 FOR WIN32 
 )
 
 END()

+ 5 - 5
build/external_resources/flake8_py3/ya.make

@@ -13,11 +13,11 @@ ENDIF()
 
 DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE(
     FLAKE8_PY3
-    sbr:2617984240 FOR DARWIN-ARM64
-    sbr:2617985759 FOR DARWIN
-    sbr:2617984621 FOR LINUX-PPC64LE
-    sbr:2617987339 FOR LINUX
-    sbr:2617986064 FOR WIN32
+    sbr:2617984240 FOR DARWIN-ARM64 
+    sbr:2617985759 FOR DARWIN 
+    sbr:2617984621 FOR LINUX-PPC64LE 
+    sbr:2617987339 FOR LINUX 
+    sbr:2617986064 FOR WIN32 
 )
 
 END()

+ 7 - 7
build/platform.md

@@ -5,19 +5,19 @@
   Clang 9.0.8, Android NDK r21b. API 16 for the 32-bit platforms, API 21 for 64-bit.
 * `darwin`
   * `x86_64`  
-  Clang 12.0.0, macOS SDK 10.13
-  * `arm64`  
-  Clang 12.0.0, macOS SDK ???
+  Clang 12.0.0, macOS SDK 10.13 
+  * `arm64`   
+  Clang 12.0.0, macOS SDK ??? 
 * `ios`  
   * `i386`, `x86_64`, `armv7`, `arm64`  
-     Clang 12.0.0, iOS SDK and iOS Simulator SDK 11.1
+     Clang 12.0.0, iOS SDK and iOS Simulator SDK 11.1 
 * `linux`  
   * `x86_64`  
-  Clang 12.0.0, Ubuntu Linux 14.04 x86-64 SDK
+  Clang 12.0.0, Ubuntu Linux 14.04 x86-64 SDK 
   * `aarch64`  
-  Clang 12.0.0, Ubuntu Linux 16.04 aarch64 SDK
+  Clang 12.0.0, Ubuntu Linux 16.04 aarch64 SDK 
   * `ppc64le`  
-  Clang 12.0.0, Ubuntu Linux 14.04 ppc64le SDK
+  Clang 12.0.0, Ubuntu Linux 14.04 ppc64le SDK 
 * `win`
   * `i686`, `x86_64`  
     Microsoft Visual C++ 2017 14.16.27023, Windows Kits 10.0.16299.0

+ 16 - 16
build/platform/cuda/ya.make

@@ -14,14 +14,14 @@ IF (USE_ARCADIA_CUDA)
             IF (CUDA_VERSION == "11.4")
                 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: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")
+            ELSEIF (CUDA_VERSION == "10.1") 
                 DECLARE_EXTERNAL_RESOURCE(CUDA sbr:2077988857) # CUDA Toolkit 10.1.168 for Linux x86-64
             ELSE()
                 ENABLE(CUDA_NOT_FOUND)
@@ -40,7 +40,7 @@ IF (USE_ARCADIA_CUDA)
 
     ELSEIF (HOST_OS_LINUX AND HOST_ARCH_PPC64LE)
         IF (OS_LINUX AND ARCH_PPC64LE)
-            IF (CUDA_VERSION == "10.1")
+            IF (CUDA_VERSION == "10.1") 
                 DECLARE_EXTERNAL_RESOURCE(CUDA sbr:1586537264) # CUDA Toolkit 10.1.168 for Linux ppc64le
             ELSE()
                 ENABLE(CUDA_NOT_FOUND)
@@ -52,7 +52,7 @@ IF (USE_ARCADIA_CUDA)
 
     ELSEIF (HOST_OS_DARWIN AND HOST_ARCH_X86_64)
         IF (OS_DARWIN AND ARCH_X86_64)
-            IF (CUDA_VERSION == "10.1")
+            IF (CUDA_VERSION == "10.1") 
                 DECLARE_EXTERNAL_RESOURCE(CUDA sbr:978727023) # CUDA Toolkit 10.1.168 for macOS x86-64
             ENDIF()
 
@@ -62,11 +62,11 @@ IF (USE_ARCADIA_CUDA)
 
     ELSEIF (HOST_OS_WINDOWS AND HOST_ARCH_X86_64)
         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")
+            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")
+            ELSEIF (CUDA_VERSION == "10.1") 
                 DECLARE_EXTERNAL_RESOURCE(CUDA sbr:978734165) # CUDA Toolkit 10.1.168 for Windows x86-64
             ELSE()
                 ENABLE(CUDA_NOT_FOUND)
@@ -84,10 +84,10 @@ ENDIF()
 IF (USE_ARCADIA_CUDA_HOST_COMPILER)
     IF (HOST_OS_LINUX AND HOST_ARCH_X86_64)
         IF (OS_LINUX AND ARCH_X86_64)
-            DECLARE_EXTERNAL_RESOURCE(CUDA_HOST_TOOLCHAIN sbr:1886578148) # Clang 11.0.0 for linux-x86_64
-            IF (CUDA_VERSION VERSION_LT "11.2")
-                # Equivalent to nvcc -allow-unsupported-compiler (present since 11.0).
-                CFLAGS(GLOBAL "-D__NV_NO_HOST_COMPILER_CHECK")
+            DECLARE_EXTERNAL_RESOURCE(CUDA_HOST_TOOLCHAIN sbr:1886578148) # Clang 11.0.0 for linux-x86_64 
+            IF (CUDA_VERSION VERSION_LT "11.2") 
+                # Equivalent to nvcc -allow-unsupported-compiler (present since 11.0). 
+                CFLAGS(GLOBAL "-D__NV_NO_HOST_COMPILER_CHECK") 
             ENDIF()
         ELSEIF(OS_LINUX AND ARCH_AARCH64)
             DECLARE_EXTERNAL_RESOURCE(CUDA_HOST_TOOLCHAIN sbr:1886578148) # Clang 11.0.0 for linux-x86_64
@@ -97,7 +97,7 @@ IF (USE_ARCADIA_CUDA_HOST_COMPILER)
 
     ELSEIF (HOST_OS_LINUX AND HOST_ARCH_PPC64LE)
         IF (OS_LINUX AND ARCH_PPC64LE)
-            IF (CUDA_VERSION == "10.1")
+            IF (CUDA_VERSION == "10.1") 
                 DECLARE_EXTERNAL_RESOURCE(CUDA_HOST_TOOLCHAIN sbr:1566513994) # Clang 7.0 for Linux ppc64le (not latest)
             ELSE()
                 ENABLE(CUDA_HOST_COMPILER_NOT_FOUND)
@@ -110,7 +110,7 @@ IF (USE_ARCADIA_CUDA_HOST_COMPILER)
     ELSEIF (HOST_OS_DARWIN AND HOST_ARCH_X86_64)
         IF (OS_DARWIN AND ARCH_X86_64)
             SET(__XCODE_RESOURCE_NAME CUDA_HOST_TOOLCHAIN)
-            IF (CUDA_VERSION == "10.1")
+            IF (CUDA_VERSION == "10.1") 
                 SET(__XCODE_TOOLCHAIN_VERSION "9.2") # (not latest)
             ELSE()
                 SET(__XCODE_TOOLCHAIN_VERSION "")
@@ -129,7 +129,7 @@ IF (USE_ARCADIA_CUDA_HOST_COMPILER)
             # devtools/tools_build/pack_sdk.py msvc out.tar
             # Note: it will contain patched "VC/Auxiliary/Build/vcvarsall.bat"
             # to prevent "nvcc fatal   : Host compiler targets unsupported OS."
-            IF (CUDA_HOST_MSVC_VERSION == "14.28.29910")
+            IF (CUDA_HOST_MSVC_VERSION == "14.28.29910") 
                 DECLARE_EXTERNAL_RESOURCE(CUDA_HOST_TOOLCHAIN sbr:2153212401)
             ELSE()
                 MESSAGE(FATAL_ERROR "Unexpected or unspecified Microsoft Visual C++ CUDA host compiler version")

+ 24 - 24
build/platform/lld/ya.make

@@ -4,13 +4,13 @@ LICENSE(Service-Prebuilt-Tool)
 
 OWNER(somov)
 
-IF (USE_LTO OR USE_THINLTO)
-    IF (CLANG7 OR CLANG8)
+IF (USE_LTO OR USE_THINLTO) 
+    IF (CLANG7 OR CLANG8) 
         # Use LLD 8 for old Clang because its IR code fails LLD 11 validation.
         ENABLE(USE_LLD8)
-    ELSEIF (CLANG11)
-        # DEVTOOLSSUPPORT-9065
-        ENABLE(USE_LLD11)
+    ELSEIF (CLANG11) 
+        # DEVTOOLSSUPPORT-9065 
+        ENABLE(USE_LLD11) 
     ENDIF()
 ENDIF()
 
@@ -29,31 +29,31 @@ ELSEIF (USE_LLD8)
     ENDIF()
 
     LDFLAGS("-fuse-ld=$LLD_ROOT_RESOURCE_GLOBAL/ld")
-ELSEIF (USE_LLD11)
-    IF (HOST_OS_LINUX)
-        IF (HOST_ARCH_PPC64LE)
-            DECLARE_EXTERNAL_RESOURCE(LLD_ROOT sbr:1843381106)
-        ELSE()
-            DECLARE_EXTERNAL_RESOURCE(LLD_ROOT sbr:1843327433)
-        ENDIF()
-    ELSEIF (HOST_OS_DARWIN)
-        DECLARE_EXTERNAL_RESOURCE(LLD_ROOT sbr:1843327928)
-    ENDIF()
-
-    LDFLAGS("-fuse-ld=$LLD_ROOT_RESOURCE_GLOBAL/ld" "-Wl,--no-rosegment")
+ELSEIF (USE_LLD11) 
+    IF (HOST_OS_LINUX) 
+        IF (HOST_ARCH_PPC64LE) 
+            DECLARE_EXTERNAL_RESOURCE(LLD_ROOT sbr:1843381106) 
+        ELSE() 
+            DECLARE_EXTERNAL_RESOURCE(LLD_ROOT sbr:1843327433) 
+        ENDIF() 
+    ELSEIF (HOST_OS_DARWIN) 
+        DECLARE_EXTERNAL_RESOURCE(LLD_ROOT sbr:1843327928) 
+    ENDIF() 
+ 
+    LDFLAGS("-fuse-ld=$LLD_ROOT_RESOURCE_GLOBAL/ld" "-Wl,--no-rosegment") 
 ELSE()
     IF (HOST_OS_LINUX)
         IF (HOST_ARCH_PPC64LE)
-            DECLARE_EXTERNAL_RESOURCE(LLD_ROOT sbr:2283417120)
+            DECLARE_EXTERNAL_RESOURCE(LLD_ROOT sbr:2283417120) 
         ELSE()
-            DECLARE_EXTERNAL_RESOURCE(LLD_ROOT sbr:2283360772)
+            DECLARE_EXTERNAL_RESOURCE(LLD_ROOT sbr:2283360772) 
         ENDIF()
     ELSEIF (HOST_OS_DARWIN)
-        IF (HOST_ARCH_ARM64)
-            DECLARE_EXTERNAL_RESOURCE(LLD_ROOT sbr:2283439721)
-        ELSE()
-            DECLARE_EXTERNAL_RESOURCE(LLD_ROOT sbr:2283429958)
-        ENDIF()
+        IF (HOST_ARCH_ARM64) 
+            DECLARE_EXTERNAL_RESOURCE(LLD_ROOT sbr:2283439721) 
+        ELSE() 
+            DECLARE_EXTERNAL_RESOURCE(LLD_ROOT sbr:2283429958) 
+        ENDIF() 
     ENDIF()
 
     LDFLAGS("-fuse-ld=$LLD_ROOT_RESOURCE_GLOBAL/ld" "-Wl,--no-rosegment")

+ 5 - 5
build/platform/python/python27/ya.make

@@ -8,11 +8,11 @@ OWNER(
 INCLUDE(${ARCADIA_ROOT}/build/platform/python/resources.inc)
 
 IF (OS_LINUX)
-    IF (ARCH_ARM64 OR ARCH_AARCH64)
-        DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON27 ${PYTHON27_LINUX_ARM64})
-    ELSE()
-        DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON27 ${PYTHON27_LINUX})
-    ENDIF()
+    IF (ARCH_ARM64 OR ARCH_AARCH64) 
+        DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON27 ${PYTHON27_LINUX_ARM64}) 
+    ELSE() 
+        DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON27 ${PYTHON27_LINUX}) 
+    ENDIF() 
 ELSEIF (OS_DARWIN)
     DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON27 ${PYTHON27_DARWIN})
 ELSEIF (OS_WINDOWS)

+ 17 - 17
build/platform/python/python39/ya.make

@@ -1,22 +1,22 @@
-RESOURCES_LIBRARY()
-
-OWNER(
-    g:contrib
-    g:yatool
-)
-
-INCLUDE(${ARCADIA_ROOT}/build/platform/python/resources.inc)
-
-IF (OS_LINUX)
-    DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON39 ${PYTHON39_LINUX})
-ELSEIF (OS_DARWIN)
+RESOURCES_LIBRARY() 
+ 
+OWNER( 
+    g:contrib 
+    g:yatool 
+) 
+ 
+INCLUDE(${ARCADIA_ROOT}/build/platform/python/resources.inc) 
+ 
+IF (OS_LINUX) 
+    DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON39 ${PYTHON39_LINUX}) 
+ELSEIF (OS_DARWIN) 
     IF (ARCH_ARM64)
         DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON39 ${PYTHON39_DARWIN_ARM64})
     ELSEIF(ARCH_X86_64)
         DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON39 ${PYTHON39_DARWIN})
     ENDIF()
-ELSEIF (OS_WINDOWS)
-    DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON39 ${PYTHON39_WINDOWS})
-ENDIF()
-
-END()
+ELSEIF (OS_WINDOWS) 
+    DECLARE_EXTERNAL_RESOURCE(EXTERNAL_PYTHON39 ${PYTHON39_WINDOWS}) 
+ENDIF() 
+ 
+END() 

+ 3 - 3
build/platform/python/readme.md

@@ -25,7 +25,7 @@
 6. `for path in $(ls packages); do ar -xf packages/$path; tar -xf data.tar.xz; done;`
 7. `mv usr python`
 8. `tar -czf python{PYTHON_VERSION}_linux.tar.gz python`
-9. `ya upload python{PYTHON_VERSION}_linux.tar.gz -d "Ubuntu {UBUNTU_VERSION} x86_64 python{PYTHON_VERSION} installation" --do-not-remove`
+9. `ya upload python{PYTHON_VERSION}_linux.tar.gz -d "Ubuntu {UBUNTU_VERSION} x86_64 python{PYTHON_VERSION} installation" --do-not-remove` 
 
 UBUNTU_VERSION - версия ubuntu, на которой майнился системный питон
 
@@ -40,7 +40,7 @@ UBUNTU_VERSION - версия ubuntu, на которой майнился си
     3. `python/Python.framework/Python -> Versions/Current/Python`
     4. `python/Python.framework/Resources -> Versions/Current/Resources`
 6. `tar -czf python{PYTHON_VERSION}_darwin.tar.gz python`
-7. `ya upload python{PYTHON_VERSION}_darwin.tar.gz -d "Darwin x86_64 python{PYTHON_VERSION} installation" --do-not-remove`
+7. `ya upload python{PYTHON_VERSION}_darwin.tar.gz -d "Darwin x86_64 python{PYTHON_VERSION} installation" --do-not-remove` 
 
 Если нужного питона нет в системе, его нужно установить из `python.org`, его установку можно найти в стандартном месте.
 
@@ -52,7 +52,7 @@ UBUNTU_VERSION - версия ubuntu, на которой майнился си
 2. Устанавливаем нужную версию питона из `python.org`
 3. Копируем содержимое установки питона в директорию `python`
 4. Пакуем директорию `python` в `python{PYTHON_VERSION}_windows.tar.gz`
-5. `ya upload python{PYTHON_VERSION}_windows.tar.gz -d "Windows x86_64 python{PYTHON_VERSION} installation" --do-not-remove`
+5. `ya upload python{PYTHON_VERSION}_windows.tar.gz -d "Windows x86_64 python{PYTHON_VERSION} installation" --do-not-remove` 
 
 ## Добавляем бандлы системного питона в сборку
 

Some files were not shown because too many files changed in this diff