diff --git a/.circleci/cimodel/data/binary_build_data.py b/.circleci/cimodel/data/binary_build_data.py index 4c212a73a73..cdda39667d9 100644 --- a/.circleci/cimodel/data/binary_build_data.py +++ b/.circleci/cimodel/data/binary_build_data.py @@ -60,8 +60,18 @@ CONFIG_TREE_DATA = OrderedDict( ) +# Why is this an option? +# All the nightlies used to be devtoolset3 and built with the old gcc ABI. We +# added a devtoolset7 option so that we could build nightlies with the new gcc +# ABI. That didn't work since devtoolset7 can't build with the new gcc ABI. But +# then we set devtoolset7 to be the default anyways, since devtoolset7 +# understands avx512, which is needed for good fbgemm performance. +# This should be removed. The base dockers should just be upgraded to +# devtoolset7 so we don't have to reinstall this in every build job. +# The same machinery that this uses, though, should be retooled for a different +# compiler toolchain that can build with the new gcc ABI. DEVTOOLSET_VERSIONS = [ - 3, + 7, ] @@ -102,7 +112,7 @@ class PackageFormatConfigNode(ConfigNode): self.props["package_format"] = package_format def get_children(self): - if self.find_prop("os_name") == "linux" and self.find_prop("package_format") != "conda": + if self.find_prop("os_name") == "linux": return [LinuxGccConfigNode(self, v) for v in DEVTOOLSET_VERSIONS] else: return [ArchConfigNode(self, v) for v in self.find_prop("cuda_versions")] diff --git a/.circleci/cimodel/data/dimensions.py b/.circleci/cimodel/data/dimensions.py index 1f54fdbd20c..965399ac6b4 100644 --- a/.circleci/cimodel/data/dimensions.py +++ b/.circleci/cimodel/data/dimensions.py @@ -5,7 +5,7 @@ PHASES = ["build", "test"] CUDA_VERSIONS = [ None, # cpu build - "90", + "92", "100", ] diff --git a/.circleci/config.yml b/.circleci/config.yml index 6066fe71528..48b69bc4fbb 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -467,23 +467,18 @@ binary_linux_build: &binary_linux_build retry yum -q -y install epel-release retry yum -q -y install expect moreutils - run: - name: Upgrade gcc version (based on env var) + name: Update compiler to devtoolset7 command: | set -eux -o pipefail source /env if [[ "$DESIRED_DEVTOOLSET" == 'devtoolset7' ]]; then - source "/builder/upgrade_gcc_abi.sh" + source "/builder/update_compiler.sh" # Env variables are not persisted into the next step echo "export PATH=$PATH" >> /env echo "export LD_LIBRARY_PATH=$LD_LIBRARY_PATH" >> /env - - # We need to set this variable manually because - # https://github.com/pytorch/pytorch/blob/master/torch/abi-check.cpp - # sets the ABI to 0 by default - echo "export _GLIBCXX_USE_CXX11_ABI=1" >> /env else - echo "Not upgrading gcc version" + echo "Not updating compiler" fi - run: name: Build @@ -1518,191 +1513,191 @@ jobs: ############################################################################## # Binary build specs individual job specifications ############################################################################## - binary_linux_manywheel_2.7m_cpu_devtoolset3_build: + binary_linux_manywheel_2.7m_cpu_devtoolset7_build: environment: - BUILD_ENVIRONMENT: "manywheel 2.7m cpu devtoolset3" + BUILD_ENVIRONMENT: "manywheel 2.7m cpu devtoolset7" docker: - image: "soumith/manylinux-cuda80" <<: *binary_linux_build - binary_linux_manywheel_2.7mu_cpu_devtoolset3_build: + binary_linux_manywheel_2.7mu_cpu_devtoolset7_build: environment: - BUILD_ENVIRONMENT: "manywheel 2.7mu cpu devtoolset3" + BUILD_ENVIRONMENT: "manywheel 2.7mu cpu devtoolset7" docker: - image: "soumith/manylinux-cuda80" <<: *binary_linux_build - binary_linux_manywheel_3.5m_cpu_devtoolset3_build: + binary_linux_manywheel_3.5m_cpu_devtoolset7_build: environment: - BUILD_ENVIRONMENT: "manywheel 3.5m cpu devtoolset3" + BUILD_ENVIRONMENT: "manywheel 3.5m cpu devtoolset7" docker: - image: "soumith/manylinux-cuda80" <<: *binary_linux_build - binary_linux_manywheel_3.6m_cpu_devtoolset3_build: + binary_linux_manywheel_3.6m_cpu_devtoolset7_build: environment: - BUILD_ENVIRONMENT: "manywheel 3.6m cpu devtoolset3" + BUILD_ENVIRONMENT: "manywheel 3.6m cpu devtoolset7" docker: - image: "soumith/manylinux-cuda80" <<: *binary_linux_build - binary_linux_manywheel_3.7m_cpu_devtoolset3_build: + binary_linux_manywheel_3.7m_cpu_devtoolset7_build: environment: - BUILD_ENVIRONMENT: "manywheel 3.7m cpu devtoolset3" + BUILD_ENVIRONMENT: "manywheel 3.7m cpu devtoolset7" docker: - image: "soumith/manylinux-cuda80" <<: *binary_linux_build - binary_linux_manywheel_2.7m_cu90_devtoolset3_build: + binary_linux_manywheel_2.7m_cu92_devtoolset7_build: environment: - BUILD_ENVIRONMENT: "manywheel 2.7m cu90 devtoolset3" + BUILD_ENVIRONMENT: "manywheel 2.7m cu92 devtoolset7" docker: - - image: "soumith/manylinux-cuda90" + - image: "soumith/manylinux-cuda92" <<: *binary_linux_build - binary_linux_manywheel_2.7mu_cu90_devtoolset3_build: + binary_linux_manywheel_2.7mu_cu92_devtoolset7_build: environment: - BUILD_ENVIRONMENT: "manywheel 2.7mu cu90 devtoolset3" + BUILD_ENVIRONMENT: "manywheel 2.7mu cu92 devtoolset7" docker: - - image: "soumith/manylinux-cuda90" + - image: "soumith/manylinux-cuda92" <<: *binary_linux_build - binary_linux_manywheel_3.5m_cu90_devtoolset3_build: + binary_linux_manywheel_3.5m_cu92_devtoolset7_build: environment: - BUILD_ENVIRONMENT: "manywheel 3.5m cu90 devtoolset3" + BUILD_ENVIRONMENT: "manywheel 3.5m cu92 devtoolset7" docker: - - image: "soumith/manylinux-cuda90" + - image: "soumith/manylinux-cuda92" <<: *binary_linux_build - binary_linux_manywheel_3.6m_cu90_devtoolset3_build: + binary_linux_manywheel_3.6m_cu92_devtoolset7_build: environment: - BUILD_ENVIRONMENT: "manywheel 3.6m cu90 devtoolset3" + BUILD_ENVIRONMENT: "manywheel 3.6m cu92 devtoolset7" docker: - - image: "soumith/manylinux-cuda90" + - image: "soumith/manylinux-cuda92" <<: *binary_linux_build - binary_linux_manywheel_3.7m_cu90_devtoolset3_build: + binary_linux_manywheel_3.7m_cu92_devtoolset7_build: environment: - BUILD_ENVIRONMENT: "manywheel 3.7m cu90 devtoolset3" + BUILD_ENVIRONMENT: "manywheel 3.7m cu92 devtoolset7" docker: - - image: "soumith/manylinux-cuda90" + - image: "soumith/manylinux-cuda92" <<: *binary_linux_build - binary_linux_manywheel_2.7m_cu100_devtoolset3_build: + binary_linux_manywheel_2.7m_cu100_devtoolset7_build: environment: - BUILD_ENVIRONMENT: "manywheel 2.7m cu100 devtoolset3" + BUILD_ENVIRONMENT: "manywheel 2.7m cu100 devtoolset7" docker: - image: "soumith/manylinux-cuda100" <<: *binary_linux_build - binary_linux_manywheel_2.7mu_cu100_devtoolset3_build: + binary_linux_manywheel_2.7mu_cu100_devtoolset7_build: environment: - BUILD_ENVIRONMENT: "manywheel 2.7mu cu100 devtoolset3" + BUILD_ENVIRONMENT: "manywheel 2.7mu cu100 devtoolset7" docker: - image: "soumith/manylinux-cuda100" <<: *binary_linux_build - binary_linux_manywheel_3.5m_cu100_devtoolset3_build: + binary_linux_manywheel_3.5m_cu100_devtoolset7_build: environment: - BUILD_ENVIRONMENT: "manywheel 3.5m cu100 devtoolset3" + BUILD_ENVIRONMENT: "manywheel 3.5m cu100 devtoolset7" docker: - image: "soumith/manylinux-cuda100" <<: *binary_linux_build - binary_linux_manywheel_3.6m_cu100_devtoolset3_build: + binary_linux_manywheel_3.6m_cu100_devtoolset7_build: environment: - BUILD_ENVIRONMENT: "manywheel 3.6m cu100 devtoolset3" + BUILD_ENVIRONMENT: "manywheel 3.6m cu100 devtoolset7" docker: - image: "soumith/manylinux-cuda100" <<: *binary_linux_build - binary_linux_manywheel_3.7m_cu100_devtoolset3_build: + binary_linux_manywheel_3.7m_cu100_devtoolset7_build: environment: - BUILD_ENVIRONMENT: "manywheel 3.7m cu100 devtoolset3" + BUILD_ENVIRONMENT: "manywheel 3.7m cu100 devtoolset7" docker: - image: "soumith/manylinux-cuda100" <<: *binary_linux_build - binary_linux_conda_2.7_cpu_build: + binary_linux_conda_2.7_cpu_devtoolset7_build: environment: - BUILD_ENVIRONMENT: "conda 2.7 cpu" + BUILD_ENVIRONMENT: "conda 2.7 cpu devtoolset7" docker: - image: "soumith/conda-cuda" <<: *binary_linux_build - binary_linux_conda_3.6_cpu_build: + binary_linux_conda_3.6_cpu_devtoolset7_build: environment: - BUILD_ENVIRONMENT: "conda 3.6 cpu" + BUILD_ENVIRONMENT: "conda 3.6 cpu devtoolset7" docker: - image: "soumith/conda-cuda" <<: *binary_linux_build - binary_linux_conda_3.7_cpu_build: + binary_linux_conda_3.7_cpu_devtoolset7_build: environment: - BUILD_ENVIRONMENT: "conda 3.7 cpu" + BUILD_ENVIRONMENT: "conda 3.7 cpu devtoolset7" docker: - image: "soumith/conda-cuda" <<: *binary_linux_build - binary_linux_conda_2.7_cu90_build: + binary_linux_conda_2.7_cu92_devtoolset7_build: environment: - BUILD_ENVIRONMENT: "conda 2.7 cu90" + BUILD_ENVIRONMENT: "conda 2.7 cu92 devtoolset7" docker: - image: "soumith/conda-cuda" <<: *binary_linux_build - binary_linux_conda_3.6_cu90_build: + binary_linux_conda_3.6_cu92_devtoolset7_build: environment: - BUILD_ENVIRONMENT: "conda 3.6 cu90" + BUILD_ENVIRONMENT: "conda 3.6 cu92 devtoolset7" docker: - image: "soumith/conda-cuda" <<: *binary_linux_build - binary_linux_conda_3.7_cu90_build: + binary_linux_conda_3.7_cu92_devtoolset7_build: environment: - BUILD_ENVIRONMENT: "conda 3.7 cu90" + BUILD_ENVIRONMENT: "conda 3.7 cu92 devtoolset7" docker: - image: "soumith/conda-cuda" <<: *binary_linux_build - binary_linux_conda_2.7_cu100_build: + binary_linux_conda_2.7_cu100_devtoolset7_build: environment: - BUILD_ENVIRONMENT: "conda 2.7 cu100" + BUILD_ENVIRONMENT: "conda 2.7 cu100 devtoolset7" docker: - image: "soumith/conda-cuda" <<: *binary_linux_build - binary_linux_conda_3.6_cu100_build: + binary_linux_conda_3.6_cu100_devtoolset7_build: environment: - BUILD_ENVIRONMENT: "conda 3.6 cu100" + BUILD_ENVIRONMENT: "conda 3.6 cu100 devtoolset7" docker: - image: "soumith/conda-cuda" <<: *binary_linux_build - binary_linux_conda_3.7_cu100_build: + binary_linux_conda_3.7_cu100_devtoolset7_build: environment: - BUILD_ENVIRONMENT: "conda 3.7 cu100" + BUILD_ENVIRONMENT: "conda 3.7 cu100 devtoolset7" docker: - image: "soumith/conda-cuda" <<: *binary_linux_build - binary_linux_libtorch_2.7m_cpu_devtoolset3_build: + binary_linux_libtorch_2.7m_cpu_devtoolset7_build: environment: - BUILD_ENVIRONMENT: "libtorch 2.7m cpu devtoolset3" + BUILD_ENVIRONMENT: "libtorch 2.7m cpu devtoolset7" docker: - image: "soumith/manylinux-cuda80" <<: *binary_linux_build - binary_linux_libtorch_2.7m_cu90_devtoolset3_build: + binary_linux_libtorch_2.7m_cu92_devtoolset7_build: environment: - BUILD_ENVIRONMENT: "libtorch 2.7m cu90 devtoolset3" + BUILD_ENVIRONMENT: "libtorch 2.7m cu92 devtoolset7" docker: - - image: "soumith/manylinux-cuda90" + - image: "soumith/manylinux-cuda92" <<: *binary_linux_build - binary_linux_libtorch_2.7m_cu100_devtoolset3_build: + binary_linux_libtorch_2.7m_cu100_devtoolset7_build: environment: - BUILD_ENVIRONMENT: "libtorch 2.7m cu100 devtoolset3" + BUILD_ENVIRONMENT: "libtorch 2.7m cu100 devtoolset7" docker: - image: "soumith/manylinux-cuda100" <<: *binary_linux_build @@ -1752,177 +1747,177 @@ jobs: # These are the smoke tests run right after the build, before the upload. # If these fail, the upload doesn't happen. ############################################################################## - binary_linux_manywheel_2.7m_cpu_devtoolset3_test: + binary_linux_manywheel_2.7m_cpu_devtoolset7_test: environment: - BUILD_ENVIRONMENT: "manywheel 2.7m cpu devtoolset3" + BUILD_ENVIRONMENT: "manywheel 2.7m cpu devtoolset7" DOCKER_IMAGE: "soumith/manylinux-cuda80" <<: *binary_linux_test - binary_linux_manywheel_2.7mu_cpu_devtoolset3_test: + binary_linux_manywheel_2.7mu_cpu_devtoolset7_test: environment: - BUILD_ENVIRONMENT: "manywheel 2.7mu cpu devtoolset3" + BUILD_ENVIRONMENT: "manywheel 2.7mu cpu devtoolset7" DOCKER_IMAGE: "soumith/manylinux-cuda80" <<: *binary_linux_test - binary_linux_manywheel_3.5m_cpu_devtoolset3_test: + binary_linux_manywheel_3.5m_cpu_devtoolset7_test: environment: - BUILD_ENVIRONMENT: "manywheel 3.5m cpu devtoolset3" + BUILD_ENVIRONMENT: "manywheel 3.5m cpu devtoolset7" DOCKER_IMAGE: "soumith/manylinux-cuda80" <<: *binary_linux_test - binary_linux_manywheel_3.6m_cpu_devtoolset3_test: + binary_linux_manywheel_3.6m_cpu_devtoolset7_test: environment: - BUILD_ENVIRONMENT: "manywheel 3.6m cpu devtoolset3" + BUILD_ENVIRONMENT: "manywheel 3.6m cpu devtoolset7" DOCKER_IMAGE: "soumith/manylinux-cuda80" <<: *binary_linux_test - binary_linux_manywheel_3.7m_cpu_devtoolset3_test: + binary_linux_manywheel_3.7m_cpu_devtoolset7_test: environment: - BUILD_ENVIRONMENT: "manywheel 3.7m cpu devtoolset3" + BUILD_ENVIRONMENT: "manywheel 3.7m cpu devtoolset7" DOCKER_IMAGE: "soumith/manylinux-cuda80" <<: *binary_linux_test - binary_linux_manywheel_2.7m_cu90_devtoolset3_test: + binary_linux_manywheel_2.7m_cu92_devtoolset7_test: environment: - BUILD_ENVIRONMENT: "manywheel 2.7m cu90 devtoolset3" - DOCKER_IMAGE: "soumith/manylinux-cuda90" + BUILD_ENVIRONMENT: "manywheel 2.7m cu92 devtoolset7" + DOCKER_IMAGE: "soumith/manylinux-cuda92" USE_CUDA_DOCKER_RUNTIME: "1" resource_class: gpu.medium <<: *binary_linux_test - binary_linux_manywheel_2.7mu_cu90_devtoolset3_test: + binary_linux_manywheel_2.7mu_cu92_devtoolset7_test: environment: - BUILD_ENVIRONMENT: "manywheel 2.7mu cu90 devtoolset3" - DOCKER_IMAGE: "soumith/manylinux-cuda90" + BUILD_ENVIRONMENT: "manywheel 2.7mu cu92 devtoolset7" + DOCKER_IMAGE: "soumith/manylinux-cuda92" USE_CUDA_DOCKER_RUNTIME: "1" resource_class: gpu.medium <<: *binary_linux_test - binary_linux_manywheel_3.5m_cu90_devtoolset3_test: + binary_linux_manywheel_3.5m_cu92_devtoolset7_test: environment: - BUILD_ENVIRONMENT: "manywheel 3.5m cu90 devtoolset3" - DOCKER_IMAGE: "soumith/manylinux-cuda90" + BUILD_ENVIRONMENT: "manywheel 3.5m cu92 devtoolset7" + DOCKER_IMAGE: "soumith/manylinux-cuda92" USE_CUDA_DOCKER_RUNTIME: "1" resource_class: gpu.medium <<: *binary_linux_test - binary_linux_manywheel_3.6m_cu90_devtoolset3_test: + binary_linux_manywheel_3.6m_cu92_devtoolset7_test: environment: - BUILD_ENVIRONMENT: "manywheel 3.6m cu90 devtoolset3" - DOCKER_IMAGE: "soumith/manylinux-cuda90" + BUILD_ENVIRONMENT: "manywheel 3.6m cu92 devtoolset7" + DOCKER_IMAGE: "soumith/manylinux-cuda92" USE_CUDA_DOCKER_RUNTIME: "1" resource_class: gpu.medium <<: *binary_linux_test - binary_linux_manywheel_3.7m_cu90_devtoolset3_test: + binary_linux_manywheel_3.7m_cu92_devtoolset7_test: environment: - BUILD_ENVIRONMENT: "manywheel 3.7m cu90 devtoolset3" - DOCKER_IMAGE: "soumith/manylinux-cuda90" + BUILD_ENVIRONMENT: "manywheel 3.7m cu92 devtoolset7" + DOCKER_IMAGE: "soumith/manylinux-cuda92" USE_CUDA_DOCKER_RUNTIME: "1" resource_class: gpu.medium <<: *binary_linux_test - binary_linux_manywheel_2.7m_cu100_devtoolset3_test: + binary_linux_manywheel_2.7m_cu100_devtoolset7_test: environment: - BUILD_ENVIRONMENT: "manywheel 2.7m cu100 devtoolset3" + BUILD_ENVIRONMENT: "manywheel 2.7m cu100 devtoolset7" DOCKER_IMAGE: "soumith/manylinux-cuda100" USE_CUDA_DOCKER_RUNTIME: "1" resource_class: gpu.medium <<: *binary_linux_test - binary_linux_manywheel_2.7mu_cu100_devtoolset3_test: + binary_linux_manywheel_2.7mu_cu100_devtoolset7_test: environment: - BUILD_ENVIRONMENT: "manywheel 2.7mu cu100 devtoolset3" + BUILD_ENVIRONMENT: "manywheel 2.7mu cu100 devtoolset7" DOCKER_IMAGE: "soumith/manylinux-cuda100" USE_CUDA_DOCKER_RUNTIME: "1" resource_class: gpu.medium <<: *binary_linux_test - binary_linux_manywheel_3.5m_cu100_devtoolset3_test: + binary_linux_manywheel_3.5m_cu100_devtoolset7_test: environment: - BUILD_ENVIRONMENT: "manywheel 3.5m cu100 devtoolset3" + BUILD_ENVIRONMENT: "manywheel 3.5m cu100 devtoolset7" DOCKER_IMAGE: "soumith/manylinux-cuda100" USE_CUDA_DOCKER_RUNTIME: "1" resource_class: gpu.medium <<: *binary_linux_test - binary_linux_manywheel_3.6m_cu100_devtoolset3_test: + binary_linux_manywheel_3.6m_cu100_devtoolset7_test: environment: - BUILD_ENVIRONMENT: "manywheel 3.6m cu100 devtoolset3" + BUILD_ENVIRONMENT: "manywheel 3.6m cu100 devtoolset7" DOCKER_IMAGE: "soumith/manylinux-cuda100" USE_CUDA_DOCKER_RUNTIME: "1" resource_class: gpu.medium <<: *binary_linux_test - binary_linux_manywheel_3.7m_cu100_devtoolset3_test: + binary_linux_manywheel_3.7m_cu100_devtoolset7_test: environment: - BUILD_ENVIRONMENT: "manywheel 3.7m cu100 devtoolset3" + BUILD_ENVIRONMENT: "manywheel 3.7m cu100 devtoolset7" DOCKER_IMAGE: "soumith/manylinux-cuda100" USE_CUDA_DOCKER_RUNTIME: "1" resource_class: gpu.medium <<: *binary_linux_test - binary_linux_conda_2.7_cpu_test: + binary_linux_conda_2.7_cpu_devtoolset7_test: environment: - BUILD_ENVIRONMENT: "conda 2.7 cpu" + BUILD_ENVIRONMENT: "conda 2.7 cpu devtoolset7" DOCKER_IMAGE: "soumith/conda-cuda" <<: *binary_linux_test - binary_linux_conda_3.6_cpu_test: + binary_linux_conda_3.6_cpu_devtoolset7_test: environment: - BUILD_ENVIRONMENT: "conda 3.6 cpu" + BUILD_ENVIRONMENT: "conda 3.6 cpu devtoolset7" DOCKER_IMAGE: "soumith/conda-cuda" <<: *binary_linux_test - binary_linux_conda_3.7_cpu_test: + binary_linux_conda_3.7_cpu_devtoolset7_test: environment: - BUILD_ENVIRONMENT: "conda 3.7 cpu" + BUILD_ENVIRONMENT: "conda 3.7 cpu devtoolset7" DOCKER_IMAGE: "soumith/conda-cuda" <<: *binary_linux_test - binary_linux_conda_2.7_cu90_test: + binary_linux_conda_2.7_cu92_devtoolset7_test: environment: - BUILD_ENVIRONMENT: "conda 2.7 cu90" + BUILD_ENVIRONMENT: "conda 2.7 cu92 devtoolset7" DOCKER_IMAGE: "soumith/conda-cuda" USE_CUDA_DOCKER_RUNTIME: "1" resource_class: gpu.medium <<: *binary_linux_test - binary_linux_conda_3.6_cu90_test: + binary_linux_conda_3.6_cu92_devtoolset7_test: environment: - BUILD_ENVIRONMENT: "conda 3.6 cu90" + BUILD_ENVIRONMENT: "conda 3.6 cu92 devtoolset7" DOCKER_IMAGE: "soumith/conda-cuda" USE_CUDA_DOCKER_RUNTIME: "1" resource_class: gpu.medium <<: *binary_linux_test - binary_linux_conda_3.7_cu90_test: + binary_linux_conda_3.7_cu92_devtoolset7_test: environment: - BUILD_ENVIRONMENT: "conda 3.7 cu90" + BUILD_ENVIRONMENT: "conda 3.7 cu92 devtoolset7" DOCKER_IMAGE: "soumith/conda-cuda" USE_CUDA_DOCKER_RUNTIME: "1" resource_class: gpu.medium <<: *binary_linux_test - binary_linux_conda_2.7_cu100_test: + binary_linux_conda_2.7_cu100_devtoolset7_test: environment: - BUILD_ENVIRONMENT: "conda 2.7 cu100" + BUILD_ENVIRONMENT: "conda 2.7 cu100 devtoolset7" DOCKER_IMAGE: "soumith/conda-cuda" USE_CUDA_DOCKER_RUNTIME: "1" resource_class: gpu.medium <<: *binary_linux_test - binary_linux_conda_3.6_cu100_test: + binary_linux_conda_3.6_cu100_devtoolset7_test: environment: - BUILD_ENVIRONMENT: "conda 3.6 cu100" + BUILD_ENVIRONMENT: "conda 3.6 cu100 devtoolset7" DOCKER_IMAGE: "soumith/conda-cuda" USE_CUDA_DOCKER_RUNTIME: "1" resource_class: gpu.medium <<: *binary_linux_test - binary_linux_conda_3.7_cu100_test: + binary_linux_conda_3.7_cu100_devtoolset7_test: environment: - BUILD_ENVIRONMENT: "conda 3.7 cu100" + BUILD_ENVIRONMENT: "conda 3.7 cu100 devtoolset7" DOCKER_IMAGE: "soumith/conda-cuda" USE_CUDA_DOCKER_RUNTIME: "1" resource_class: gpu.medium @@ -1951,139 +1946,139 @@ jobs: ############################################################################## # Binary build uploads ############################################################################## - binary_linux_manywheel_2.7m_cpu_devtoolset3_upload: + binary_linux_manywheel_2.7m_cpu_devtoolset7_upload: environment: - BUILD_ENVIRONMENT: "manywheel 2.7m cpu devtoolset3" + BUILD_ENVIRONMENT: "manywheel 2.7m cpu devtoolset7" <<: *binary_linux_upload - binary_linux_manywheel_2.7mu_cpu_devtoolset3_upload: + binary_linux_manywheel_2.7mu_cpu_devtoolset7_upload: environment: - BUILD_ENVIRONMENT: "manywheel 2.7mu cpu devtoolset3" + BUILD_ENVIRONMENT: "manywheel 2.7mu cpu devtoolset7" <<: *binary_linux_upload - binary_linux_manywheel_3.5m_cpu_devtoolset3_upload: + binary_linux_manywheel_3.5m_cpu_devtoolset7_upload: environment: - BUILD_ENVIRONMENT: "manywheel 3.5m cpu devtoolset3" + BUILD_ENVIRONMENT: "manywheel 3.5m cpu devtoolset7" <<: *binary_linux_upload - binary_linux_manywheel_3.6m_cpu_devtoolset3_upload: + binary_linux_manywheel_3.6m_cpu_devtoolset7_upload: environment: - BUILD_ENVIRONMENT: "manywheel 3.6m cpu devtoolset3" + BUILD_ENVIRONMENT: "manywheel 3.6m cpu devtoolset7" <<: *binary_linux_upload - binary_linux_manywheel_3.7m_cpu_devtoolset3_upload: + binary_linux_manywheel_3.7m_cpu_devtoolset7_upload: environment: - BUILD_ENVIRONMENT: "manywheel 3.7m cpu devtoolset3" + BUILD_ENVIRONMENT: "manywheel 3.7m cpu devtoolset7" <<: *binary_linux_upload - binary_linux_manywheel_2.7m_cu90_devtoolset3_upload: + binary_linux_manywheel_2.7m_cu92_devtoolset7_upload: environment: - BUILD_ENVIRONMENT: "manywheel 2.7m cu90 devtoolset3" + BUILD_ENVIRONMENT: "manywheel 2.7m cu92 devtoolset7" <<: *binary_linux_upload - binary_linux_manywheel_2.7mu_cu90_devtoolset3_upload: + binary_linux_manywheel_2.7mu_cu92_devtoolset7_upload: environment: - BUILD_ENVIRONMENT: "manywheel 2.7mu cu90 devtoolset3" + BUILD_ENVIRONMENT: "manywheel 2.7mu cu92 devtoolset7" <<: *binary_linux_upload - binary_linux_manywheel_3.5m_cu90_devtoolset3_upload: + binary_linux_manywheel_3.5m_cu92_devtoolset7_upload: environment: - BUILD_ENVIRONMENT: "manywheel 3.5m cu90 devtoolset3" + BUILD_ENVIRONMENT: "manywheel 3.5m cu92 devtoolset7" <<: *binary_linux_upload - binary_linux_manywheel_3.6m_cu90_devtoolset3_upload: + binary_linux_manywheel_3.6m_cu92_devtoolset7_upload: environment: - BUILD_ENVIRONMENT: "manywheel 3.6m cu90 devtoolset3" + BUILD_ENVIRONMENT: "manywheel 3.6m cu92 devtoolset7" <<: *binary_linux_upload - binary_linux_manywheel_3.7m_cu90_devtoolset3_upload: + binary_linux_manywheel_3.7m_cu92_devtoolset7_upload: environment: - BUILD_ENVIRONMENT: "manywheel 3.7m cu90 devtoolset3" + BUILD_ENVIRONMENT: "manywheel 3.7m cu92 devtoolset7" <<: *binary_linux_upload - binary_linux_manywheel_2.7m_cu100_devtoolset3_upload: + binary_linux_manywheel_2.7m_cu100_devtoolset7_upload: environment: - BUILD_ENVIRONMENT: "manywheel 2.7m cu100 devtoolset3" + BUILD_ENVIRONMENT: "manywheel 2.7m cu100 devtoolset7" <<: *binary_linux_upload - binary_linux_manywheel_2.7mu_cu100_devtoolset3_upload: + binary_linux_manywheel_2.7mu_cu100_devtoolset7_upload: environment: - BUILD_ENVIRONMENT: "manywheel 2.7mu cu100 devtoolset3" + BUILD_ENVIRONMENT: "manywheel 2.7mu cu100 devtoolset7" <<: *binary_linux_upload - binary_linux_manywheel_3.5m_cu100_devtoolset3_upload: + binary_linux_manywheel_3.5m_cu100_devtoolset7_upload: environment: - BUILD_ENVIRONMENT: "manywheel 3.5m cu100 devtoolset3" + BUILD_ENVIRONMENT: "manywheel 3.5m cu100 devtoolset7" <<: *binary_linux_upload - binary_linux_manywheel_3.6m_cu100_devtoolset3_upload: + binary_linux_manywheel_3.6m_cu100_devtoolset7_upload: environment: - BUILD_ENVIRONMENT: "manywheel 3.6m cu100 devtoolset3" + BUILD_ENVIRONMENT: "manywheel 3.6m cu100 devtoolset7" <<: *binary_linux_upload - binary_linux_manywheel_3.7m_cu100_devtoolset3_upload: + binary_linux_manywheel_3.7m_cu100_devtoolset7_upload: environment: - BUILD_ENVIRONMENT: "manywheel 3.7m cu100 devtoolset3" + BUILD_ENVIRONMENT: "manywheel 3.7m cu100 devtoolset7" <<: *binary_linux_upload - binary_linux_conda_2.7_cpu_upload: + binary_linux_conda_2.7_cpu_devtoolset7_upload: environment: - BUILD_ENVIRONMENT: "conda 2.7 cpu" + BUILD_ENVIRONMENT: "conda 2.7 cpu devtoolset7" <<: *binary_linux_upload - binary_linux_conda_3.6_cpu_upload: + binary_linux_conda_3.6_cpu_devtoolset7_upload: environment: - BUILD_ENVIRONMENT: "conda 3.6 cpu" + BUILD_ENVIRONMENT: "conda 3.6 cpu devtoolset7" <<: *binary_linux_upload - binary_linux_conda_3.7_cpu_upload: + binary_linux_conda_3.7_cpu_devtoolset7_upload: environment: - BUILD_ENVIRONMENT: "conda 3.7 cpu" + BUILD_ENVIRONMENT: "conda 3.7 cpu devtoolset7" <<: *binary_linux_upload - binary_linux_conda_2.7_cu90_upload: + binary_linux_conda_2.7_cu92_devtoolset7_upload: environment: - BUILD_ENVIRONMENT: "conda 2.7 cu90" + BUILD_ENVIRONMENT: "conda 2.7 cu92 devtoolset7" <<: *binary_linux_upload - binary_linux_conda_3.6_cu90_upload: + binary_linux_conda_3.6_cu92_devtoolset7_upload: environment: - BUILD_ENVIRONMENT: "conda 3.6 cu90" + BUILD_ENVIRONMENT: "conda 3.6 cu92 devtoolset7" <<: *binary_linux_upload - binary_linux_conda_3.7_cu90_upload: + binary_linux_conda_3.7_cu92_devtoolset7_upload: environment: - BUILD_ENVIRONMENT: "conda 3.7 cu90" + BUILD_ENVIRONMENT: "conda 3.7 cu92 devtoolset7" <<: *binary_linux_upload - binary_linux_conda_2.7_cu100_upload: + binary_linux_conda_2.7_cu100_devtoolset7_upload: environment: - BUILD_ENVIRONMENT: "conda 2.7 cu100" + BUILD_ENVIRONMENT: "conda 2.7 cu100 devtoolset7" <<: *binary_linux_upload - binary_linux_conda_3.6_cu100_upload: + binary_linux_conda_3.6_cu100_devtoolset7_upload: environment: - BUILD_ENVIRONMENT: "conda 3.6 cu100" + BUILD_ENVIRONMENT: "conda 3.6 cu100 devtoolset7" <<: *binary_linux_upload - binary_linux_conda_3.7_cu100_upload: + binary_linux_conda_3.7_cu100_devtoolset7_upload: environment: - BUILD_ENVIRONMENT: "conda 3.7 cu100" + BUILD_ENVIRONMENT: "conda 3.7 cu100 devtoolset7" <<: *binary_linux_upload - binary_linux_libtorch_2.7m_cpu_devtoolset3_upload: + binary_linux_libtorch_2.7m_cpu_devtoolset7_upload: environment: - BUILD_ENVIRONMENT: "libtorch 2.7m cpu devtoolset3" + BUILD_ENVIRONMENT: "libtorch 2.7m cpu devtoolset7" <<: *binary_linux_upload - binary_linux_libtorch_2.7m_cu90_devtoolset3_upload: + binary_linux_libtorch_2.7m_cu92_devtoolset7_upload: environment: - BUILD_ENVIRONMENT: "libtorch 2.7m cu90 devtoolset3" + BUILD_ENVIRONMENT: "libtorch 2.7m cu92 devtoolset7" <<: *binary_linux_upload - binary_linux_libtorch_2.7m_cu100_devtoolset3_upload: + binary_linux_libtorch_2.7m_cu100_devtoolset7_upload: environment: - BUILD_ENVIRONMENT: "libtorch 2.7m cu100 devtoolset3" + BUILD_ENVIRONMENT: "libtorch 2.7m cu100 devtoolset7" <<: *binary_linux_upload binary_macos_wheel_2.7_cpu_upload: @@ -2129,177 +2124,177 @@ jobs: ############################################################################## # Smoke test specs individual job specifications ############################################################################## - smoke_linux_manywheel_2.7m_cpu_devtoolset3: + smoke_linux_manywheel_2.7m_cpu_devtoolset7: environment: - BUILD_ENVIRONMENT: "manywheel 2.7m cpu devtoolset3" + BUILD_ENVIRONMENT: "manywheel 2.7m cpu devtoolset7" DOCKER_IMAGE: "soumith/manylinux-cuda80" <<: *smoke_linux_test - smoke_linux_manywheel_2.7mu_cpu_devtoolset3: + smoke_linux_manywheel_2.7mu_cpu_devtoolset7: environment: - BUILD_ENVIRONMENT: "manywheel 2.7mu cpu devtoolset3" + BUILD_ENVIRONMENT: "manywheel 2.7mu cpu devtoolset7" DOCKER_IMAGE: "soumith/manylinux-cuda80" <<: *smoke_linux_test - smoke_linux_manywheel_3.5m_cpu_devtoolset3: + smoke_linux_manywheel_3.5m_cpu_devtoolset7: environment: - BUILD_ENVIRONMENT: "manywheel 3.5m cpu devtoolset3" + BUILD_ENVIRONMENT: "manywheel 3.5m cpu devtoolset7" DOCKER_IMAGE: "soumith/manylinux-cuda80" <<: *smoke_linux_test - smoke_linux_manywheel_3.6m_cpu_devtoolset3: + smoke_linux_manywheel_3.6m_cpu_devtoolset7: environment: - BUILD_ENVIRONMENT: "manywheel 3.6m cpu devtoolset3" + BUILD_ENVIRONMENT: "manywheel 3.6m cpu devtoolset7" DOCKER_IMAGE: "soumith/manylinux-cuda80" <<: *smoke_linux_test - smoke_linux_manywheel_3.7m_cpu_devtoolset3: + smoke_linux_manywheel_3.7m_cpu_devtoolset7: environment: - BUILD_ENVIRONMENT: "manywheel 3.7m cpu devtoolset3" + BUILD_ENVIRONMENT: "manywheel 3.7m cpu devtoolset7" DOCKER_IMAGE: "soumith/manylinux-cuda80" <<: *smoke_linux_test - smoke_linux_manywheel_2.7m_cu90_devtoolset3: + smoke_linux_manywheel_2.7m_cu92_devtoolset7: environment: - BUILD_ENVIRONMENT: "manywheel 2.7m cu90 devtoolset3" - DOCKER_IMAGE: "soumith/manylinux-cuda90" + BUILD_ENVIRONMENT: "manywheel 2.7m cu92 devtoolset7" + DOCKER_IMAGE: "soumith/manylinux-cuda92" USE_CUDA_DOCKER_RUNTIME: "1" resource_class: gpu.medium <<: *smoke_linux_test - smoke_linux_manywheel_2.7mu_cu90_devtoolset3: + smoke_linux_manywheel_2.7mu_cu92_devtoolset7: environment: - BUILD_ENVIRONMENT: "manywheel 2.7mu cu90 devtoolset3" - DOCKER_IMAGE: "soumith/manylinux-cuda90" + BUILD_ENVIRONMENT: "manywheel 2.7mu cu92 devtoolset7" + DOCKER_IMAGE: "soumith/manylinux-cuda92" USE_CUDA_DOCKER_RUNTIME: "1" resource_class: gpu.medium <<: *smoke_linux_test - smoke_linux_manywheel_3.5m_cu90_devtoolset3: + smoke_linux_manywheel_3.5m_cu92_devtoolset7: environment: - BUILD_ENVIRONMENT: "manywheel 3.5m cu90 devtoolset3" - DOCKER_IMAGE: "soumith/manylinux-cuda90" + BUILD_ENVIRONMENT: "manywheel 3.5m cu92 devtoolset7" + DOCKER_IMAGE: "soumith/manylinux-cuda92" USE_CUDA_DOCKER_RUNTIME: "1" resource_class: gpu.medium <<: *smoke_linux_test - smoke_linux_manywheel_3.6m_cu90_devtoolset3: + smoke_linux_manywheel_3.6m_cu92_devtoolset7: environment: - BUILD_ENVIRONMENT: "manywheel 3.6m cu90 devtoolset3" - DOCKER_IMAGE: "soumith/manylinux-cuda90" + BUILD_ENVIRONMENT: "manywheel 3.6m cu92 devtoolset7" + DOCKER_IMAGE: "soumith/manylinux-cuda92" USE_CUDA_DOCKER_RUNTIME: "1" resource_class: gpu.medium <<: *smoke_linux_test - smoke_linux_manywheel_3.7m_cu90_devtoolset3: + smoke_linux_manywheel_3.7m_cu92_devtoolset7: environment: - BUILD_ENVIRONMENT: "manywheel 3.7m cu90 devtoolset3" - DOCKER_IMAGE: "soumith/manylinux-cuda90" + BUILD_ENVIRONMENT: "manywheel 3.7m cu92 devtoolset7" + DOCKER_IMAGE: "soumith/manylinux-cuda92" USE_CUDA_DOCKER_RUNTIME: "1" resource_class: gpu.medium <<: *smoke_linux_test - smoke_linux_manywheel_2.7m_cu100_devtoolset3: + smoke_linux_manywheel_2.7m_cu100_devtoolset7: environment: - BUILD_ENVIRONMENT: "manywheel 2.7m cu100 devtoolset3" + BUILD_ENVIRONMENT: "manywheel 2.7m cu100 devtoolset7" DOCKER_IMAGE: "soumith/manylinux-cuda100" USE_CUDA_DOCKER_RUNTIME: "1" resource_class: gpu.medium <<: *smoke_linux_test - smoke_linux_manywheel_2.7mu_cu100_devtoolset3: + smoke_linux_manywheel_2.7mu_cu100_devtoolset7: environment: - BUILD_ENVIRONMENT: "manywheel 2.7mu cu100 devtoolset3" + BUILD_ENVIRONMENT: "manywheel 2.7mu cu100 devtoolset7" DOCKER_IMAGE: "soumith/manylinux-cuda100" USE_CUDA_DOCKER_RUNTIME: "1" resource_class: gpu.medium <<: *smoke_linux_test - smoke_linux_manywheel_3.5m_cu100_devtoolset3: + smoke_linux_manywheel_3.5m_cu100_devtoolset7: environment: - BUILD_ENVIRONMENT: "manywheel 3.5m cu100 devtoolset3" + BUILD_ENVIRONMENT: "manywheel 3.5m cu100 devtoolset7" DOCKER_IMAGE: "soumith/manylinux-cuda100" USE_CUDA_DOCKER_RUNTIME: "1" resource_class: gpu.medium <<: *smoke_linux_test - smoke_linux_manywheel_3.6m_cu100_devtoolset3: + smoke_linux_manywheel_3.6m_cu100_devtoolset7: environment: - BUILD_ENVIRONMENT: "manywheel 3.6m cu100 devtoolset3" + BUILD_ENVIRONMENT: "manywheel 3.6m cu100 devtoolset7" DOCKER_IMAGE: "soumith/manylinux-cuda100" USE_CUDA_DOCKER_RUNTIME: "1" resource_class: gpu.medium <<: *smoke_linux_test - smoke_linux_manywheel_3.7m_cu100_devtoolset3: + smoke_linux_manywheel_3.7m_cu100_devtoolset7: environment: - BUILD_ENVIRONMENT: "manywheel 3.7m cu100 devtoolset3" + BUILD_ENVIRONMENT: "manywheel 3.7m cu100 devtoolset7" DOCKER_IMAGE: "soumith/manylinux-cuda100" USE_CUDA_DOCKER_RUNTIME: "1" resource_class: gpu.medium <<: *smoke_linux_test - smoke_linux_conda_2.7_cpu: + smoke_linux_conda_2.7_cpu_devtoolset7: environment: - BUILD_ENVIRONMENT: "conda 2.7 cpu" + BUILD_ENVIRONMENT: "conda 2.7 cpu devtoolset7" DOCKER_IMAGE: "soumith/conda-cuda" <<: *smoke_linux_test - smoke_linux_conda_3.6_cpu: + smoke_linux_conda_3.6_cpu_devtoolset7: environment: - BUILD_ENVIRONMENT: "conda 3.6 cpu" + BUILD_ENVIRONMENT: "conda 3.6 cpu devtoolset7" DOCKER_IMAGE: "soumith/conda-cuda" <<: *smoke_linux_test - smoke_linux_conda_3.7_cpu: + smoke_linux_conda_3.7_cpu_devtoolset7: environment: - BUILD_ENVIRONMENT: "conda 3.7 cpu" + BUILD_ENVIRONMENT: "conda 3.7 cpu devtoolset7" DOCKER_IMAGE: "soumith/conda-cuda" <<: *smoke_linux_test - smoke_linux_conda_2.7_cu90: + smoke_linux_conda_2.7_cu92_devtoolset7: environment: - BUILD_ENVIRONMENT: "conda 2.7 cu90" + BUILD_ENVIRONMENT: "conda 2.7 cu92 devtoolset7" DOCKER_IMAGE: "soumith/conda-cuda" USE_CUDA_DOCKER_RUNTIME: "1" resource_class: gpu.medium <<: *smoke_linux_test - smoke_linux_conda_3.6_cu90: + smoke_linux_conda_3.6_cu92_devtoolset7: environment: - BUILD_ENVIRONMENT: "conda 3.6 cu90" + BUILD_ENVIRONMENT: "conda 3.6 cu92 devtoolset7" DOCKER_IMAGE: "soumith/conda-cuda" USE_CUDA_DOCKER_RUNTIME: "1" resource_class: gpu.medium <<: *smoke_linux_test - smoke_linux_conda_3.7_cu90: + smoke_linux_conda_3.7_cu92_devtoolset7: environment: - BUILD_ENVIRONMENT: "conda 3.7 cu90" + BUILD_ENVIRONMENT: "conda 3.7 cu92 devtoolset7" DOCKER_IMAGE: "soumith/conda-cuda" USE_CUDA_DOCKER_RUNTIME: "1" resource_class: gpu.medium <<: *smoke_linux_test - smoke_linux_conda_2.7_cu100: + smoke_linux_conda_2.7_cu100_devtoolset7: environment: - BUILD_ENVIRONMENT: "conda 2.7 cu100" + BUILD_ENVIRONMENT: "conda 2.7 cu100 devtoolset7" DOCKER_IMAGE: "soumith/conda-cuda" USE_CUDA_DOCKER_RUNTIME: "1" resource_class: gpu.medium <<: *smoke_linux_test - smoke_linux_conda_3.6_cu100: + smoke_linux_conda_3.6_cu100_devtoolset7: environment: - BUILD_ENVIRONMENT: "conda 3.6 cu100" + BUILD_ENVIRONMENT: "conda 3.6 cu100 devtoolset7" DOCKER_IMAGE: "soumith/conda-cuda" USE_CUDA_DOCKER_RUNTIME: "1" resource_class: gpu.medium <<: *smoke_linux_test - smoke_linux_conda_3.7_cu100: + smoke_linux_conda_3.7_cu100_devtoolset7: environment: - BUILD_ENVIRONMENT: "conda 3.7 cu100" + BUILD_ENVIRONMENT: "conda 3.7 cu100 devtoolset7" DOCKER_IMAGE: "soumith/conda-cuda" USE_CUDA_DOCKER_RUNTIME: "1" resource_class: gpu.medium @@ -2713,22 +2708,22 @@ workflows: # pytorch-ci-hud to adjust the list of whitelisted builds # at https://github.com/ezyang/pytorch-ci-hud/blob/master/src/BuildHistoryDisplay.js - - binary_linux_manywheel_2.7mu_cpu_devtoolset3_build: + - binary_linux_manywheel_2.7mu_cpu_devtoolset7_build: requires: - setup - - binary_linux_manywheel_3.7m_cu100_devtoolset3_build: + - binary_linux_manywheel_3.7m_cu100_devtoolset7_build: requires: - setup - - binary_linux_conda_2.7_cpu_build: + - binary_linux_conda_2.7_cpu_devtoolset7_build: requires: - setup # This binary build is currently broken, see https://github.com/pytorch/pytorch/issues/16710 - # - binary_linux_conda_3.6_cu90_build - - binary_linux_libtorch_2.7m_cpu_devtoolset3_build: + # - binary_linux_conda_3.6_cu90_devtoolset7_build + - binary_linux_libtorch_2.7m_cpu_devtoolset7_build: requires: - setup # TODO we should test a libtorch cuda build, but they take too long - # - binary_linux_libtorch_2.7m_cu90_devtoolset3_build + # - binary_linux_libtorch_2.7m_cu90_devtoolset7_build - binary_macos_wheel_3.6_cpu_build: requires: - setup @@ -2739,23 +2734,23 @@ workflows: requires: - setup - - binary_linux_manywheel_2.7mu_cpu_devtoolset3_test: + - binary_linux_manywheel_2.7mu_cpu_devtoolset7_test: requires: - setup - - binary_linux_manywheel_2.7mu_cpu_devtoolset3_build - - binary_linux_manywheel_3.7m_cu100_devtoolset3_test: + - binary_linux_manywheel_2.7mu_cpu_devtoolset7_build + - binary_linux_manywheel_3.7m_cu100_devtoolset7_test: requires: - setup - - binary_linux_manywheel_3.7m_cu100_devtoolset3_build - - binary_linux_conda_2.7_cpu_test: + - binary_linux_manywheel_3.7m_cu100_devtoolset7_build + - binary_linux_conda_2.7_cpu_devtoolset7_test: requires: - setup - - binary_linux_conda_2.7_cpu_build + - binary_linux_conda_2.7_cpu_devtoolset7_build # This binary build is currently broken, see https://github.com/pytorch/pytorch/issues/16710 - # - binary_linux_conda_3.6_cu90_test: + # - binary_linux_conda_3.6_cu90_devtoolset7_test: # requires: # - setup - # - binary_linux_conda_3.6_cu90_build + # - binary_linux_conda_3.6_cu90_devtoolset7_build ############################################################################## # Daily smoke test trigger @@ -2770,76 +2765,76 @@ workflows: - master jobs: - setup - - smoke_linux_manywheel_2.7m_cpu_devtoolset3: + - smoke_linux_manywheel_2.7m_cpu_devtoolset7: requires: - setup - - smoke_linux_manywheel_2.7mu_cpu_devtoolset3: + - smoke_linux_manywheel_2.7mu_cpu_devtoolset7: requires: - setup - - smoke_linux_manywheel_3.5m_cpu_devtoolset3: + - smoke_linux_manywheel_3.5m_cpu_devtoolset7: requires: - setup - - smoke_linux_manywheel_3.6m_cpu_devtoolset3: + - smoke_linux_manywheel_3.6m_cpu_devtoolset7: requires: - setup - - smoke_linux_manywheel_3.7m_cpu_devtoolset3: + - smoke_linux_manywheel_3.7m_cpu_devtoolset7: requires: - setup - - smoke_linux_manywheel_2.7m_cu90_devtoolset3: + - smoke_linux_manywheel_2.7m_cu92_devtoolset7: requires: - setup - - smoke_linux_manywheel_2.7mu_cu90_devtoolset3: + - smoke_linux_manywheel_2.7mu_cu92_devtoolset7: requires: - setup - - smoke_linux_manywheel_3.5m_cu90_devtoolset3: + - smoke_linux_manywheel_3.5m_cu92_devtoolset7: requires: - setup - - smoke_linux_manywheel_3.6m_cu90_devtoolset3: + - smoke_linux_manywheel_3.6m_cu92_devtoolset7: requires: - setup - - smoke_linux_manywheel_3.7m_cu90_devtoolset3: + - smoke_linux_manywheel_3.7m_cu92_devtoolset7: requires: - setup - - smoke_linux_manywheel_2.7m_cu100_devtoolset3: + - smoke_linux_manywheel_2.7m_cu100_devtoolset7: requires: - setup - - smoke_linux_manywheel_2.7mu_cu100_devtoolset3: + - smoke_linux_manywheel_2.7mu_cu100_devtoolset7: requires: - setup - - smoke_linux_manywheel_3.5m_cu100_devtoolset3: + - smoke_linux_manywheel_3.5m_cu100_devtoolset7: requires: - setup - - smoke_linux_manywheel_3.6m_cu100_devtoolset3: + - smoke_linux_manywheel_3.6m_cu100_devtoolset7: requires: - setup - - smoke_linux_manywheel_3.7m_cu100_devtoolset3: + - smoke_linux_manywheel_3.7m_cu100_devtoolset7: requires: - setup - - smoke_linux_conda_2.7_cpu: + - smoke_linux_conda_2.7_cpu_devtoolset7: requires: - setup - - smoke_linux_conda_3.6_cpu: + - smoke_linux_conda_3.6_cpu_devtoolset7: requires: - setup - - smoke_linux_conda_3.7_cpu: + - smoke_linux_conda_3.7_cpu_devtoolset7: requires: - setup - - smoke_linux_conda_2.7_cu90: + - smoke_linux_conda_2.7_cu92_devtoolset7: requires: - setup - - smoke_linux_conda_3.6_cu90: + - smoke_linux_conda_3.6_cu92_devtoolset7: requires: - setup - - smoke_linux_conda_3.7_cu90: + - smoke_linux_conda_3.7_cu92_devtoolset7: requires: - setup - - smoke_linux_conda_2.7_cu100: + - smoke_linux_conda_2.7_cu100_devtoolset7: requires: - setup - - smoke_linux_conda_3.6_cu100: + - smoke_linux_conda_3.6_cu100_devtoolset7: requires: - setup - - smoke_linux_conda_3.7_cu100: + - smoke_linux_conda_3.7_cu100_devtoolset7: requires: - setup - smoke_macos_wheel_2.7_cpu: @@ -2877,85 +2872,85 @@ workflows: - master jobs: - setup - - binary_linux_manywheel_2.7m_cpu_devtoolset3_build: + - binary_linux_manywheel_2.7m_cpu_devtoolset7_build: requires: - setup - - binary_linux_manywheel_2.7mu_cpu_devtoolset3_build: + - binary_linux_manywheel_2.7mu_cpu_devtoolset7_build: requires: - setup - - binary_linux_manywheel_3.5m_cpu_devtoolset3_build: + - binary_linux_manywheel_3.5m_cpu_devtoolset7_build: requires: - setup - - binary_linux_manywheel_3.6m_cpu_devtoolset3_build: + - binary_linux_manywheel_3.6m_cpu_devtoolset7_build: requires: - setup - - binary_linux_manywheel_3.7m_cpu_devtoolset3_build: + - binary_linux_manywheel_3.7m_cpu_devtoolset7_build: requires: - setup - - binary_linux_manywheel_2.7m_cu90_devtoolset3_build: + - binary_linux_manywheel_2.7m_cu92_devtoolset7_build: requires: - setup - - binary_linux_manywheel_2.7mu_cu90_devtoolset3_build: + - binary_linux_manywheel_2.7mu_cu92_devtoolset7_build: requires: - setup - - binary_linux_manywheel_3.5m_cu90_devtoolset3_build: + - binary_linux_manywheel_3.5m_cu92_devtoolset7_build: requires: - setup - - binary_linux_manywheel_3.6m_cu90_devtoolset3_build: + - binary_linux_manywheel_3.6m_cu92_devtoolset7_build: requires: - setup - - binary_linux_manywheel_3.7m_cu90_devtoolset3_build: + - binary_linux_manywheel_3.7m_cu92_devtoolset7_build: requires: - setup - - binary_linux_manywheel_2.7m_cu100_devtoolset3_build: + - binary_linux_manywheel_2.7m_cu100_devtoolset7_build: requires: - setup - - binary_linux_manywheel_2.7mu_cu100_devtoolset3_build: + - binary_linux_manywheel_2.7mu_cu100_devtoolset7_build: requires: - setup - - binary_linux_manywheel_3.5m_cu100_devtoolset3_build: + - binary_linux_manywheel_3.5m_cu100_devtoolset7_build: requires: - setup - - binary_linux_manywheel_3.6m_cu100_devtoolset3_build: + - binary_linux_manywheel_3.6m_cu100_devtoolset7_build: requires: - setup - - binary_linux_manywheel_3.7m_cu100_devtoolset3_build: + - binary_linux_manywheel_3.7m_cu100_devtoolset7_build: requires: - setup - - binary_linux_conda_2.7_cpu_build: + - binary_linux_conda_2.7_cpu_devtoolset7_build: requires: - setup - - binary_linux_conda_3.6_cpu_build: + - binary_linux_conda_3.6_cpu_devtoolset7_build: requires: - setup - - binary_linux_conda_3.7_cpu_build: + - binary_linux_conda_3.7_cpu_devtoolset7_build: requires: - setup - - binary_linux_conda_2.7_cu90_build: + - binary_linux_conda_2.7_cu92_devtoolset7_build: requires: - setup - - binary_linux_conda_3.6_cu90_build: + - binary_linux_conda_3.6_cu92_devtoolset7_build: requires: - setup - - binary_linux_conda_3.7_cu90_build: + - binary_linux_conda_3.7_cu92_devtoolset7_build: requires: - setup - - binary_linux_conda_2.7_cu100_build: + - binary_linux_conda_2.7_cu100_devtoolset7_build: requires: - setup - - binary_linux_conda_3.6_cu100_build: + - binary_linux_conda_3.6_cu100_devtoolset7_build: requires: - setup - - binary_linux_conda_3.7_cu100_build: + - binary_linux_conda_3.7_cu100_devtoolset7_build: requires: - setup - - binary_linux_libtorch_2.7m_cpu_devtoolset3_build: + - binary_linux_libtorch_2.7m_cpu_devtoolset7_build: requires: - setup - - binary_linux_libtorch_2.7m_cu90_devtoolset3_build: + - binary_linux_libtorch_2.7m_cu92_devtoolset7_build: requires: - setup - - binary_linux_libtorch_2.7m_cu100_devtoolset3_build: + - binary_linux_libtorch_2.7m_cu100_devtoolset7_build: requires: - setup - binary_macos_wheel_2.7_cpu_build: @@ -2986,102 +2981,102 @@ workflows: ############################################################################## # Nightly tests ############################################################################## - - binary_linux_manywheel_2.7m_cpu_devtoolset3_test: + - binary_linux_manywheel_2.7m_cpu_devtoolset7_test: requires: - setup - - binary_linux_manywheel_2.7m_cpu_devtoolset3_build - - binary_linux_manywheel_2.7mu_cpu_devtoolset3_test: + - binary_linux_manywheel_2.7m_cpu_devtoolset7_build + - binary_linux_manywheel_2.7mu_cpu_devtoolset7_test: requires: - setup - - binary_linux_manywheel_2.7mu_cpu_devtoolset3_build - - binary_linux_manywheel_3.5m_cpu_devtoolset3_test: + - binary_linux_manywheel_2.7mu_cpu_devtoolset7_build + - binary_linux_manywheel_3.5m_cpu_devtoolset7_test: requires: - setup - - binary_linux_manywheel_3.5m_cpu_devtoolset3_build - - binary_linux_manywheel_3.6m_cpu_devtoolset3_test: + - binary_linux_manywheel_3.5m_cpu_devtoolset7_build + - binary_linux_manywheel_3.6m_cpu_devtoolset7_test: requires: - setup - - binary_linux_manywheel_3.6m_cpu_devtoolset3_build - - binary_linux_manywheel_3.7m_cpu_devtoolset3_test: + - binary_linux_manywheel_3.6m_cpu_devtoolset7_build + - binary_linux_manywheel_3.7m_cpu_devtoolset7_test: requires: - setup - - binary_linux_manywheel_3.7m_cpu_devtoolset3_build - - binary_linux_manywheel_2.7m_cu90_devtoolset3_test: + - binary_linux_manywheel_3.7m_cpu_devtoolset7_build + - binary_linux_manywheel_2.7m_cu92_devtoolset7_test: requires: - setup - - binary_linux_manywheel_2.7m_cu90_devtoolset3_build - - binary_linux_manywheel_2.7mu_cu90_devtoolset3_test: + - binary_linux_manywheel_2.7m_cu92_devtoolset7_build + - binary_linux_manywheel_2.7mu_cu92_devtoolset7_test: requires: - setup - - binary_linux_manywheel_2.7mu_cu90_devtoolset3_build - - binary_linux_manywheel_3.5m_cu90_devtoolset3_test: + - binary_linux_manywheel_2.7mu_cu92_devtoolset7_build + - binary_linux_manywheel_3.5m_cu92_devtoolset7_test: requires: - setup - - binary_linux_manywheel_3.5m_cu90_devtoolset3_build - - binary_linux_manywheel_3.6m_cu90_devtoolset3_test: + - binary_linux_manywheel_3.5m_cu92_devtoolset7_build + - binary_linux_manywheel_3.6m_cu92_devtoolset7_test: requires: - setup - - binary_linux_manywheel_3.6m_cu90_devtoolset3_build - - binary_linux_manywheel_3.7m_cu90_devtoolset3_test: + - binary_linux_manywheel_3.6m_cu92_devtoolset7_build + - binary_linux_manywheel_3.7m_cu92_devtoolset7_test: requires: - setup - - binary_linux_manywheel_3.7m_cu90_devtoolset3_build - - binary_linux_manywheel_2.7m_cu100_devtoolset3_test: + - binary_linux_manywheel_3.7m_cu92_devtoolset7_build + - binary_linux_manywheel_2.7m_cu100_devtoolset7_test: requires: - setup - - binary_linux_manywheel_2.7m_cu100_devtoolset3_build - - binary_linux_manywheel_2.7mu_cu100_devtoolset3_test: + - binary_linux_manywheel_2.7m_cu100_devtoolset7_build + - binary_linux_manywheel_2.7mu_cu100_devtoolset7_test: requires: - setup - - binary_linux_manywheel_2.7mu_cu100_devtoolset3_build - - binary_linux_manywheel_3.5m_cu100_devtoolset3_test: + - binary_linux_manywheel_2.7mu_cu100_devtoolset7_build + - binary_linux_manywheel_3.5m_cu100_devtoolset7_test: requires: - setup - - binary_linux_manywheel_3.5m_cu100_devtoolset3_build - - binary_linux_manywheel_3.6m_cu100_devtoolset3_test: + - binary_linux_manywheel_3.5m_cu100_devtoolset7_build + - binary_linux_manywheel_3.6m_cu100_devtoolset7_test: requires: - setup - - binary_linux_manywheel_3.6m_cu100_devtoolset3_build - - binary_linux_manywheel_3.7m_cu100_devtoolset3_test: + - binary_linux_manywheel_3.6m_cu100_devtoolset7_build + - binary_linux_manywheel_3.7m_cu100_devtoolset7_test: requires: - setup - - binary_linux_manywheel_3.7m_cu100_devtoolset3_build - - binary_linux_conda_2.7_cpu_test: + - binary_linux_manywheel_3.7m_cu100_devtoolset7_build + - binary_linux_conda_2.7_cpu_devtoolset7_test: requires: - setup - - binary_linux_conda_2.7_cpu_build - - binary_linux_conda_3.6_cpu_test: + - binary_linux_conda_2.7_cpu_devtoolset7_build + - binary_linux_conda_3.6_cpu_devtoolset7_test: requires: - setup - - binary_linux_conda_3.6_cpu_build - - binary_linux_conda_3.7_cpu_test: + - binary_linux_conda_3.6_cpu_devtoolset7_build + - binary_linux_conda_3.7_cpu_devtoolset7_test: requires: - setup - - binary_linux_conda_3.7_cpu_build - - binary_linux_conda_2.7_cu90_test: + - binary_linux_conda_3.7_cpu_devtoolset7_build + - binary_linux_conda_2.7_cu92_devtoolset7_test: requires: - setup - - binary_linux_conda_2.7_cu90_build - - binary_linux_conda_3.6_cu90_test: + - binary_linux_conda_2.7_cu92_devtoolset7_build + - binary_linux_conda_3.6_cu92_devtoolset7_test: requires: - setup - - binary_linux_conda_3.6_cu90_build - - binary_linux_conda_3.7_cu90_test: + - binary_linux_conda_3.6_cu92_devtoolset7_build + - binary_linux_conda_3.7_cu92_devtoolset7_test: requires: - setup - - binary_linux_conda_3.7_cu90_build - - binary_linux_conda_2.7_cu100_test: + - binary_linux_conda_3.7_cu92_devtoolset7_build + - binary_linux_conda_2.7_cu100_devtoolset7_test: requires: - setup - - binary_linux_conda_2.7_cu100_build - - binary_linux_conda_3.6_cu100_test: + - binary_linux_conda_2.7_cu100_devtoolset7_build + - binary_linux_conda_3.6_cu100_devtoolset7_test: requires: - setup - - binary_linux_conda_3.6_cu100_build - - binary_linux_conda_3.7_cu100_test: + - binary_linux_conda_3.6_cu100_devtoolset7_build + - binary_linux_conda_3.7_cu100_devtoolset7_test: requires: - setup - - binary_linux_conda_3.7_cu100_build + - binary_linux_conda_3.7_cu100_devtoolset7_build #- binary_linux_libtorch_2.7m_cpu_test: # requires: # - binary_linux_libtorch_2.7m_cpu_build @@ -3093,141 +3088,141 @@ workflows: # - binary_linux_libtorch_2.7m_cu100_build # Nightly uploads - - binary_linux_manywheel_2.7m_cpu_devtoolset3_upload: + - binary_linux_manywheel_2.7m_cpu_devtoolset7_upload: context: org-member requires: - setup - - binary_linux_manywheel_2.7m_cpu_devtoolset3_test - - binary_linux_manywheel_2.7mu_cpu_devtoolset3_upload: + - binary_linux_manywheel_2.7m_cpu_devtoolset7_test + - binary_linux_manywheel_2.7mu_cpu_devtoolset7_upload: context: org-member requires: - setup - - binary_linux_manywheel_2.7mu_cpu_devtoolset3_test - - binary_linux_manywheel_3.5m_cpu_devtoolset3_upload: + - binary_linux_manywheel_2.7mu_cpu_devtoolset7_test + - binary_linux_manywheel_3.5m_cpu_devtoolset7_upload: context: org-member requires: - setup - - binary_linux_manywheel_3.5m_cpu_devtoolset3_test - - binary_linux_manywheel_3.6m_cpu_devtoolset3_upload: + - binary_linux_manywheel_3.5m_cpu_devtoolset7_test + - binary_linux_manywheel_3.6m_cpu_devtoolset7_upload: context: org-member requires: - setup - - binary_linux_manywheel_3.6m_cpu_devtoolset3_test - - binary_linux_manywheel_3.7m_cpu_devtoolset3_upload: + - binary_linux_manywheel_3.6m_cpu_devtoolset7_test + - binary_linux_manywheel_3.7m_cpu_devtoolset7_upload: context: org-member requires: - setup - - binary_linux_manywheel_3.7m_cpu_devtoolset3_test - - binary_linux_manywheel_2.7m_cu90_devtoolset3_upload: + - binary_linux_manywheel_3.7m_cpu_devtoolset7_test + - binary_linux_manywheel_2.7m_cu92_devtoolset7_upload: context: org-member requires: - setup - - binary_linux_manywheel_2.7m_cu90_devtoolset3_test - - binary_linux_manywheel_2.7mu_cu90_devtoolset3_upload: + - binary_linux_manywheel_2.7m_cu92_devtoolset7_test + - binary_linux_manywheel_2.7mu_cu92_devtoolset7_upload: context: org-member requires: - setup - - binary_linux_manywheel_2.7mu_cu90_devtoolset3_test - - binary_linux_manywheel_3.5m_cu90_devtoolset3_upload: + - binary_linux_manywheel_2.7mu_cu92_devtoolset7_test + - binary_linux_manywheel_3.5m_cu92_devtoolset7_upload: context: org-member requires: - setup - - binary_linux_manywheel_3.5m_cu90_devtoolset3_test - - binary_linux_manywheel_3.6m_cu90_devtoolset3_upload: + - binary_linux_manywheel_3.5m_cu92_devtoolset7_test + - binary_linux_manywheel_3.6m_cu92_devtoolset7_upload: context: org-member requires: - setup - - binary_linux_manywheel_3.6m_cu90_devtoolset3_test - - binary_linux_manywheel_3.7m_cu90_devtoolset3_upload: + - binary_linux_manywheel_3.6m_cu92_devtoolset7_test + - binary_linux_manywheel_3.7m_cu92_devtoolset7_upload: context: org-member requires: - setup - - binary_linux_manywheel_3.7m_cu90_devtoolset3_test - - binary_linux_manywheel_2.7m_cu100_devtoolset3_upload: + - binary_linux_manywheel_3.7m_cu92_devtoolset7_test + - binary_linux_manywheel_2.7m_cu100_devtoolset7_upload: context: org-member requires: - setup - - binary_linux_manywheel_2.7m_cu100_devtoolset3_test - - binary_linux_manywheel_2.7mu_cu100_devtoolset3_upload: + - binary_linux_manywheel_2.7m_cu100_devtoolset7_test + - binary_linux_manywheel_2.7mu_cu100_devtoolset7_upload: context: org-member requires: - setup - - binary_linux_manywheel_2.7mu_cu100_devtoolset3_test - - binary_linux_manywheel_3.5m_cu100_devtoolset3_upload: + - binary_linux_manywheel_2.7mu_cu100_devtoolset7_test + - binary_linux_manywheel_3.5m_cu100_devtoolset7_upload: context: org-member requires: - setup - - binary_linux_manywheel_3.5m_cu100_devtoolset3_test - - binary_linux_manywheel_3.6m_cu100_devtoolset3_upload: + - binary_linux_manywheel_3.5m_cu100_devtoolset7_test + - binary_linux_manywheel_3.6m_cu100_devtoolset7_upload: context: org-member requires: - setup - - binary_linux_manywheel_3.6m_cu100_devtoolset3_test - - binary_linux_manywheel_3.7m_cu100_devtoolset3_upload: + - binary_linux_manywheel_3.6m_cu100_devtoolset7_test + - binary_linux_manywheel_3.7m_cu100_devtoolset7_upload: context: org-member requires: - setup - - binary_linux_manywheel_3.7m_cu100_devtoolset3_test - - binary_linux_conda_2.7_cpu_upload: + - binary_linux_manywheel_3.7m_cu100_devtoolset7_test + - binary_linux_conda_2.7_cpu_devtoolset7_upload: context: org-member requires: - setup - - binary_linux_conda_2.7_cpu_test - - binary_linux_conda_3.6_cpu_upload: + - binary_linux_conda_2.7_cpu_devtoolset7_test + - binary_linux_conda_3.6_cpu_devtoolset7_upload: context: org-member requires: - setup - - binary_linux_conda_3.6_cpu_test - - binary_linux_conda_3.7_cpu_upload: + - binary_linux_conda_3.6_cpu_devtoolset7_test + - binary_linux_conda_3.7_cpu_devtoolset7_upload: context: org-member requires: - setup - - binary_linux_conda_3.7_cpu_test - - binary_linux_conda_2.7_cu90_upload: + - binary_linux_conda_3.7_cpu_devtoolset7_test + - binary_linux_conda_2.7_cu92_devtoolset7_upload: context: org-member requires: - setup - - binary_linux_conda_2.7_cu90_test - - binary_linux_conda_3.6_cu90_upload: + - binary_linux_conda_2.7_cu92_devtoolset7_test + - binary_linux_conda_3.6_cu92_devtoolset7_upload: context: org-member requires: - setup - - binary_linux_conda_3.6_cu90_test - - binary_linux_conda_3.7_cu90_upload: + - binary_linux_conda_3.6_cu92_devtoolset7_test + - binary_linux_conda_3.7_cu92_devtoolset7_upload: context: org-member requires: - setup - - binary_linux_conda_3.7_cu90_test - - binary_linux_conda_2.7_cu100_upload: + - binary_linux_conda_3.7_cu92_devtoolset7_test + - binary_linux_conda_2.7_cu100_devtoolset7_upload: context: org-member requires: - setup - - binary_linux_conda_2.7_cu100_test - - binary_linux_conda_3.6_cu100_upload: + - binary_linux_conda_2.7_cu100_devtoolset7_test + - binary_linux_conda_3.6_cu100_devtoolset7_upload: context: org-member requires: - setup - - binary_linux_conda_3.6_cu100_test - - binary_linux_conda_3.7_cu100_upload: + - binary_linux_conda_3.6_cu100_devtoolset7_test + - binary_linux_conda_3.7_cu100_devtoolset7_upload: context: org-member requires: - setup - - binary_linux_conda_3.7_cu100_test - - binary_linux_libtorch_2.7m_cpu_devtoolset3_upload: + - binary_linux_conda_3.7_cu100_devtoolset7_test + - binary_linux_libtorch_2.7m_cpu_devtoolset7_upload: context: org-member requires: - setup - - binary_linux_libtorch_2.7m_cpu_devtoolset3_build - - binary_linux_libtorch_2.7m_cu90_devtoolset3_upload: + - binary_linux_libtorch_2.7m_cpu_devtoolset7_build + - binary_linux_libtorch_2.7m_cu92_devtoolset7_upload: context: org-member requires: - setup - - binary_linux_libtorch_2.7m_cu90_devtoolset3_build - - binary_linux_libtorch_2.7m_cu100_devtoolset3_upload: + - binary_linux_libtorch_2.7m_cu92_devtoolset7_build + - binary_linux_libtorch_2.7m_cu100_devtoolset7_upload: context: org-member requires: - setup - - binary_linux_libtorch_2.7m_cu100_devtoolset3_build + - binary_linux_libtorch_2.7m_cu100_devtoolset7_build - binary_macos_wheel_2.7_cpu_upload: context: org-member requires: diff --git a/.circleci/scripts/binary_linux_build.sh b/.circleci/scripts/binary_linux_build.sh index 9061b86d42e..cc85a7ce4ea 100755 --- a/.circleci/scripts/binary_linux_build.sh +++ b/.circleci/scripts/binary_linux_build.sh @@ -19,7 +19,7 @@ fi # We want to call unbuffer, which calls tclsh which finds the expect # package. The expect was installed by yum into /usr/bin so we want to # find /usr/bin/tclsh, but this is shadowed by /opt/conda/bin/tclsh in -# the conda docker images. +# the conda docker images, so we prepend it to the path here. if [[ "$PACKAGE_TYPE" == 'conda' ]]; then mkdir /just_tclsh_bin ln -s /usr/bin/tclsh /just_tclsh_bin/tclsh diff --git a/.circleci/scripts/binary_populate_env.sh b/.circleci/scripts/binary_populate_env.sh index 53ae14e2cd8..9da981d97de 100755 --- a/.circleci/scripts/binary_populate_env.sh +++ b/.circleci/scripts/binary_populate_env.sh @@ -38,15 +38,16 @@ else fi # Upload to parallel folder for gcc abis +# All nightlies used to be devtoolset3, then devtoolset7 was added as a build +# option, so the upload was redirected to nightly/devtoolset7 to avoid +# conflicts with other binaries (there shouldn't be any conflicts). Now we are +# making devtoolset7 the default. if [[ "$DESIRED_DEVTOOLSET" == 'devtoolset7' ]]; then - export PIP_UPLOAD_FOLDER='nightly/devtoolset7/' - if [[ "$PACKAGE_TYPE" == 'conda' ]]; then - echo "We don't handle conda builds with gcc ABI of 1, since we don't" - echo "want to add a new package name to the conda builds" - exit 1 - fi -else export PIP_UPLOAD_FOLDER='nightly/' +else + # On linux machines, this shouldn't actually be called anymore. This is just + # here for extra safety. + export PIP_UPLOAD_FOLDER='nightly/devtoolset3/' fi # We put this here so that OVERRIDE_PACKAGE_VERSION below can read from it @@ -75,7 +76,7 @@ export OVERRIDE_PACKAGE_VERSION="$PYTORCH_BUILD_VERSION" export TORCH_PACKAGE_NAME='torch-nightly' export TORCH_CONDA_BUILD_FOLDER='pytorch-nightly' -export USE_FBGEMM=0 +export USE_FBGEMM=1 export PIP_UPLOAD_FOLDER="$PIP_UPLOAD_FOLDER" export DOCKER_IMAGE="$DOCKER_IMAGE" diff --git a/.circleci/scripts/should_run_job.py b/.circleci/scripts/should_run_job.py index 81aaaaf4f17..47de30b223f 100644 --- a/.circleci/scripts/should_run_job.py +++ b/.circleci/scripts/should_run_job.py @@ -32,8 +32,8 @@ default_set = [ 'caffe2-cmake-cuda9.0-cudnn7-ubuntu16.04', # Binaries - 'manywheel 2.7mu cpu devtoolset3', - 'libtorch 2.7m cpu devtoolset3', + 'manywheel 2.7mu cpu devtoolset7', + 'libtorch 2.7m cpu devtoolset7', # Caffe2 Android 'caffe2-py2-android-ubuntu16.04', diff --git a/.circleci/verbatim-sources/linux-binary-build-defaults.yml b/.circleci/verbatim-sources/linux-binary-build-defaults.yml index 60eba428cd3..df014879c73 100644 --- a/.circleci/verbatim-sources/linux-binary-build-defaults.yml +++ b/.circleci/verbatim-sources/linux-binary-build-defaults.yml @@ -21,23 +21,18 @@ binary_linux_build: &binary_linux_build retry yum -q -y install epel-release retry yum -q -y install expect moreutils - run: - name: Upgrade gcc version (based on env var) + name: Update compiler to devtoolset7 command: | set -eux -o pipefail source /env if [[ "$DESIRED_DEVTOOLSET" == 'devtoolset7' ]]; then - source "/builder/upgrade_gcc_abi.sh" + source "/builder/update_compiler.sh" # Env variables are not persisted into the next step echo "export PATH=$PATH" >> /env echo "export LD_LIBRARY_PATH=$LD_LIBRARY_PATH" >> /env - - # We need to set this variable manually because - # https://github.com/pytorch/pytorch/blob/master/torch/abi-check.cpp - # sets the ABI to 0 by default - echo "export _GLIBCXX_USE_CXX11_ABI=1" >> /env else - echo "Not upgrading gcc version" + echo "Not updating compiler" fi - run: name: Build diff --git a/.circleci/verbatim-sources/workflows-binary-builds-smoke-subset.yml b/.circleci/verbatim-sources/workflows-binary-builds-smoke-subset.yml index 013e1fdd066..484078fffe8 100644 --- a/.circleci/verbatim-sources/workflows-binary-builds-smoke-subset.yml +++ b/.circleci/verbatim-sources/workflows-binary-builds-smoke-subset.yml @@ -5,22 +5,22 @@ # pytorch-ci-hud to adjust the list of whitelisted builds # at https://github.com/ezyang/pytorch-ci-hud/blob/master/src/BuildHistoryDisplay.js - - binary_linux_manywheel_2.7mu_cpu_devtoolset3_build: + - binary_linux_manywheel_2.7mu_cpu_devtoolset7_build: requires: - setup - - binary_linux_manywheel_3.7m_cu100_devtoolset3_build: + - binary_linux_manywheel_3.7m_cu100_devtoolset7_build: requires: - setup - - binary_linux_conda_2.7_cpu_build: + - binary_linux_conda_2.7_cpu_devtoolset7_build: requires: - setup # This binary build is currently broken, see https://github.com/pytorch/pytorch/issues/16710 - # - binary_linux_conda_3.6_cu90_build - - binary_linux_libtorch_2.7m_cpu_devtoolset3_build: + # - binary_linux_conda_3.6_cu90_devtoolset7_build + - binary_linux_libtorch_2.7m_cpu_devtoolset7_build: requires: - setup # TODO we should test a libtorch cuda build, but they take too long - # - binary_linux_libtorch_2.7m_cu90_devtoolset3_build + # - binary_linux_libtorch_2.7m_cu90_devtoolset7_build - binary_macos_wheel_3.6_cpu_build: requires: - setup @@ -31,21 +31,21 @@ requires: - setup - - binary_linux_manywheel_2.7mu_cpu_devtoolset3_test: + - binary_linux_manywheel_2.7mu_cpu_devtoolset7_test: requires: - setup - - binary_linux_manywheel_2.7mu_cpu_devtoolset3_build - - binary_linux_manywheel_3.7m_cu100_devtoolset3_test: + - binary_linux_manywheel_2.7mu_cpu_devtoolset7_build + - binary_linux_manywheel_3.7m_cu100_devtoolset7_test: requires: - setup - - binary_linux_manywheel_3.7m_cu100_devtoolset3_build - - binary_linux_conda_2.7_cpu_test: + - binary_linux_manywheel_3.7m_cu100_devtoolset7_build + - binary_linux_conda_2.7_cpu_devtoolset7_test: requires: - setup - - binary_linux_conda_2.7_cpu_build + - binary_linux_conda_2.7_cpu_devtoolset7_build # This binary build is currently broken, see https://github.com/pytorch/pytorch/issues/16710 - # - binary_linux_conda_3.6_cu90_test: + # - binary_linux_conda_3.6_cu90_devtoolset7_test: # requires: # - setup - # - binary_linux_conda_3.6_cu90_build + # - binary_linux_conda_3.6_cu90_devtoolset7_build diff --git a/CMakeLists.txt b/CMakeLists.txt index a763c68bdc0..22700020029 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,6 +19,7 @@ endif() if (DEFINED GLIBCXX_USE_CXX11_ABI) if (${GLIBCXX_USE_CXX11_ABI} EQUAL 1) set(CXX_STANDARD_REQUIRED ON) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_GLIBCXX_USE_CXX11_ABI=1") endif() endif()