From fb53084d3733ef42804d25712590481effa942e4 Mon Sep 17 00:00:00 2001 From: albanD Date: Thu, 9 Nov 2023 14:02:52 -0500 Subject: [PATCH 01/18] update package versions for 3.12 --- conda/pytorch-nightly/meta.yaml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/conda/pytorch-nightly/meta.yaml b/conda/pytorch-nightly/meta.yaml index 4a03c3d05..6f92f73be 100644 --- a/conda/pytorch-nightly/meta.yaml +++ b/conda/pytorch-nightly/meta.yaml @@ -21,7 +21,8 @@ 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 @@ -29,9 +30,11 @@ requirements: - 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.0 # [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', '') }} From 53b65368cda38f5c193116bd4860413c0d5018a8 Mon Sep 17 00:00:00 2001 From: albanD Date: Fri, 10 Nov 2023 12:57:16 -0500 Subject: [PATCH 02/18] wheel env setup --- wheel/build_wheel.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/wheel/build_wheel.sh b/wheel/build_wheel.sh index c3c45cf42..51daaea41 100755 --- a/wheel/build_wheel.sh +++ b/wheel/build_wheel.sh @@ -137,6 +137,11 @@ SETUPTOOLS_PINNED_VERSION="=46.0.0" PYYAML_PINNED_VERSION="=5.3" EXTRA_CONDA_INSTALL_FLAGS="" case ${desired_python} in + 3.12) + SETUPTOOLS_PINNED_VERSION=">=68.2.2" + PYYAML_PINNED_VERSION=">=6.0.1" + NUMPY_PINNED_VERSION="==1.16.1" + ;; 3.11) SETUPTOOLS_PINNED_VERSION=">=46.0.0" PYYAML_PINNED_VERSION=">=5.3" From 028e3e9a57b916c5df23b42d3cad28fde0d1c2cb Mon Sep 17 00:00:00 2001 From: albanD Date: Fri, 10 Nov 2023 13:36:14 -0500 Subject: [PATCH 03/18] more versions --- manywheel/build_common.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/manywheel/build_common.sh b/manywheel/build_common.sh index f4794b719..79b9cdd89 100644 --- a/manywheel/build_common.sh +++ b/manywheel/build_common.sh @@ -131,6 +131,9 @@ case ${DESIRED_PYTHON} in cp311*) retry pip install -q numpy==1.23.1 ;; + cp312*) + retry pip install -q numpy==1.16.1 + ;; # Should catch 3.9+ *) retry pip install -q numpy==1.19.4 From 908fb0cbf49a29caf229c6dd6a051b7fe977a02c Mon Sep 17 00:00:00 2001 From: albanD Date: Fri, 10 Nov 2023 13:41:52 -0500 Subject: [PATCH 04/18] update --- manywheel/build_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manywheel/build_common.sh b/manywheel/build_common.sh index 79b9cdd89..31f188d94 100644 --- a/manywheel/build_common.sh +++ b/manywheel/build_common.sh @@ -132,7 +132,7 @@ case ${DESIRED_PYTHON} in retry pip install -q numpy==1.23.1 ;; cp312*) - retry pip install -q numpy==1.16.1 + retry pip install -q numpy==1.26.1 ;; # Should catch 3.9+ *) From d81bac243534b972aee0a5a2a10ca6c0af234e64 Mon Sep 17 00:00:00 2001 From: albanD Date: Fri, 10 Nov 2023 13:42:30 -0500 Subject: [PATCH 05/18] typo --- wheel/build_wheel.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wheel/build_wheel.sh b/wheel/build_wheel.sh index 51daaea41..b1e2f6eba 100755 --- a/wheel/build_wheel.sh +++ b/wheel/build_wheel.sh @@ -140,7 +140,7 @@ case ${desired_python} in 3.12) SETUPTOOLS_PINNED_VERSION=">=68.2.2" PYYAML_PINNED_VERSION=">=6.0.1" - NUMPY_PINNED_VERSION="==1.16.1" + NUMPY_PINNED_VERSION="==1.26.1" ;; 3.11) SETUPTOOLS_PINNED_VERSION=">=46.0.0" From b19409f16bbaa6e0703f42c9339a24017aa9a904 Mon Sep 17 00:00:00 2001 From: albanD Date: Fri, 10 Nov 2023 13:43:07 -0500 Subject: [PATCH 06/18] use 1.26.1 everywhere --- conda/pytorch-nightly/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda/pytorch-nightly/meta.yaml b/conda/pytorch-nightly/meta.yaml index 6f92f73be..882f13da0 100644 --- a/conda/pytorch-nightly/meta.yaml +++ b/conda/pytorch-nightly/meta.yaml @@ -31,7 +31,7 @@ requirements: - numpy=1.19 # [py <= 39] - numpy=1.21.5 # [py == 310] - numpy=1.23.5 # [py == 311] - - numpy=1.26.0 # [py >= 312] + - 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=3.1.4 # [py >= 312 and linux] From 55f133c9d65d72a0ca38098aa6fc1fead13ae0c6 Mon Sep 17 00:00:00 2001 From: albanD Date: Fri, 10 Nov 2023 15:26:41 -0500 Subject: [PATCH 07/18] base case statement? --- wheel/build_wheel.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wheel/build_wheel.sh b/wheel/build_wheel.sh index b1e2f6eba..b6c4bd3c5 100755 --- a/wheel/build_wheel.sh +++ b/wheel/build_wheel.sh @@ -136,7 +136,7 @@ export CMAKE_PREFIX_PATH=${CONDA_PREFIX:-"$(dirname $(which conda))/../"} SETUPTOOLS_PINNED_VERSION="=46.0.0" PYYAML_PINNED_VERSION="=5.3" EXTRA_CONDA_INSTALL_FLAGS="" -case ${desired_python} in +case $desired_python in 3.12) SETUPTOOLS_PINNED_VERSION=">=68.2.2" PYYAML_PINNED_VERSION=">=6.0.1" From cb1d3d724b138cc38c19a7fe6d44ef1e560087a0 Mon Sep 17 00:00:00 2001 From: albanD Date: Fri, 10 Nov 2023 15:31:11 -0500 Subject: [PATCH 08/18] windows update --- windows/condaenv.bat | 1 + 1 file changed, 1 insertion(+) diff --git a/windows/condaenv.bat b/windows/condaenv.bat index 464eeb01c..0736baf07 100644 --- a/windows/condaenv.bat +++ b/windows/condaenv.bat @@ -14,6 +14,7 @@ FOR %%v IN (%DESIRED_PYTHON%) DO ( if "%%v" == "3.9" call conda create -n py!PYTHON_VERSION_STR! -y -q numpy>=1.11 "mkl=2020.2" pyyaml boto3 cmake ninja typing_extensions python=%%v if "%%v" == "3.10" call conda create -n py!PYTHON_VERSION_STR! -y -q -c=conda-forge numpy=1.21.3 "mkl=2020.2" pyyaml boto3 "cmake=3.19.6" ninja typing_extensions python=%%v if "%%v" == "3.11" call conda create -n py!PYTHON_VERSION_STR! -y -q -c=conda-forge numpy=1.23.4 "mkl=2020.2" pyyaml boto3 "cmake=3.19.6" ninja typing_extensions python=%%v + if "%%v" == "3.11" call conda create -n py!PYTHON_VERSION_STR! -y -q -c=conda-forge numpy=1.26.1 "mkl=2023.1" pyyaml boto3 "cmake=3.19.6" ninja typing_extensions python=%%v if "%%v" == "3" call conda create -n py!PYTHON_VERSION_STR! -y -q numpy=1.11 "mkl=2020.2" pyyaml boto3 cmake ninja typing_extensions python=%%v ) endlocal From bb502fee507ef204e3258a619f2b3aa64cc95f6b Mon Sep 17 00:00:00 2001 From: albanD Date: Fri, 10 Nov 2023 16:36:30 -0500 Subject: [PATCH 09/18] typo --- windows/condaenv.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows/condaenv.bat b/windows/condaenv.bat index 0736baf07..c813eb623 100644 --- a/windows/condaenv.bat +++ b/windows/condaenv.bat @@ -14,7 +14,7 @@ FOR %%v IN (%DESIRED_PYTHON%) DO ( if "%%v" == "3.9" call conda create -n py!PYTHON_VERSION_STR! -y -q numpy>=1.11 "mkl=2020.2" pyyaml boto3 cmake ninja typing_extensions python=%%v if "%%v" == "3.10" call conda create -n py!PYTHON_VERSION_STR! -y -q -c=conda-forge numpy=1.21.3 "mkl=2020.2" pyyaml boto3 "cmake=3.19.6" ninja typing_extensions python=%%v if "%%v" == "3.11" call conda create -n py!PYTHON_VERSION_STR! -y -q -c=conda-forge numpy=1.23.4 "mkl=2020.2" pyyaml boto3 "cmake=3.19.6" ninja typing_extensions python=%%v - if "%%v" == "3.11" call conda create -n py!PYTHON_VERSION_STR! -y -q -c=conda-forge numpy=1.26.1 "mkl=2023.1" pyyaml boto3 "cmake=3.19.6" ninja typing_extensions python=%%v + if "%%v" == "3.12" call conda create -n py!PYTHON_VERSION_STR! -y -q -c=conda-forge numpy=1.26.1 "mkl=2023.1" pyyaml boto3 "cmake=3.19.6" ninja typing_extensions python=%%v if "%%v" == "3" call conda create -n py!PYTHON_VERSION_STR! -y -q numpy=1.11 "mkl=2020.2" pyyaml boto3 cmake ninja typing_extensions python=%%v ) endlocal From 0b532f3a0638f81dc09f51209bde133926c8f255 Mon Sep 17 00:00:00 2001 From: albanD Date: Fri, 10 Nov 2023 16:43:54 -0500 Subject: [PATCH 10/18] why is macos version wrong? --- wheel/build_wheel.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/wheel/build_wheel.sh b/wheel/build_wheel.sh index b6c4bd3c5..ae23b60d0 100755 --- a/wheel/build_wheel.sh +++ b/wheel/build_wheel.sh @@ -138,26 +138,31 @@ PYYAML_PINNED_VERSION="=5.3" EXTRA_CONDA_INSTALL_FLAGS="" case $desired_python in 3.12) + echo "Using 3.12 deps" SETUPTOOLS_PINNED_VERSION=">=68.2.2" PYYAML_PINNED_VERSION=">=6.0.1" NUMPY_PINNED_VERSION="==1.26.1" ;; 3.11) + echo "Using 3.11 deps" SETUPTOOLS_PINNED_VERSION=">=46.0.0" PYYAML_PINNED_VERSION=">=5.3" NUMPY_PINNED_VERSION="==1.23.5" ;; 3.10) + echo "Using 3.10 deps" SETUPTOOLS_PINNED_VERSION=">=46.0.0" PYYAML_PINNED_VERSION=">=5.3" NUMPY_PINNED_VERSION="=1.21.2" ;; 3.9) + echo "Using 3.9 deps" SETUPTOOLS_PINNED_VERSION=">=46.0.0" PYYAML_PINNED_VERSION=">=5.3" NUMPY_PINNED_VERSION="=1.19" ;; 3.8) + echo "Using 3.8 deps" if [[ "$(uname -m)" == "arm64" ]]; then SETUPTOOLS_PINNED_VERSION=">=46.0.0" PYYAML_PINNED_VERSION=">=5.3" @@ -167,6 +172,7 @@ case $desired_python in fi ;; *) + echo "Using default deps" NUMPY_PINNED_VERSION="=1.11.3" ;; esac From 55fccb4f685101494182e2d1d8dcc80fda1d820e Mon Sep 17 00:00:00 2001 From: albanD Date: Fri, 10 Nov 2023 16:49:36 -0500 Subject: [PATCH 11/18] try removing openblas --- aarch64_linux/aarch64_ci_setup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aarch64_linux/aarch64_ci_setup.sh b/aarch64_linux/aarch64_ci_setup.sh index 6d2d780fe..934940d35 100755 --- a/aarch64_linux/aarch64_ci_setup.sh +++ b/aarch64_linux/aarch64_ci_setup.sh @@ -20,6 +20,6 @@ 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 +/opt/conda/bin/conda install -y -c conda-forge python=${DESIRED_PYTHON} numpy pyyaml setuptools patchelf pygit2 ninja scons python --version conda --version From 0ca53c378f0ed98904701099b1c79f33f0525dce Mon Sep 17 00:00:00 2001 From: albanD Date: Fri, 10 Nov 2023 17:22:42 -0500 Subject: [PATCH 12/18] use pip setuptools and not conda one --- aarch64_linux/aarch64_ci_setup.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/aarch64_linux/aarch64_ci_setup.sh b/aarch64_linux/aarch64_ci_setup.sh index 934940d35..874c6a8d9 100755 --- a/aarch64_linux/aarch64_ci_setup.sh +++ b/aarch64_linux/aarch64_ci_setup.sh @@ -20,6 +20,7 @@ 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 ninja scons +/opt/conda/bin/conda install -y -c conda-forge python=${DESIRED_PYTHON} numpy pyyaml patchelf pygit2 openblas ninja scons +pip install setuptools python --version conda --version From 825223dc11bd9e096485ef2bbd5c5288152b92d5 Mon Sep 17 00:00:00 2001 From: albanD Date: Sat, 11 Nov 2023 16:02:49 -0500 Subject: [PATCH 13/18] which one makes you unhappy? --- aarch64_linux/aarch64_ci_setup.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/aarch64_linux/aarch64_ci_setup.sh b/aarch64_linux/aarch64_ci_setup.sh index 874c6a8d9..a6423aad5 100755 --- a/aarch64_linux/aarch64_ci_setup.sh +++ b/aarch64_linux/aarch64_ci_setup.sh @@ -20,7 +20,14 @@ 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 patchelf pygit2 openblas ninja scons +/opt/conda/bin/conda install -y -c conda-forge python=${DESIRED_PYTHON} +/opt/conda/bin/conda install -y -c conda-forge numpy +/opt/conda/bin/conda install -y -c conda-forge pyyaml +/opt/conda/bin/conda install -y -c conda-forge patchelf +/opt/conda/bin/conda install -y -c conda-forge pygit2 +/opt/conda/bin/conda install -y -c conda-forge openblas +/opt/conda/bin/conda install -y -c conda-forge ninja +/opt/conda/bin/conda install -y -c conda-forge scons pip install setuptools python --version conda --version From 128c3b2f0dc79e065b72534796e1221bc142dc1a Mon Sep 17 00:00:00 2001 From: albanD Date: Sat, 11 Nov 2023 17:14:03 -0500 Subject: [PATCH 14/18] latest not available on macos conda --- manywheel/build_cuda.sh | 4 +++- manywheel/build_rocm.sh | 4 +++- wheel/build_wheel.sh | 4 ++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/manywheel/build_cuda.sh b/manywheel/build_cuda.sh index c59cbca16..31f4e263b 100644 --- a/manywheel/build_cuda.sh +++ b/manywheel/build_cuda.sh @@ -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 diff --git a/manywheel/build_rocm.sh b/manywheel/build_rocm.sh index 0fed5970b..4fbca7697 100755 --- a/manywheel/build_rocm.sh +++ b/manywheel/build_rocm.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) diff --git a/wheel/build_wheel.sh b/wheel/build_wheel.sh index ae23b60d0..1186bc56a 100755 --- a/wheel/build_wheel.sh +++ b/wheel/build_wheel.sh @@ -139,9 +139,9 @@ EXTRA_CONDA_INSTALL_FLAGS="" case $desired_python in 3.12) echo "Using 3.12 deps" - SETUPTOOLS_PINNED_VERSION=">=68.2.2" + SETUPTOOLS_PINNED_VERSION=">=68.0.0" PYYAML_PINNED_VERSION=">=6.0.1" - NUMPY_PINNED_VERSION="==1.26.1" + NUMPY_PINNED_VERSION="==1.26.0" ;; 3.11) echo "Using 3.11 deps" From d59e1d429b32a8bc62c7b8e3a2a716975b5fa453 Mon Sep 17 00:00:00 2001 From: albanD Date: Sat, 11 Nov 2023 17:20:55 -0500 Subject: [PATCH 15/18] windows doesn't have the latest either --- windows/condaenv.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows/condaenv.bat b/windows/condaenv.bat index c813eb623..cf1b2c865 100644 --- a/windows/condaenv.bat +++ b/windows/condaenv.bat @@ -14,7 +14,7 @@ FOR %%v IN (%DESIRED_PYTHON%) DO ( if "%%v" == "3.9" call conda create -n py!PYTHON_VERSION_STR! -y -q numpy>=1.11 "mkl=2020.2" pyyaml boto3 cmake ninja typing_extensions python=%%v if "%%v" == "3.10" call conda create -n py!PYTHON_VERSION_STR! -y -q -c=conda-forge numpy=1.21.3 "mkl=2020.2" pyyaml boto3 "cmake=3.19.6" ninja typing_extensions python=%%v if "%%v" == "3.11" call conda create -n py!PYTHON_VERSION_STR! -y -q -c=conda-forge numpy=1.23.4 "mkl=2020.2" pyyaml boto3 "cmake=3.19.6" ninja typing_extensions python=%%v - if "%%v" == "3.12" call conda create -n py!PYTHON_VERSION_STR! -y -q -c=conda-forge numpy=1.26.1 "mkl=2023.1" pyyaml boto3 "cmake=3.19.6" ninja typing_extensions python=%%v + if "%%v" == "3.12" call conda create -n py!PYTHON_VERSION_STR! -y -q -c=conda-forge numpy=1.26.0 "mkl=2023.1" pyyaml boto3 "cmake=3.19.6" ninja typing_extensions python=%%v if "%%v" == "3" call conda create -n py!PYTHON_VERSION_STR! -y -q numpy=1.11 "mkl=2020.2" pyyaml boto3 cmake ninja typing_extensions python=%%v ) endlocal From dd81264a8fdddc6c24c7b41538f7df2232e77345 Mon Sep 17 00:00:00 2001 From: albanD Date: Sat, 11 Nov 2023 18:12:11 -0500 Subject: [PATCH 16/18] update aarch64 install script --- aarch64_linux/aarch64_ci_setup.sh | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/aarch64_linux/aarch64_ci_setup.sh b/aarch64_linux/aarch64_ci_setup.sh index a6423aad5..3fc9e850b 100755 --- a/aarch64_linux/aarch64_ci_setup.sh +++ b/aarch64_linux/aarch64_ci_setup.sh @@ -19,15 +19,16 @@ 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} -/opt/conda/bin/conda install -y -c conda-forge numpy -/opt/conda/bin/conda install -y -c conda-forge pyyaml -/opt/conda/bin/conda install -y -c conda-forge patchelf -/opt/conda/bin/conda install -y -c conda-forge pygit2 -/opt/conda/bin/conda install -y -c conda-forge openblas -/opt/conda/bin/conda install -y -c conda-forge ninja -/opt/conda/bin/conda install -y -c conda-forge scons -pip install setuptools +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 +conda install -y -c conda-forge numpy +conda install -y -c conda-forge pyyaml +conda install -y -c conda-forge patchelf +conda install -y -c conda-forge pygit2 +conda install -y -c conda-forge openblas +conda install -y -c conda-forge ninja +conda install -y -c conda-forge scons python --version conda --version From 71127f8ddbedc1ca24731a0cef935a1bc863b7ad Mon Sep 17 00:00:00 2001 From: albanD Date: Tue, 14 Nov 2023 11:28:53 -0500 Subject: [PATCH 17/18] Add python installer to windows smoke test --- windows/internal/smoke_test.bat | 1 + 1 file changed, 1 insertion(+) diff --git a/windows/internal/smoke_test.bat b/windows/internal/smoke_test.bat index ad276b992..1ade2cbda 100644 --- a/windows/internal/smoke_test.bat +++ b/windows/internal/smoke_test.bat @@ -30,6 +30,7 @@ exit /b 1 echo "install wheel package" set PYTHON_INSTALLER_URL= +if "%DESIRED_PYTHON%" == "3.12" set "PYTHON_INSTALLER_URL=https://www.python.org/ftp/python/3.12.0/python-3.12.0-amd64.exe" if "%DESIRED_PYTHON%" == "3.11" set "PYTHON_INSTALLER_URL=https://www.python.org/ftp/python/3.11.0/python-3.11.0-amd64.exe" if "%DESIRED_PYTHON%" == "3.10" set "PYTHON_INSTALLER_URL=https://www.python.org/ftp/python/3.10.0/python-3.10.0-amd64.exe" if "%DESIRED_PYTHON%" == "3.9" set "PYTHON_INSTALLER_URL=https://www.python.org/ftp/python/3.9.0/python-3.9.0-amd64.exe" From 23747b5ad6edc2f5d00a8e89825d2e9ed5401b09 Mon Sep 17 00:00:00 2001 From: albanD Date: Wed, 15 Nov 2023 09:39:35 -0500 Subject: [PATCH 18/18] update aarch64 and pin all versions based on CI run --- aarch64_linux/aarch64_ci_setup.sh | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/aarch64_linux/aarch64_ci_setup.sh b/aarch64_linux/aarch64_ci_setup.sh index 3fc9e850b..ace6a85fb 100755 --- a/aarch64_linux/aarch64_ci_setup.sh +++ b/aarch64_linux/aarch64_ci_setup.sh @@ -23,12 +23,6 @@ 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 -conda install -y -c conda-forge numpy -conda install -y -c conda-forge pyyaml -conda install -y -c conda-forge patchelf -conda install -y -c conda-forge pygit2 -conda install -y -c conda-forge openblas -conda install -y -c conda-forge ninja -conda install -y -c conda-forge scons +conda install -y -c conda-forge numpy==1.26.0 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