File tree 8 files changed +34
-8
lines changed
8 files changed +34
-8
lines changed Original file line number Diff line number Diff line change @@ -19,7 +19,10 @@ curl -L -o /mambaforge.sh https://github.com/conda-forge/miniforge/releases/late
19
19
chmod +x /mambaforge.sh
20
20
/mambaforge.sh -b -p /opt/conda
21
21
rm /mambaforge.sh
22
- /opt/conda/bin/conda config --set ssl_verify False
23
- /opt/conda/bin/conda install -y -c conda-forge python=${DESIRED_PYTHON} numpy pyyaml setuptools patchelf pygit2 openblas ninja scons
22
+ source /opt/conda/etc/profile.d/conda.sh
23
+ conda config --set ssl_verify False
24
+ conda create -y -c conda-forge -n aarch64_env python=${DESIRED_PYTHON}
25
+ conda activate aarch64_env
26
+ 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
24
27
python --version
25
28
conda --version
Original file line number Diff line number Diff line change @@ -21,17 +21,20 @@ requirements:
21
21
- pyyaml
22
22
{% if cross_compile_arm64 == 0 %}
23
23
- mkl-include # [x86_64]
24
- - mkl=2020.2 # [x86_64 and not win]
24
+ - mkl=2020.2 # [py <= 311 and x86_64 and not win]
25
+ - mkl=2023.1 # [py >= 312 and x86_64 and not win]
25
26
- mkl=2021.4 # [x86_64 and win]
26
27
{% endif %}
27
28
- typing_extensions
28
29
- ninja
29
30
- libuv # [win]
30
31
- numpy=1.19 # [py <= 39]
31
32
- numpy=1.21.5 # [py == 310]
32
- - numpy=1.23.5 # [py >= 311]
33
+ - numpy=1.23.5 # [py == 311]
34
+ - numpy=1.26.1 # [py >= 312]
33
35
- openssl=1.1.1l # [py >= 38 and py <= 310 and linux]
34
- - openssl=1.1.1s # [py >= 311 and linux]
36
+ - openssl=1.1.1s # [py == 311 and linux]
37
+ - openssl=3.1.4 # [py >= 312 and linux]
35
38
{{ environ.get('PYTORCH_LLVM_PACKAGE', ' - llvmdev=9') }}
36
39
{{ environ.get('MAGMA_PACKAGE', '') }}
37
40
Original file line number Diff line number Diff line change @@ -131,6 +131,9 @@ case ${DESIRED_PYTHON} in
131
131
cp311* )
132
132
retry pip install -q numpy==1.23.1
133
133
;;
134
+ cp312* )
135
+ retry pip install -q numpy==1.26.1
136
+ ;;
134
137
# Should catch 3.9+
135
138
* )
136
139
retry pip install -q numpy==1.19.4
Original file line number Diff line number Diff line change 263
263
fi
264
264
265
265
# TODO: Remove me when Triton has a proper release channel
266
- if [[ $( uname) == " Linux" ]]; then
266
+ # No triton dependency for now on 3.12 since we don't have binaries for it
267
+ # and torch.compile doesn't work.
268
+ if [[ $( uname) == " Linux" && " $DESIRED_PYTHON " != " 3.12" ]]; then
267
269
TRITON_SHORTHASH=$( cut -c1-10 $PYTORCH_ROOT /.github/ci_commit_pins/triton.txt)
268
270
269
271
if [[ -z " $PYTORCH_EXTRA_INSTALL_REQUIREMENTS " ]]; then
Original file line number Diff line number Diff line change @@ -222,7 +222,9 @@ if [[ $ROCM_INT -ge 50600 ]]; then
222
222
fi
223
223
224
224
# Add triton install dependency
225
- if [[ $( uname) == " Linux" ]]; then
225
+ # No triton dependency for now on 3.12 since we don't have binaries for it
226
+ # and torch.compile doesn't work.
227
+ if [[ $( uname) == " Linux" && " $DESIRED_PYTHON " != " 3.12" ]]; then
226
228
TRITON_SHORTHASH=$( cut -c1-10 $PYTORCH_ROOT /.ci/docker/ci_commit_pins/triton-rocm.txt)
227
229
TRITON_VERSION=$( cat $PYTORCH_ROOT /.ci/docker/triton_version.txt)
228
230
Original file line number Diff line number Diff line change @@ -136,23 +136,33 @@ export CMAKE_PREFIX_PATH=${CONDA_PREFIX:-"$(dirname $(which conda))/../"}
136
136
SETUPTOOLS_PINNED_VERSION=" =46.0.0"
137
137
PYYAML_PINNED_VERSION=" =5.3"
138
138
EXTRA_CONDA_INSTALL_FLAGS=" "
139
- case ${desired_python} in
139
+ case $desired_python in
140
+ 3.12)
141
+ echo " Using 3.12 deps"
142
+ SETUPTOOLS_PINNED_VERSION=" >=68.0.0"
143
+ PYYAML_PINNED_VERSION=" >=6.0.1"
144
+ NUMPY_PINNED_VERSION=" ==1.26.0"
145
+ ;;
140
146
3.11)
147
+ echo " Using 3.11 deps"
141
148
SETUPTOOLS_PINNED_VERSION=" >=46.0.0"
142
149
PYYAML_PINNED_VERSION=" >=5.3"
143
150
NUMPY_PINNED_VERSION=" ==1.23.5"
144
151
;;
145
152
3.10)
153
+ echo " Using 3.10 deps"
146
154
SETUPTOOLS_PINNED_VERSION=" >=46.0.0"
147
155
PYYAML_PINNED_VERSION=" >=5.3"
148
156
NUMPY_PINNED_VERSION=" =1.21.2"
149
157
;;
150
158
3.9)
159
+ echo " Using 3.9 deps"
151
160
SETUPTOOLS_PINNED_VERSION=" >=46.0.0"
152
161
PYYAML_PINNED_VERSION=" >=5.3"
153
162
NUMPY_PINNED_VERSION=" =1.19"
154
163
;;
155
164
3.8)
165
+ echo " Using 3.8 deps"
156
166
if [[ " $( uname -m) " == " arm64" ]]; then
157
167
SETUPTOOLS_PINNED_VERSION=" >=46.0.0"
158
168
PYYAML_PINNED_VERSION=" >=5.3"
@@ -162,6 +172,7 @@ case ${desired_python} in
162
172
fi
163
173
;;
164
174
* )
175
+ echo " Using default deps"
165
176
NUMPY_PINNED_VERSION=" =1.11.3"
166
177
;;
167
178
esac
Original file line number Diff line number Diff line change @@ -14,6 +14,7 @@ FOR %%v IN (%DESIRED_PYTHON%) DO (
14
14
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
15
15
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
16
16
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
17
+ 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
17
18
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
18
19
)
19
20
endlocal
Original file line number Diff line number Diff line change @@ -30,6 +30,7 @@ exit /b 1
30
30
echo " install wheel package"
31
31
32
32
set PYTHON_INSTALLER_URL =
33
+ if " %DESIRED_PYTHON% " == " 3.12" set " PYTHON_INSTALLER_URL = https://www.python.org/ftp/python/3.12.0/python-3.12.0-amd64.exe"
33
34
if " %DESIRED_PYTHON% " == " 3.11" set " PYTHON_INSTALLER_URL = https://www.python.org/ftp/python/3.11.0/python-3.11.0-amd64.exe"
34
35
if " %DESIRED_PYTHON% " == " 3.10" set " PYTHON_INSTALLER_URL = https://www.python.org/ftp/python/3.10.0/python-3.10.0-amd64.exe"
35
36
if " %DESIRED_PYTHON% " == " 3.9" set " PYTHON_INSTALLER_URL = https://www.python.org/ftp/python/3.9.0/python-3.9.0-amd64.exe"
You can’t perform that action at this time.
0 commit comments