Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add numpy 2.0.0rc1 support to conda and wheels #1768

Merged
merged 5 commits into from
Apr 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion aarch64_linux/aarch64_ci_setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
6 changes: 4 additions & 2 deletions conda/build_pytorch.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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" \
Expand Down
4 changes: 1 addition & 3 deletions conda/pytorch-nightly/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
4 changes: 2 additions & 2 deletions manywheel/build_common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
8 changes: 4 additions & 4 deletions wheel/build_wheel.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
8 changes: 4 additions & 4 deletions windows/internal/smoke_test.bat
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading