diff --git a/.circleci/scripts/binary_linux_build.sh b/.circleci/scripts/binary_linux_build.sh index ee707d94a07..1e593dfc4cb 100755 --- a/.circleci/scripts/binary_linux_build.sh +++ b/.circleci/scripts/binary_linux_build.sh @@ -16,9 +16,7 @@ if [[ "${DESIRED_CUDA}" =~ cu1[1-2][0-9] ]]; then fi # Parse the parameters -if [[ "$PACKAGE_TYPE" == 'conda' ]]; then - build_script='conda/build_pytorch.sh' -elif [[ "$DESIRED_CUDA" == cpu ]]; then +if [[ "$DESIRED_CUDA" == cpu ]]; then build_script='manywheel/build_cpu.sh' elif [[ "$DESIRED_CUDA" == *"rocm"* ]]; then build_script='manywheel/build_rocm.sh' diff --git a/.circleci/scripts/binary_linux_test.sh b/.circleci/scripts/binary_linux_test.sh index beb4de546d5..5f2ec25dd45 100755 --- a/.circleci/scripts/binary_linux_test.sh +++ b/.circleci/scripts/binary_linux_test.sh @@ -22,10 +22,7 @@ fi python_nodot="\$(echo $DESIRED_PYTHON | tr -d m.u)" # Set up Python -if [[ "$PACKAGE_TYPE" == conda ]]; then - retry conda create -qyn testenv python="$DESIRED_PYTHON" - source activate testenv >/dev/null -elif [[ "$PACKAGE_TYPE" != libtorch ]]; then +if [[ "$PACKAGE_TYPE" != libtorch ]]; then python_path="/opt/python/cp\$python_nodot-cp\${python_nodot}" if [[ "\$python_nodot" = *t ]]; then python_digits="\$(echo $DESIRED_PYTHON | tr -cd [:digit:])" @@ -69,30 +66,7 @@ else CHANNEL="test" fi -if [[ "$PACKAGE_TYPE" == conda ]]; then - ( - # For some reason conda likes to re-activate the conda environment when attempting this install - # which means that a deactivate is run and some variables might not exist when that happens, - # namely CONDA_MKL_INTERFACE_LAYER_BACKUP from libblas so let's just ignore unbound variables when - # it comes to the conda installation commands - set +u - retry conda install \${EXTRA_CONDA_FLAGS} -yq \ - "numpy\${NUMPY_PIN}" \ - mkl>=2018 \ - ninja \ - sympy>=1.12 \ - typing-extensions \ - ${PROTOBUF_PACKAGE} - if [[ "$DESIRED_CUDA" == 'cpu' ]]; then - retry conda install -c pytorch -y cpuonly - else - cu_ver="${DESIRED_CUDA:2:2}.${DESIRED_CUDA:4}" - CUDA_PACKAGE="pytorch-cuda" - retry conda install \${EXTRA_CONDA_FLAGS} -yq -c nvidia -c "pytorch-\${CHANNEL}" "pytorch-cuda=\${cu_ver}" - fi - conda install \${EXTRA_CONDA_FLAGS} -y "\$pkg" --offline - ) -elif [[ "$PACKAGE_TYPE" != libtorch ]]; then +if [[ "$PACKAGE_TYPE" != libtorch ]]; then if [[ "\$BUILD_ENVIRONMENT" != *s390x* ]]; then if [[ "$USE_SPLIT_BUILD" == "true" ]]; then pkg_no_python="$(ls -1 /final_pkgs/torch_no_python* | sort |tail -1)" diff --git a/.circleci/scripts/binary_macos_build.sh b/.circleci/scripts/binary_macos_build.sh index 3f9e6e8eb51..fd7e00c9fa8 100755 --- a/.circleci/scripts/binary_macos_build.sh +++ b/.circleci/scripts/binary_macos_build.sh @@ -7,9 +7,5 @@ mkdir -p "$PYTORCH_FINAL_PACKAGE_DIR" # Build export USE_PYTORCH_METAL_EXPORT=1 export USE_COREML_DELEGATE=1 -if [[ "$PACKAGE_TYPE" == conda ]]; then - "${BUILDER_ROOT}/conda/build_pytorch.sh" -else - export TORCH_PACKAGE_NAME="$(echo $TORCH_PACKAGE_NAME | tr '-' '_')" - "${BUILDER_ROOT}/wheel/build_wheel.sh" -fi +export TORCH_PACKAGE_NAME="$(echo $TORCH_PACKAGE_NAME | tr '-' '_')" +"${BUILDER_ROOT}/wheel/build_wheel.sh" diff --git a/.circleci/scripts/binary_macos_test.sh b/.circleci/scripts/binary_macos_test.sh index c36bfc28f67..2f3b5805baf 100755 --- a/.circleci/scripts/binary_macos_test.sh +++ b/.circleci/scripts/binary_macos_test.sh @@ -19,8 +19,6 @@ if [[ "$PACKAGE_TYPE" == libtorch ]]; then pkg="$(ls $workdir/final_pkgs/*-latest.zip)" unzip "$pkg" -d /tmp cd /tmp/libtorch -elif [[ "$PACKAGE_TYPE" == conda ]]; then - conda install -y "$pkg" else pip install "$pkg" -v fi diff --git a/.circleci/scripts/binary_windows_build.sh b/.circleci/scripts/binary_windows_build.sh index 128d5198731..3b829154c8f 100644 --- a/.circleci/scripts/binary_windows_build.sh +++ b/.circleci/scripts/binary_windows_build.sh @@ -20,12 +20,8 @@ echo "Free space on filesystem before build:" df -h pushd "$BUILDER_ROOT" -if [[ "$PACKAGE_TYPE" == 'conda' ]]; then - ./windows/internal/build_conda.bat -elif [[ "$PACKAGE_TYPE" == 'wheel' || "$PACKAGE_TYPE" == 'libtorch' ]]; then - export NIGHTLIES_PYTORCH_ROOT="$PYTORCH_ROOT" - ./windows/internal/build_wheels.bat -fi +export NIGHTLIES_PYTORCH_ROOT="$PYTORCH_ROOT" +./windows/internal/build_wheels.bat echo "Free space on filesystem after build:" df -h