Add numpy 2.0.0rc1 support to conda and wheels (#1768)

* Add numpy 2.0.0rc1 support to conda and wheels

* conda

* conda

* test

* fix

Author: atalman

aarch64_linux/aarch64_ci_setup.sh

@@ -28,7 +28,7 @@ conda activate "${CONDA_ENV_NAME}"
 if [[ "$DESIRED_PYTHON"  == "3.8" ]]; then
     pip install -q numpy==1.24.4
 else
-    pip install -q --pre numpy==2.0.0b1
+    pip install -q --pre numpy==2.0.0rc1
 fi
 conda install -y -c conda-forge pyyaml==6.0.1 patchelf==0.17.2 pygit2==1.13.2 openblas==0.3.25=*openmp* ninja==1.11.1 scons==4.5.2
 

conda/build_pytorch.sh

@@ -85,7 +85,7 @@ if [ -z "$ANACONDA_TOKEN" ]; then
 fi
 if [[ -z "$ANACONDA_USER" ]]; then
     # This is the channel that finished packages will be uploaded to
-    ANACONDA_USER=soumith
+    ANACONDA_USER='pytorch'
 fi
 if [[ -z "$GITHUB_ORG" ]]; then
     GITHUB_ORG='pytorch'
@@ -360,12 +360,14 @@ for py_ver in "${DESIRED_PYTHON[@]}"; do
     fi
 
     echo "Calling conda-build at $(date)"
+    # TODO: Remove atalman channel once we can wend numpy from
+    # anaconda or pytorch or pytorch nightly channel
     time CMAKE_ARGS=${CMAKE_ARGS[@]} \
          EXTRA_CAFFE2_CMAKE_FLAGS=${EXTRA_CAFFE2_CMAKE_FLAGS[@]} \
          PYTORCH_GITHUB_ROOT_DIR="$pytorch_rootdir" \
          PYTORCH_BUILD_STRING="$build_string" \
          PYTORCH_MAGMA_CUDA_VERSION="$cuda_nodot" \
-         conda build -c "$ANACONDA_USER" \
+         conda build -c "$ANACONDA_USER" -c atalman \
                      ${NO_TEST:-} \
                      --no-anaconda-upload \
                      --python "$py_ver" \

conda/pytorch-nightly/meta.yaml

@@ -30,9 +30,7 @@ requirements:
     - ninja
     - libuv # [win]
     - numpy=1.19 # [py <= 39]
-    - numpy=1.21.5 # [py == 310]
-    - numpy=1.23.5 # [py == 311]
-    - numpy=1.26.0 # [py >= 312]
+    - numpy=2.0.0rc1 # [py >= 39]
     - openssl=1.1.1l # [py >= 38 and py <= 310 and linux]
     - openssl=1.1.1s # [py == 311 and linux]
     - openssl=3.0.12 # [py >= 312 and linux]

manywheel/build_common.sh

@@ -115,11 +115,11 @@ case ${DESIRED_PYTHON} in
     retry pip install -q numpy==1.15
     ;;
   cp31*)
-    retry pip install -q --pre numpy==2.0.0b1
+    retry pip install -q --pre numpy==2.0.0rc1
     ;;
   # Should catch 3.9+
   *)
-    retry pip install -q --pre numpy==2.0.0b1
+    retry pip install -q --pre numpy==2.0.0rc1
     ;;
 esac
 

wheel/build_wheel.sh

@@ -135,25 +135,25 @@ case $desired_python in
         echo "Using 3.12 deps"
         SETUPTOOLS_PINNED_VERSION=">=68.0.0"
         PYYAML_PINNED_VERSION=">=6.0.1"
-        NUMPY_PINNED_VERSION="=2.0.0b1"
+        NUMPY_PINNED_VERSION="=2.0.0rc1"
         ;;
     3.11)
         echo "Using 3.11 deps"
         SETUPTOOLS_PINNED_VERSION=">=46.0.0"
         PYYAML_PINNED_VERSION=">=5.3"
-        NUMPY_PINNED_VERSION="=2.0.0b1"
+        NUMPY_PINNED_VERSION="=2.0.0rc1"
         ;;
     3.10)
         echo "Using 3.10 deps"
         SETUPTOOLS_PINNED_VERSION=">=46.0.0"
         PYYAML_PINNED_VERSION=">=5.3"
-        NUMPY_PINNED_VERSION="=2.0.0b1"
+        NUMPY_PINNED_VERSION="=2.0.0rc1"
         ;;
     3.9)
         echo "Using 3.9 deps"
         SETUPTOOLS_PINNED_VERSION=">=46.0.0"
         PYYAML_PINNED_VERSION=">=5.3"
-        NUMPY_PINNED_VERSION="=2.0.0b1"
+        NUMPY_PINNED_VERSION="=2.0.0rc1"
         ;;
     3.8)
         echo "Using 3.8 deps"

windows/internal/smoke_test.bat

@@ -53,10 +53,10 @@ if errorlevel 1 exit /b 1
 set "PATH=%CD%\Python%PYTHON_VERSION%\Scripts;%CD%\Python;%PATH%"
 
 
-if "%DESIRED_PYTHON%" == "3.12" pip install -q --pre numpy==2.0.0b1 protobuf
-if "%DESIRED_PYTHON%" == "3.11" pip install -q --pre numpy==2.0.0b1 protobuf
-if "%DESIRED_PYTHON%" == "3.10" pip install -q --pre numpy==2.0.0b1 protobuf
-if "%DESIRED_PYTHON%" == "3.9" pip install -q --pre numpy==2.0.0b1 protobuf
+if "%DESIRED_PYTHON%" == "3.12" pip install -q --pre numpy==2.0.0rc1 protobuf
+if "%DESIRED_PYTHON%" == "3.11" pip install -q --pre numpy==2.0.0rc1 protobuf
+if "%DESIRED_PYTHON%" == "3.10" pip install -q --pre numpy==2.0.0rc1 protobuf
+if "%DESIRED_PYTHON%" == "3.9" pip install -q --pre numpy==2.0.0rc1 protobuf
 if "%DESIRED_PYTHON%" == "3.8" pip install -q numpy protobuf
 
 if errorlevel 1 exit /b 1