Revert "conda: add _GLIBCXX_USE_CXX11_ABI=1 support for linux cpu wheel (#1062)" (#1086)

This reverts commit af69c3e.

Author: malfet

conda/Dockerfile_cxx11-abi

@@ -4,6 +4,6 @@ set -eou pipefail
 
 TOPDIR=$(git rev-parse --show-toplevel)
 
-for CUDA_VERSION in 11.7 11.6 11.5 11.3 10.2 cpu cpu-cxx11-abi; do
+for CUDA_VERSION in 11.7 11.6 11.5 11.3 10.2 cpu; do
   CUDA_VERSION="${CUDA_VERSION}" conda/build_docker.sh
 done

conda/build_all_docker.sh

@@ -10,18 +10,12 @@ DEVTOOLSET_VERSION="9"
 if [[ ${CUDA_VERSION:0:2} == "10" ]]; then
   DEVTOOLSET_VERSION="7"
 fi
-CONDA_LINUX_VERSION=${CONDA_LINUX_VERSION:-}
 
 case ${CUDA_VERSION} in
   cpu)
     BASE_TARGET=base
     DOCKER_TAG=cpu
     ;;
-  cpu-cxx11-abi)
-    BASE_TARGET=base
-    DOCKER_TAG=cpu-cxx11-abi
-    CONDA_LINUX_VERSION="cxx11-abi"
-    ;;
   all)
     BASE_TARGET=all_cuda
     DOCKER_TAG=latest
@@ -32,12 +26,6 @@ case ${CUDA_VERSION} in
     ;;
 esac
 
-if [[ -n ${CONDA_LINUX_VERSION} ]]; then
-    DOCKERFILE_SUFFIX=_${CONDA_LINUX_VERSION}
-else
-    DOCKERFILE_SUFFIX=''
-fi
-
 (
   set -x
   docker build \
@@ -46,7 +34,7 @@ fi
     --build-arg "CUDA_VERSION=${CUDA_VERSION}" \
     --build-arg "DEVTOOLSET_VERSION=${DEVTOOLSET_VERSION}" \
     -t "pytorch/conda-builder:${DOCKER_TAG}" \
-    -f "${TOPDIR}/conda/Dockerfile${DOCKERFILE_SUFFIX}" \
+    -f "${TOPDIR}/conda/Dockerfile" \
     ${TOPDIR}
 )
 

conda/build_docker.sh

@@ -49,7 +49,7 @@ else
     build_version="$2"
     build_number="$3"
 fi
-if [[ "$desired_cuda" != cpu ]] && [[ "$desired_cuda" != cpu-cxx11-abi ]]; then
+if [[ "$desired_cuda" != cpu ]]; then
   desired_cuda="$(echo $desired_cuda | tr -d cuda. )"
 fi
 echo "Building cuda version $desired_cuda and pytorch version: $build_version build_number: $build_number"
@@ -108,7 +108,7 @@ fi
 if [[ "$OSTYPE" == "darwin"* ]]; then
     DEVELOPER_DIR=/Applications/Xcode9.app/Contents/Developer
 fi
-if [[ "$desired_cuda" == 'cpu' ]] || [[ "$desired_cuda" == 'cpu-cxx11-abi' ]]; then
+if [[ "$desired_cuda" == 'cpu' ]]; then
     cpu_only=1
 else
     # Switch desired_cuda to be M.m to be consistent with other scripts in

conda/build_pytorch.sh

@@ -6,15 +6,8 @@ export CMAKE_PREFIX_PATH=$PREFIX
 export TH_BINARY_BUILD=1 # links CPU BLAS libraries thrice in a row (was needed for some MKL static linkage)
 export PYTORCH_BUILD_VERSION=$PKG_VERSION
 export PYTORCH_BUILD_NUMBER=$PKG_BUILDNUM
-if [[ "$DESIRED_DEVTOOLSET" == *"cxx11-abi"* ]]; then
-    export _GLIBCXX_USE_CXX11_ABI=1
-    export USE_LLVM="/opt/llvm"
-    export LLVM_DIR="$USE_LLVM/lib/cmake/llvm"
-else
-    export _GLIBCXX_USE_CXX11_ABI=0
-    export USE_LLVM="/opt/llvm_no_cxx11_abi"
-    export LLVM_DIR="$USE_LLVM/lib/cmake/llvm"
-fi
+export USE_LLVM="/opt/llvm_no_cxx11_abi"
+export LLVM_DIR="$USE_LLVM/lib/cmake/llvm"
 
 # set OPENSSL_ROOT_DIR=/opt/openssl if it exists
 if [[ -e /opt/openssl ]]; then

conda/pytorch-nightly/build.sh

@@ -70,7 +70,6 @@ build:
     - DEVELOPER_DIR
     - DEBUG
     - USE_FBGEMM
-    - DESIRED_DEVTOOLSET
     - USE_GLOO_WITH_OPENSSL # [unix]
     - USE_SCCACHE # [win]
     - USE_DISTRIBUTED # [unix]