From 747c2bf3c5c033dd8a07695098ad6b48de71ff3e Mon Sep 17 00:00:00 2001 From: atalman Date: Wed, 17 May 2023 07:49:12 -0700 Subject: [PATCH 1/4] Pin numpy for windows builds --- windows/condaenv.bat | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/windows/condaenv.bat b/windows/condaenv.bat index 6d945badd..6f63b5b6b 100644 --- a/windows/condaenv.bat +++ b/windows/condaenv.bat @@ -11,9 +11,9 @@ FOR %%v IN (%DESIRED_PYTHON%) DO ( conda remove -n py!PYTHON_VERSION_STR! --all -y || rmdir %CONDA_HOME%\envs\py!PYTHON_VERSION_STR! /s if "%%v" == "3.7" 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.8" 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.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.2" "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.21.2" "mkl=2020.2" pyyaml boto3 "cmake=3.19.6" ninja typing_extensions python=%%v + if "%%v" == "3.9" call conda create -n py!PYTHON_VERSION_STR! -y -q "numpy=1.19.2" "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.2" "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.22.3" "mkl=2020.2" 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 9b23e98766235ecb067e76bc249f9675fa728640 Mon Sep 17 00:00:00 2001 From: atalman Date: Wed, 17 May 2023 11:23:48 -0700 Subject: [PATCH 2/4] bump mkl version, remove conda-forge --- windows/condaenv.bat | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/windows/condaenv.bat b/windows/condaenv.bat index 6f63b5b6b..5a7cab1de 100644 --- a/windows/condaenv.bat +++ b/windows/condaenv.bat @@ -12,8 +12,8 @@ FOR %%v IN (%DESIRED_PYTHON%) DO ( if "%%v" == "3.7" 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.8" 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.9" call conda create -n py!PYTHON_VERSION_STR! -y -q "numpy=1.19.2" "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.2" "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.22.3" "mkl=2020.2" pyyaml boto3 "cmake=3.19.6" ninja typing_extensions python=%%v + if "%%v" == "3.10" call conda create -n py!PYTHON_VERSION_STR! -y -q numpy=1.21.2 "mkl=2021.4.0." 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 numpy=1.22.3 "mkl=2021.4.0" 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 b8b1f758aa96638dedf199bc905125008dc4dc57 Mon Sep 17 00:00:00 2001 From: atalman Date: Wed, 17 May 2023 11:27:22 -0700 Subject: [PATCH 3/4] Change python 3.9 mkl version --- windows/condaenv.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows/condaenv.bat b/windows/condaenv.bat index 5a7cab1de..46ac2e070 100644 --- a/windows/condaenv.bat +++ b/windows/condaenv.bat @@ -11,7 +11,7 @@ FOR %%v IN (%DESIRED_PYTHON%) DO ( conda remove -n py!PYTHON_VERSION_STR! --all -y || rmdir %CONDA_HOME%\envs\py!PYTHON_VERSION_STR! /s if "%%v" == "3.7" 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.8" 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.9" call conda create -n py!PYTHON_VERSION_STR! -y -q "numpy=1.19.2" "mkl=2020.2" pyyaml boto3 cmake ninja typing_extensions python=%%v + if "%%v" == "3.9" call conda create -n py!PYTHON_VERSION_STR! -y -q numpy=1.19.2 "mkl=2021.4.0" pyyaml boto3 cmake ninja typing_extensions python=%%v if "%%v" == "3.10" call conda create -n py!PYTHON_VERSION_STR! -y -q numpy=1.21.2 "mkl=2021.4.0." 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 numpy=1.22.3 "mkl=2021.4.0" 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 From 99bd45a19ae2c31490686aac4e6013b04ed7f3a2 Mon Sep 17 00:00:00 2001 From: atalman Date: Wed, 17 May 2023 14:44:14 -0700 Subject: [PATCH 4/4] Use pinned mkl --- windows/condaenv.bat | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/windows/condaenv.bat b/windows/condaenv.bat index 46ac2e070..b004ab654 100644 --- a/windows/condaenv.bat +++ b/windows/condaenv.bat @@ -11,9 +11,9 @@ FOR %%v IN (%DESIRED_PYTHON%) DO ( conda remove -n py!PYTHON_VERSION_STR! --all -y || rmdir %CONDA_HOME%\envs\py!PYTHON_VERSION_STR! /s if "%%v" == "3.7" 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.8" 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.9" call conda create -n py!PYTHON_VERSION_STR! -y -q numpy=1.19.2 "mkl=2021.4.0" pyyaml boto3 cmake ninja typing_extensions python=%%v - if "%%v" == "3.10" call conda create -n py!PYTHON_VERSION_STR! -y -q numpy=1.21.2 "mkl=2021.4.0." 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 numpy=1.22.3 "mkl=2021.4.0" pyyaml boto3 "cmake=3.19.6" ninja typing_extensions python=%%v + 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.22.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" 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