Merge branch 'main' into fix_validations

Author: atalman

aarch64_linux/aarch64_ci_setup.sh

@@ -19,7 +19,17 @@ curl -L -o /mambaforge.sh https://github.com/conda-forge/miniforge/releases/late
 chmod +x /mambaforge.sh
 /mambaforge.sh -b -p /opt/conda
 rm /mambaforge.sh
-/opt/conda/bin/conda config --set ssl_verify False
-/opt/conda/bin/conda install -y -c conda-forge python=${DESIRED_PYTHON} numpy pyyaml setuptools patchelf pygit2 openblas ninja scons
+source /opt/conda/etc/profile.d/conda.sh
+conda config --set ssl_verify False
+conda create -y -c conda-forge -n aarch64_env python=${DESIRED_PYTHON}
+conda activate aarch64_env
+
+if [[ "$DESIRED_PYTHON"  == "3.8" ]]; then
+    NUMPY_VERSION="1.24.4"
+else
+    NUMPY_VERSION="1.26.0"
+fi
+conda install -y -c conda-forge numpy==${NUMPY_VERSION} pyyaml==6.0.1 patchelf==0.17.2 pygit2==1.13.2 openblas==0.3.24 ninja==1.11.1 scons==4.5.2
+
 python --version
 conda --version

build_m1_domains.sh

@@ -21,17 +21,20 @@ requirements:
     - pyyaml
     {% if cross_compile_arm64 == 0 %}
     - mkl-include # [x86_64]
-    - mkl=2020.2 # [x86_64 and not win]
+    - mkl=2020.2 # [py <= 311 and x86_64 and not win]
+    - mkl=2023.1 # [py >= 312 and x86_64 and not win]
     - mkl=2021.4 # [x86_64 and win]
     {% endif %}
     - typing_extensions
     - ninja
     - libuv # [win]
     - numpy=1.19 # [py <= 39]
     - numpy=1.21.5 # [py == 310]
-    - numpy=1.23.5 # [py >= 311]
+    - numpy=1.23.5 # [py == 311]
+    - numpy=1.26.1 # [py >= 312]
     - openssl=1.1.1l # [py >= 38 and py <= 310 and linux]
-    - openssl=1.1.1s # [py >= 311 and linux]
+    - openssl=1.1.1s # [py == 311 and linux]
+    - openssl=3.1.4 # [py >= 312 and linux]
 {{ environ.get('PYTORCH_LLVM_PACKAGE', '    - llvmdev=9') }}
 {{ environ.get('MAGMA_PACKAGE', '') }}
 

conda/pytorch-nightly/meta.yaml

@@ -131,6 +131,9 @@ case ${DESIRED_PYTHON} in
   cp311*)
     retry pip install -q numpy==1.23.1
     ;;
+  cp312*)
+    retry pip install -q numpy==1.26.1
+    ;;
   # Should catch 3.9+
   *)
     retry pip install -q numpy==1.19.4

conda/upload.sh

@@ -47,7 +47,7 @@ if [[ -n "$DESIRED_CUDA" ]]; then
     # There really has to be a better way to do this - eli
     # Possibly limiting builds to specific cuda versions be delimiting images would be a choice
     if [[ "$OS_NAME" == *"Ubuntu"* ]]; then
-        echo "Switching to CUDA version $desired_cuda"
+        echo "Switching to CUDA version ${DESIRED_CUDA}"
         /builder/conda/switch_cuda_version.sh "${DESIRED_CUDA}"
     fi
 else
@@ -263,7 +263,9 @@ else
 fi
 
 # TODO: Remove me when Triton has a proper release channel
-if [[ $(uname) == "Linux" ]]; then
+# No triton dependency for now on 3.12 since we don't have binaries for it
+# and torch.compile doesn't work.
+if [[ $(uname) == "Linux" && "$DESIRED_PYTHON" != "3.12" ]]; then
     TRITON_SHORTHASH=$(cut -c1-10 $PYTORCH_ROOT/.github/ci_commit_pins/triton.txt)
 
     if [[ -z "$PYTORCH_EXTRA_INSTALL_REQUIREMENTS" ]]; then

manywheel/build_common.sh

@@ -343,7 +343,7 @@ for pkg in /$LIBTORCH_HOUSE_DIR/libtorch*.zip; do
     fi
 
     # zip up the wheel back
-    zip -rq $(basename $pkg) $PREIX*
+    zip -rq $(basename $pkg) $PREFIX*
 
     # replace original wheel
     rm -f $pkg

manywheel/build_cuda.sh

@@ -222,7 +222,9 @@ if [[ $ROCM_INT -ge 50600 ]]; then
 fi
 
 # Add triton install dependency
-if [[ $(uname) == "Linux" ]]; then
+# No triton dependency for now on 3.12 since we don't have binaries for it
+# and torch.compile doesn't work.
+if [[ $(uname) == "Linux" && "$DESIRED_PYTHON" != "3.12" ]]; then
     TRITON_SHORTHASH=$(cut -c1-10 $PYTORCH_ROOT/.ci/docker/ci_commit_pins/triton-rocm.txt)
     TRITON_VERSION=$(cat $PYTORCH_ROOT/.ci/docker/triton_version.txt)
 

manywheel/build_libtorch.sh

@@ -34,3 +34,4 @@ promote_staging_binaries torch "${PYTORCH_VERSION}"
 promote_staging_binaries torchvision "${TORCHVISION_VERSION}"
 promote_staging_binaries torchaudio "${TORCHAUDIO_VERSION}"
 promote_staging_binaries torchtext "${TORCHTEXT_VERSION}"
+promote_staging_binaries torchdata "${TORCHDATA_VERSION}"