From c3b2a1fe7331d6857177e6d898b4f70fa5505734 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Sun, 19 Jan 2025 15:09:16 +0100 Subject: [PATCH 01/43] Attempt reenabling cuDSS, cuSPARSELt and CUPTI on Windows Fixes #319 Fixes #320 Fixes #321 --- recipe/bld.bat | 6 ------ recipe/meta.yaml | 12 ++++++------ 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/recipe/bld.bat b/recipe/bld.bat index cc1244098..b147d182b 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -26,12 +26,6 @@ if "%blas_impl%" == "generic" ( SET "USE_NUMA=0" SET "USE_ITT=0" -@REM KINETO seems to require CUPTI and will look quite hard for it. -@REM CUPTI seems to cause trouble when users install a version of -@REM cudatoolkit different than the one specified at compile time. -@REM https://github.com/conda-forge/pytorch-cpu-feedstock/issues/135 -set "USE_KINETO=OFF" - if "%PKG_NAME%" == "pytorch" ( set "PIP_ACTION=install" :: We build libtorch for a specific python version. diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 91f0ee793..b41b19e72 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -126,14 +126,14 @@ requirements: {% if cuda_compiler_version != "None" %} - cuda-driver-dev # [linux] - cuda-cudart-dev - - cuda-cupti-dev # [linux] + - cuda-cupti-dev - cuda-nvrtc-dev - cuda-nvtx-dev - cuda-nvml-dev - cuda-profiler-api - - cusparselt # [linux] + - cusparselt - libcublas-dev - - libcudss-dev # [linux] + - libcudss-dev - libcufile-dev # [linux] - libcufft-dev - libcurand-dev @@ -266,14 +266,14 @@ outputs: {% if cuda_compiler_version != "None" %} - cuda-driver-dev # [linux] - cuda-cudart-dev - - cuda-cupti-dev # [linux] + - cuda-cupti-dev - cuda-nvrtc-dev - cuda-nvtx-dev - cuda-nvml-dev - cuda-profiler-api - - cusparselt # [linux] + - cusparselt - libcublas-dev - - libcudss-dev # [linux] + - libcudss-dev - libcufile-dev # [linux] - libcufft-dev - libcurand-dev From 673dd879fa9e48f2d8ef66d44f77357593c3d7c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Sun, 19 Jan 2025 15:11:59 +0100 Subject: [PATCH 02/43] Bump build number --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index b41b19e72..b2aee1a57 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,6 +1,6 @@ # if you wish to build release candidate number X, append the version string with ".rcX" {% set version = "2.5.1" %} -{% set build = 9 %} +{% set build = 10 %} {% if cuda_compiler_version != "None" %} {% set build = build + 200 %} From 9008ca4effa6329ad1ca5ea1267a8345005d72d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Sun, 19 Jan 2025 15:12:52 +0100 Subject: [PATCH 03/43] Skip non-Windows builds --- recipe/meta.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index b2aee1a57..5314538fd 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -67,6 +67,8 @@ source: build: number: {{ build }} # cuda 11.8 was dropped due to maintenance effort, see discussion in #177 + skip: true # [not win] + skip: true # [cuda_compiler_version != "None"] skip: true # [cuda_compiler_version == "11.8"] # This logic allows two rc variants to be defined in the conda_build_config, but only one to actually be built. # We want to be able to define two variants in the cbc so we can assign different labels to each in the upload channel From d24148399223ed86bd3f179c53d00932e47e7ea6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Mon, 20 Jan 2025 14:55:25 +0100 Subject: [PATCH 04/43] Remove osx-64 code from bld.bat --- recipe/bld.bat | 3 --- 1 file changed, 3 deletions(-) diff --git a/recipe/bld.bat b/recipe/bld.bat index b147d182b..3908ecd2d 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -10,9 +10,6 @@ set PYTORCH_BUILD_VERSION=%PKG_VERSION% :: https://github.com/conda-forge/pytorch-cpu-feedstock/issues/315 set PYTORCH_BUILD_NUMBER=0 -REM I don't know where this folder comes from, but it's interfering with the build in osx-64 -if EXIST %PREFIX%\git RD /S /Q %PREFIX%\git - @REM Setup BLAS if "%blas_impl%" == "generic" ( REM Fake openblas From 62d4cbd88162e01a07669a9fab7525360c2bf358 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Mon, 20 Jan 2025 14:56:12 +0100 Subject: [PATCH 05/43] Remove py3.8 code from bld.bat --- recipe/bld.bat | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/recipe/bld.bat b/recipe/bld.bat index 3908ecd2d..8f048e779 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -43,14 +43,7 @@ if "%PKG_NAME%" == "pytorch" ( :: Replace cp312-win_amd64 with ie cp311-win_amd64 sed -i.bak "s/cp312/cp%CONDA_PY%/g" build/CMakeCache.txt - @REM We use a fan-out build to avoid the long rebuild of libtorch - @REM However, the location of the numpy headers changes between python 3.8 - @REM and 3.9+ since numpy 2.0 only exists for 3.9+ - if "%PY_VER%" == "3.8" ( - sed -i.bak "s#numpy\\\\_core\\\\include#numpy\\\\core\\\\include#g" build/CMakeCache.txt - ) else ( - sed -i.bak "s#numpy\\\\core\\\\include#numpy\\\\_core\\\\include#g" build/CMakeCache.txt - ) + sed -i.bak "s#numpy\\\\core\\\\include#numpy\\\\_core\\\\include#g" build/CMakeCache.txt ) else ( @REM For the main script we just build a wheel for so that the C++/CUDA From f8fa30a4669202525dc167204cf2aa9b95eaea1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Mon, 20 Jan 2025 14:54:50 +0100 Subject: [PATCH 06/43] Add error handling to bld.bat --- recipe/bld.bat | 36 ++++++++++++++++++++++++++++++++++-- 1 file changed, 34 insertions(+), 2 deletions(-) diff --git a/recipe/bld.bat b/recipe/bld.bat index 8f048e779..c2dc8a99c 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -2,7 +2,10 @@ setlocal enabledelayedexpansion REM remove pyproject.toml to avoid installing deps from pip -if EXIST pyproject.toml DEL pyproject.toml +if EXIST pyproject.toml ( + DEL pyproject.toml + if %ERRORLEVEL% neq 0 exit 1 +) set TH_BINARY_BUILD=1 set PYTORCH_BUILD_VERSION=%PKG_VERSION% @@ -33,17 +36,22 @@ if "%PKG_NAME%" == "pytorch" ( :: Replace Python312 or python312 with ie Python311 or python311 sed "s/\([Pp]ython\)312/\1%CONDA_PY%/g" build/CMakeCache.txt.orig > build/CMakeCache.txt + if %ERRORLEVEL% neq 0 exit 1 :: Replace version string v3.12.8() with ie v3.11.11() sed -i.bak -E "s/v3\.12\.[0-9]+/v%PY_VERSION_FULL%/g" build/CMakeCache.txt + if %ERRORLEVEL% neq 0 exit 1 :: Replace interpreter properties Python;3;12;8;64 with ie Python;3;11;11;64 sed -i.bak -E "s/Python;3;12;[0-9]+;64/Python;%PY_VERSION_FULL:.=;%;64/g" build/CMakeCache.txt + if %ERRORLEVEL% neq 0 exit 1 :: Replace cp312-win_amd64 with ie cp311-win_amd64 sed -i.bak "s/cp312/cp%CONDA_PY%/g" build/CMakeCache.txt + if %ERRORLEVEL% neq 0 exit 1 sed -i.bak "s#numpy\\\\core\\\\include#numpy\\\\_core\\\\include#g" build/CMakeCache.txt + if %ERRORLEVEL% neq 0 exit 1 ) else ( @REM For the main script we just build a wheel for so that the C++/CUDA @@ -138,13 +146,16 @@ set "CMAKE_CUDA_COMPILER_LAUNCHER=sccache" sccache --stop-server sccache --start-server +if %ERRORLEVEL% neq 0 exit 1 sccache --zero-stats +if %ERRORLEVEL% neq 0 exit 1 @REM Clear the build from any remaining artifacts. We use sccache to avoid recompiling similar code. cmake --build build --target clean +if %ERRORLEVEL% neq 0 exit 1 %PYTHON% -m pip %PIP_ACTION% . --no-build-isolation --no-deps -vvv --no-clean -if errorlevel 1 exit /b 1 +if %ERRORLEVEL% neq 0 exit 1 @REM Here we split the build into two parts. @REM @@ -161,35 +172,49 @@ if "%PKG_NAME%" == "libtorch" ( @REM Extract the compiled wheel into a temporary directory if not exist "%SRC_DIR%/dist" mkdir %SRC_DIR%/dist pushd %SRC_DIR%/dist + if %ERRORLEVEL% neq 0 exit 1 for %%f in (../torch-*.whl) do ( wheel unpack %%f + if %ERRORLEVEL% neq 0 exit 1 ) @REM Navigate into the unpacked wheel pushd torch-* + if %ERRORLEVEL% neq 0 exit 1 @REM Move the binaries into the packages site-package directory robocopy /NP /NFL /NDL /NJH /E torch\bin %SP_DIR%\torch\bin\ + if %ERRORLEVEL% neq 1 exit 1 robocopy /NP /NFL /NDL /NJH /E torch\lib %SP_DIR%\torch\lib\ + if %ERRORLEVEL% neq 1 exit 1 robocopy /NP /NFL /NDL /NJH /E torch\share %SP_DIR%\torch\share\ + if %ERRORLEVEL% neq 1 exit 1 for %%f in (ATen caffe2 torch c10) do ( robocopy /NP /NFL /NDL /NJH /E torch\include\%%f %SP_DIR%\torch\include\%%f\ + if %ERRORLEVEL% neq 1 exit 1 ) @REM Remove the python binary file, that is placed in the site-packages @REM directory by the specific python specific pytorch package. del %SP_DIR%\torch\lib\torch_python.* + if %ERRORLEVEL% neq 0 exit 1 popd + if %ERRORLEVEL% neq 0 exit 1 popd + if %ERRORLEVEL% neq 0 exit 1 @REM Keep the original backed up to sed later copy build\CMakeCache.txt build\CMakeCache.txt.orig + if %ERRORLEVEL% neq 0 exit 1 ) else if "%PKG_NAME%" == "pytorch" ( rmdir /s /q %SP_DIR%\torch\bin + if %ERRORLEVEL% neq 0 exit 1 rmdir /s /q %SP_DIR%\torch\share + if %ERRORLEVEL% neq 0 exit 1 for %%f in (ATen caffe2 torch c10) do ( rmdir /s /q %SP_DIR%\torch\include\%%f + if %ERRORLEVEL% neq 0 exit 1 ) @REM Delete all files from the lib directory that do not start with torch_python @@ -197,9 +222,16 @@ if "%PKG_NAME%" == "libtorch" ( set "FILENAME=%%~nf" if "!FILENAME:~0,12!" neq "torch_python" ( del %%f + if %ERRORLEVEL% neq 0 exit 1 ) ) ) @REM Show the sccache stats. sccache --show-stats + +goto :EOF + +:error +echo Failed with error %errorlevel% +exit /b %errorlevel% From 8eb627d9662c30bfc6065ec02a6a514947010aed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Mon, 20 Jan 2025 16:22:58 +0100 Subject: [PATCH 07/43] Call clean only if build exists --- recipe/bld.bat | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/recipe/bld.bat b/recipe/bld.bat index c2dc8a99c..10478ad28 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -151,8 +151,10 @@ sccache --zero-stats if %ERRORLEVEL% neq 0 exit 1 @REM Clear the build from any remaining artifacts. We use sccache to avoid recompiling similar code. -cmake --build build --target clean -if %ERRORLEVEL% neq 0 exit 1 +if EXIST build ( + cmake --build build --target clean + if %ERRORLEVEL% neq 0 exit 1 +) %PYTHON% -m pip %PIP_ACTION% . --no-build-isolation --no-deps -vvv --no-clean if %ERRORLEVEL% neq 0 exit 1 From 7f0e31db643d17739546a147227eff56c4f8f5be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Mon, 20 Jan 2025 17:46:34 +0100 Subject: [PATCH 08/43] Use a consistent comment style in bld.bat --- recipe/bld.bat | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/recipe/bld.bat b/recipe/bld.bat index 10478ad28..6eb0e5b58 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -1,7 +1,7 @@ @echo On setlocal enabledelayedexpansion -REM remove pyproject.toml to avoid installing deps from pip +@REM remove pyproject.toml to avoid installing deps from pip if EXIST pyproject.toml ( DEL pyproject.toml if %ERRORLEVEL% neq 0 exit 1 @@ -9,13 +9,13 @@ if EXIST pyproject.toml ( set TH_BINARY_BUILD=1 set PYTORCH_BUILD_VERSION=%PKG_VERSION% -:: Always pass 0 to avoid appending ".post" to version string. -:: https://github.com/conda-forge/pytorch-cpu-feedstock/issues/315 +@REM Always pass 0 to avoid appending ".post" to version string. +@REM https://github.com/conda-forge/pytorch-cpu-feedstock/issues/315 set PYTORCH_BUILD_NUMBER=0 @REM Setup BLAS if "%blas_impl%" == "generic" ( - REM Fake openblas + @REM Fake openblas SET BLAS=OpenBLAS SET OpenBLAS_HOME=%LIBRARY_PREFIX% ) else ( @@ -28,25 +28,25 @@ SET "USE_ITT=0" if "%PKG_NAME%" == "pytorch" ( set "PIP_ACTION=install" - :: We build libtorch for a specific python version. - :: This ensures its only build once. However, when that version changes - :: we need to make sure to update that here. - :: Get the full python version string + @REM We build libtorch for a specific python version. + @REM This ensures its only build once. However, when that version changes + @REM we need to make sure to update that here. + @REM Get the full python version string for /f "tokens=2" %%a in ('python --version 2^>^&1') do set PY_VERSION_FULL=%%a - :: Replace Python312 or python312 with ie Python311 or python311 + @REM Replace Python312 or python312 with ie Python311 or python311 sed "s/\([Pp]ython\)312/\1%CONDA_PY%/g" build/CMakeCache.txt.orig > build/CMakeCache.txt if %ERRORLEVEL% neq 0 exit 1 - :: Replace version string v3.12.8() with ie v3.11.11() + @REM Replace version string v3.12.8() with ie v3.11.11() sed -i.bak -E "s/v3\.12\.[0-9]+/v%PY_VERSION_FULL%/g" build/CMakeCache.txt if %ERRORLEVEL% neq 0 exit 1 - :: Replace interpreter properties Python;3;12;8;64 with ie Python;3;11;11;64 + @REM Replace interpreter properties Python;3;12;8;64 with ie Python;3;11;11;64 sed -i.bak -E "s/Python;3;12;[0-9]+;64/Python;%PY_VERSION_FULL:.=;%;64/g" build/CMakeCache.txt if %ERRORLEVEL% neq 0 exit 1 - :: Replace cp312-win_amd64 with ie cp311-win_amd64 + @REM Replace cp312-win_amd64 with ie cp311-win_amd64 sed -i.bak "s/cp312/cp%CONDA_PY%/g" build/CMakeCache.txt if %ERRORLEVEL% neq 0 exit 1 @@ -62,8 +62,8 @@ if "%PKG_NAME%" == "pytorch" ( if not "%cuda_compiler_version%" == "None" ( set USE_CUDA=1 - REM set CUDA_PATH=C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v%desired_cuda% - REM set CUDA_BIN_PATH=%CUDA_PATH%\bin + @REM set CUDA_PATH=C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v%desired_cuda% + @REM set CUDA_BIN_PATH=%CUDA_PATH%\bin set TORCH_CUDA_ARCH_LIST=5.0;6.0;6.1;7.0;7.5;8.0;8.6;8.9;9.0+PTX @@ -72,7 +72,7 @@ if not "%cuda_compiler_version%" == "None" ( set USE_STATIC_CUDNN=0 set MAGMA_HOME=%PREFIX% - REM NCCL is not available on windows + @REM NCCL is not available on windows set USE_NCCL=0 set USE_STATIC_NCCL=0 @@ -84,9 +84,9 @@ if not "%cuda_compiler_version%" == "None" ( ) else ( set USE_CUDA=0 - REM On windows, env vars are case-insensitive and setup.py - REM passes all env vars starting with CUDA_*, CMAKE_* to - REM to cmake + @REM On windows, env vars are case-insensitive and setup.py + @REM passes all env vars starting with CUDA_*, CMAKE_* to + @REM to cmake set "cuda_compiler_version=" set "cuda_compiler=" set "CUDA_VERSION=" @@ -109,7 +109,7 @@ set "CMAKE_PREFIX_PATH=%LIBRARY_PREFIX%" set "CMAKE_INCLUDE_PATH=%LIBRARY_INC%" set "CMAKE_LIBRARY_PATH=%LIBRARY_LIB%" set "CMAKE_BUILD_TYPE=Release" -:: This is so that CMake finds the environment's Python, not another one +@REM This is so that CMake finds the environment's Python, not another one set Python_EXECUTABLE=%PYTHON% set Python3_EXECUTABLE=%PYTHON% From 8e3e4c1ff103db1f5d33dff403c19875724770da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Mon, 20 Jan 2025 17:54:26 +0100 Subject: [PATCH 09/43] Move libraries & co. to %LIBRARY_PREFIX% and subdirs --- recipe/bld.bat | 12 +++++++----- recipe/meta.yaml | 12 ++++++------ 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/recipe/bld.bat b/recipe/bld.bat index 6eb0e5b58..a38ca90da 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -185,20 +185,22 @@ if "%PKG_NAME%" == "libtorch" ( if %ERRORLEVEL% neq 0 exit 1 @REM Move the binaries into the packages site-package directory - robocopy /NP /NFL /NDL /NJH /E torch\bin %SP_DIR%\torch\bin\ + robocopy /NP /NFL /NDL /NJH /E torch\bin\*.* %LIBRARY_BIN%\ if %ERRORLEVEL% neq 1 exit 1 - robocopy /NP /NFL /NDL /NJH /E torch\lib %SP_DIR%\torch\lib\ + robocopy /NP /NFL /NDL /NJH /E torch\lib\*.dll %LIBRARY_BIN%\ if %ERRORLEVEL% neq 1 exit 1 - robocopy /NP /NFL /NDL /NJH /E torch\share %SP_DIR%\torch\share\ + robocopy /NP /NFL /NDL /NJH /E torch\lib\*.lib %LIBRARY_LIB%\ + if %ERRORLEVEL% neq 1 exit 1 + robocopy /NP /NFL /NDL /NJH /E torch\share %LIBRARY_PREFIX%\ if %ERRORLEVEL% neq 1 exit 1 for %%f in (ATen caffe2 torch c10) do ( - robocopy /NP /NFL /NDL /NJH /E torch\include\%%f %SP_DIR%\torch\include\%%f\ + robocopy /NP /NFL /NDL /NJH /E torch\include\%%f %LIBRARY_INC%\%%f\ if %ERRORLEVEL% neq 1 exit 1 ) @REM Remove the python binary file, that is placed in the site-packages @REM directory by the specific python specific pytorch package. - del %SP_DIR%\torch\lib\torch_python.* + del %LIBRARY_BIN%\torch_python.* %LIBRARY_LIB%\torch_python.* if %ERRORLEVEL% neq 0 exit 1 popd diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 5314538fd..f13ade6cd 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -198,25 +198,25 @@ test: {% for each_lib in [ 'c10', 'shm', 'torch', 'torch_cpu', 'torch_global_deps'] %} - test -f $PREFIX/lib/lib{{ each_lib }}.so # [linux] - test -f $PREFIX/lib/lib{{ each_lib }}.dylib # [osx] - - if not exist %SP_DIR%\torch\lib\{{ each_lib }}.dll exit 1 # [win] + - if not exist %LIBRARY_BIN%\{{ each_lib }}.dll exit 1 # [win] {% endfor %} # Windows specific .LIB files {% for each_lib in [ 'c10', 'shm', 'torch', 'torch_cpu'] %} - - if not exist %SP_DIR%\torch\lib\{{ each_lib }}.lib exit 1 # [win] + - if not exist %LIBRARY_LIB%\{{ each_lib }}.lib exit 1 # [win] {% endfor %} # Windows specific libraries {% for each_lib in [ 'asmjit', 'fbgemm'] %} - - if not exist %SP_DIR%\torch\lib\{{ each_lib }}.dll exit 1 # [win] - - if not exist %SP_DIR%\torch\lib\{{ each_lib }}.lib exit 1 # [win] + - if not exist %LIBRARY_BIN%\{{ each_lib }}.dll exit 1 # [win] + - if not exist %LIBRARY_LIB%\{{ each_lib }}.lib exit 1 # [win] {% endfor %} # Cuda only libraries {% for each_lib in ['c10_cuda', 'caffe2_nvrtc', 'torch_cuda'] %} - test -f $PREFIX/lib/lib{{ each_lib }}.so # [linux and cuda_compiler_version != "None"] - - if not exist %SP_DIR%\torch\lib\{{ each_lib }}.dll exit 1 # [win and cuda_compiler_version != "None"] - - if not exist %SP_DIR%\torch\lib\{{ each_lib }}.lib exit 1 # [win and cuda_compiler_version != "None"] + - if not exist %LIBRARY_BIN%\{{ each_lib }}.dll exit 1 # [win and cuda_compiler_version != "None"] + - if not exist %LIBRARY_LIB%\{{ each_lib }}.lib exit 1 # [win and cuda_compiler_version != "None"] {% endfor %} # Linux specific cuda libraries From 8e3c175f40b7e26357abb2054b4fc6de8900c74f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Mon, 20 Jan 2025 17:56:09 +0100 Subject: [PATCH 10/43] MNT: Re-rendered with conda-build 25.1.1, conda-smithy 3.45.3, and conda-forge-pinning 2025.01.20.14.49.21 --- .azure-pipelines/azure-pipelines-osx.yml | 79 -------- ...nNonecxx_compiler_version13is_rcFalse.yaml | 80 -------- ...n12.6cxx_compiler_version13is_rcFalse.yaml | 80 -------- ...nNonecxx_compiler_version13is_rcFalse.yaml | 80 -------- ...n12.6cxx_compiler_version13is_rcFalse.yaml | 80 -------- ...nNonecxx_compiler_version13is_rcFalse.yaml | 80 -------- ...n12.6cxx_compiler_version13is_rcFalse.yaml | 80 -------- ...rcFalsenumpy2.0python3.10.____cpython.yaml | 67 ------- ...rcFalsenumpy2.0python3.11.____cpython.yaml | 67 ------- ...rcFalsenumpy2.0python3.12.____cpython.yaml | 67 ------- ..._rcFalsenumpy2.0python3.9.____cpython.yaml | 67 ------- ...nis_rcFalsenumpy2python3.13.____cp313.yaml | 67 ------- ...rcFalsenumpy2.0python3.10.____cpython.yaml | 67 ------- ...rcFalsenumpy2.0python3.11.____cpython.yaml | 67 ------- ...rcFalsenumpy2.0python3.12.____cpython.yaml | 67 ------- ..._rcFalsenumpy2.0python3.9.____cpython.yaml | 67 ------- ...nis_rcFalsenumpy2python3.13.____cp313.yaml | 67 ------- ...rcFalsenumpy2.0python3.10.____cpython.yaml | 67 ------- ...rcFalsenumpy2.0python3.11.____cpython.yaml | 67 ------- ...rcFalsenumpy2.0python3.12.____cpython.yaml | 67 ------- ..._rcFalsenumpy2.0python3.9.____cpython.yaml | 67 ------- ...nis_rcFalsenumpy2python3.13.____cp313.yaml | 67 ------- ...necuda_compiler_versionNoneis_rcFalse.yaml | 2 - ...cccuda_compiler_version12.6is_rcFalse.yaml | 59 ------ .github/workflows/conda-build.yml | 40 ---- .scripts/build_steps.sh | 100 ---------- .scripts/run_docker_build.sh | 114 ----------- .scripts/run_osx_build.sh | 120 ----------- README.md | 186 +----------------- azure-pipelines.yml | 31 --- 30 files changed, 3 insertions(+), 2213 deletions(-) delete mode 100755 .azure-pipelines/azure-pipelines-osx.yml delete mode 100644 .ci_support/linux_64_blas_implgenericc_compiler_version13channel_targetsconda-forge_maincuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13is_rcFalse.yaml delete mode 100644 .ci_support/linux_64_blas_implgenericc_compiler_version13channel_targetsconda-forge_maincuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13is_rcFalse.yaml delete mode 100644 .ci_support/linux_64_blas_implmklc_compiler_version13channel_targetsconda-forge_maincuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13is_rcFalse.yaml delete mode 100644 .ci_support/linux_64_blas_implmklc_compiler_version13channel_targetsconda-forge_maincuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13is_rcFalse.yaml delete mode 100644 .ci_support/linux_aarch64_c_compiler_version13channel_targetsconda-forge_maincuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13is_rcFalse.yaml delete mode 100644 .ci_support/linux_aarch64_c_compiler_version13channel_targetsconda-forge_maincuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13is_rcFalse.yaml delete mode 100644 .ci_support/osx_64_blas_implgenericchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.10.____cpython.yaml delete mode 100644 .ci_support/osx_64_blas_implgenericchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.11.____cpython.yaml delete mode 100644 .ci_support/osx_64_blas_implgenericchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.12.____cpython.yaml delete mode 100644 .ci_support/osx_64_blas_implgenericchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.9.____cpython.yaml delete mode 100644 .ci_support/osx_64_blas_implgenericchannel_targetsconda-forge_mainis_rcFalsenumpy2python3.13.____cp313.yaml delete mode 100644 .ci_support/osx_64_blas_implmklchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.10.____cpython.yaml delete mode 100644 .ci_support/osx_64_blas_implmklchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.11.____cpython.yaml delete mode 100644 .ci_support/osx_64_blas_implmklchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.12.____cpython.yaml delete mode 100644 .ci_support/osx_64_blas_implmklchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.9.____cpython.yaml delete mode 100644 .ci_support/osx_64_blas_implmklchannel_targetsconda-forge_mainis_rcFalsenumpy2python3.13.____cp313.yaml delete mode 100644 .ci_support/osx_arm64_channel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.10.____cpython.yaml delete mode 100644 .ci_support/osx_arm64_channel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.11.____cpython.yaml delete mode 100644 .ci_support/osx_arm64_channel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.12.____cpython.yaml delete mode 100644 .ci_support/osx_arm64_channel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.9.____cpython.yaml delete mode 100644 .ci_support/osx_arm64_channel_targetsconda-forge_mainis_rcFalsenumpy2python3.13.____cp313.yaml delete mode 100644 .ci_support/win_64_channel_targetsconda-forge_maincuda_compilercuda-nvcccuda_compiler_version12.6is_rcFalse.yaml delete mode 100755 .scripts/build_steps.sh delete mode 100755 .scripts/run_docker_build.sh delete mode 100755 .scripts/run_osx_build.sh delete mode 100644 azure-pipelines.yml diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml deleted file mode 100755 index bcfc9f37a..000000000 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ /dev/null @@ -1,79 +0,0 @@ -# This file was generated automatically from conda-smithy. To update this configuration, -# update the conda-forge.yml and/or the recipe/meta.yaml. -# -*- mode: yaml -*- - -jobs: -- job: osx - pool: - vmImage: macOS-13 - strategy: - matrix: - osx_64_blas_implgenericchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.10.____cpython: - CONFIG: osx_64_blas_implgenericchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.10.____cpython - UPLOAD_PACKAGES: 'True' - osx_64_blas_implgenericchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.11.____cpython: - CONFIG: osx_64_blas_implgenericchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.11.____cpython - UPLOAD_PACKAGES: 'True' - osx_64_blas_implgenericchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.12.____cpython: - CONFIG: osx_64_blas_implgenericchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.12.____cpython - UPLOAD_PACKAGES: 'True' - osx_64_blas_implgenericchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.9.____cpython: - CONFIG: osx_64_blas_implgenericchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.9.____cpython - UPLOAD_PACKAGES: 'True' - osx_64_blas_implgenericchannel_targetsconda-forge_mainis_rcFalsenumpy2python3.13.____cp313: - CONFIG: osx_64_blas_implgenericchannel_targetsconda-forge_mainis_rcFalsenumpy2python3.13.____cp313 - UPLOAD_PACKAGES: 'True' - osx_64_blas_implmklchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.10.____cpython: - CONFIG: osx_64_blas_implmklchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.10.____cpython - UPLOAD_PACKAGES: 'True' - osx_64_blas_implmklchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.11.____cpython: - CONFIG: osx_64_blas_implmklchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.11.____cpython - UPLOAD_PACKAGES: 'True' - osx_64_blas_implmklchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.12.____cpython: - CONFIG: osx_64_blas_implmklchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.12.____cpython - UPLOAD_PACKAGES: 'True' - osx_64_blas_implmklchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.9.____cpython: - CONFIG: osx_64_blas_implmklchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.9.____cpython - UPLOAD_PACKAGES: 'True' - osx_64_blas_implmklchannel_targetsconda-forge_mainis_rcFalsenumpy2python3.13.____cp313: - CONFIG: osx_64_blas_implmklchannel_targetsconda-forge_mainis_rcFalsenumpy2python3.13.____cp313 - UPLOAD_PACKAGES: 'True' - osx_arm64_channel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.10.____cpython: - CONFIG: osx_arm64_channel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.10.____cpython - UPLOAD_PACKAGES: 'True' - osx_arm64_channel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.11.____cpython: - CONFIG: osx_arm64_channel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.11.____cpython - UPLOAD_PACKAGES: 'True' - osx_arm64_channel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.12.____cpython: - CONFIG: osx_arm64_channel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.12.____cpython - UPLOAD_PACKAGES: 'True' - osx_arm64_channel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.9.____cpython: - CONFIG: osx_arm64_channel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.9.____cpython - UPLOAD_PACKAGES: 'True' - osx_arm64_channel_targetsconda-forge_mainis_rcFalsenumpy2python3.13.____cp313: - CONFIG: osx_arm64_channel_targetsconda-forge_mainis_rcFalsenumpy2python3.13.____cp313 - UPLOAD_PACKAGES: 'True' - timeoutInMinutes: 360 - variables: {} - - steps: - # TODO: Fast finish on azure pipelines? - - script: | - export CI=azure - export flow_run_id=azure_$(Build.BuildNumber).$(System.JobAttempt) - export remote_url=$(Build.Repository.Uri) - export sha=$(Build.SourceVersion) - export OSX_FORCE_SDK_DOWNLOAD="1" - export GIT_BRANCH=$BUILD_SOURCEBRANCHNAME - export FEEDSTOCK_NAME=$(basename ${BUILD_REPOSITORY_NAME}) - if [[ "${BUILD_REASON:-}" == "PullRequest" ]]; then - export IS_PR_BUILD="True" - else - export IS_PR_BUILD="False" - fi - ./.scripts/run_osx_build.sh - displayName: Run OSX build - env: - BINSTAR_TOKEN: $(BINSTAR_TOKEN) - FEEDSTOCK_TOKEN: $(FEEDSTOCK_TOKEN) - STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) \ No newline at end of file diff --git a/.ci_support/linux_64_blas_implgenericc_compiler_version13channel_targetsconda-forge_maincuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13is_rcFalse.yaml b/.ci_support/linux_64_blas_implgenericc_compiler_version13channel_targetsconda-forge_maincuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13is_rcFalse.yaml deleted file mode 100644 index 45418ed98..000000000 --- a/.ci_support/linux_64_blas_implgenericc_compiler_version13channel_targetsconda-forge_maincuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13is_rcFalse.yaml +++ /dev/null @@ -1,80 +0,0 @@ -blas_impl: -- generic -c_compiler: -- gcc -c_compiler_version: -- '13' -c_stdlib: -- sysroot -c_stdlib_version: -- '2.17' -cdt_name: -- conda -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cuda_compiler: -- None -cuda_compiler_version: -- None -cudnn: -- '9' -cxx_compiler: -- gxx -cxx_compiler_version: -- '13' -docker_image: -- quay.io/condaforge/linux-anvil-x86_64:alma9 -github_actions_labels: -- cirun-openstack-gpu-2xlarge -is_rc: -- 'False' -libabseil: -- '20240722' -libblas: -- 3.9 *netlib -libcblas: -- 3.9 *netlib -liblapack: -- 3.9 *netlib -libprotobuf: -- 5.28.3 -libtorch: -- '2.4' -megabuild: -- 'true' -mkl: -- '2024' -nccl: -- '2' -numpy: -- '2.0' -- '2.0' -- '2.0' -- '2' -- '2.0' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.10.* *_cpython -- 3.11.* *_cpython -- 3.12.* *_cpython -- 3.13.* *_cp313 -- 3.9.* *_cpython -pytorch: -- '2.4' -target_platform: -- linux-64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version - - cuda_compiler - - cuda_compiler_version - - docker_image -- - channel_targets - - is_rc -- - python - - numpy diff --git a/.ci_support/linux_64_blas_implgenericc_compiler_version13channel_targetsconda-forge_maincuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13is_rcFalse.yaml b/.ci_support/linux_64_blas_implgenericc_compiler_version13channel_targetsconda-forge_maincuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13is_rcFalse.yaml deleted file mode 100644 index 182156149..000000000 --- a/.ci_support/linux_64_blas_implgenericc_compiler_version13channel_targetsconda-forge_maincuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13is_rcFalse.yaml +++ /dev/null @@ -1,80 +0,0 @@ -blas_impl: -- generic -c_compiler: -- gcc -c_compiler_version: -- '13' -c_stdlib: -- sysroot -c_stdlib_version: -- '2.17' -cdt_name: -- conda -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cuda_compiler: -- cuda-nvcc -cuda_compiler_version: -- '12.6' -cudnn: -- '9' -cxx_compiler: -- gxx -cxx_compiler_version: -- '13' -docker_image: -- quay.io/condaforge/linux-anvil-x86_64:alma9 -github_actions_labels: -- cirun-openstack-gpu-2xlarge -is_rc: -- 'False' -libabseil: -- '20240722' -libblas: -- 3.9 *netlib -libcblas: -- 3.9 *netlib -liblapack: -- 3.9 *netlib -libprotobuf: -- 5.28.3 -libtorch: -- '2.4' -megabuild: -- 'true' -mkl: -- '2024' -nccl: -- '2' -numpy: -- '2.0' -- '2.0' -- '2.0' -- '2' -- '2.0' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.10.* *_cpython -- 3.11.* *_cpython -- 3.12.* *_cpython -- 3.13.* *_cp313 -- 3.9.* *_cpython -pytorch: -- '2.4' -target_platform: -- linux-64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version - - cuda_compiler - - cuda_compiler_version - - docker_image -- - channel_targets - - is_rc -- - python - - numpy diff --git a/.ci_support/linux_64_blas_implmklc_compiler_version13channel_targetsconda-forge_maincuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13is_rcFalse.yaml b/.ci_support/linux_64_blas_implmklc_compiler_version13channel_targetsconda-forge_maincuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13is_rcFalse.yaml deleted file mode 100644 index 77351ad71..000000000 --- a/.ci_support/linux_64_blas_implmklc_compiler_version13channel_targetsconda-forge_maincuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13is_rcFalse.yaml +++ /dev/null @@ -1,80 +0,0 @@ -blas_impl: -- mkl -c_compiler: -- gcc -c_compiler_version: -- '13' -c_stdlib: -- sysroot -c_stdlib_version: -- '2.17' -cdt_name: -- conda -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cuda_compiler: -- None -cuda_compiler_version: -- None -cudnn: -- '9' -cxx_compiler: -- gxx -cxx_compiler_version: -- '13' -docker_image: -- quay.io/condaforge/linux-anvil-x86_64:alma9 -github_actions_labels: -- cirun-openstack-gpu-2xlarge -is_rc: -- 'False' -libabseil: -- '20240722' -libblas: -- 3.9 *netlib -libcblas: -- 3.9 *netlib -liblapack: -- 3.9 *netlib -libprotobuf: -- 5.28.3 -libtorch: -- '2.4' -megabuild: -- 'true' -mkl: -- '2024' -nccl: -- '2' -numpy: -- '2.0' -- '2.0' -- '2.0' -- '2' -- '2.0' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.10.* *_cpython -- 3.11.* *_cpython -- 3.12.* *_cpython -- 3.13.* *_cp313 -- 3.9.* *_cpython -pytorch: -- '2.4' -target_platform: -- linux-64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version - - cuda_compiler - - cuda_compiler_version - - docker_image -- - channel_targets - - is_rc -- - python - - numpy diff --git a/.ci_support/linux_64_blas_implmklc_compiler_version13channel_targetsconda-forge_maincuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13is_rcFalse.yaml b/.ci_support/linux_64_blas_implmklc_compiler_version13channel_targetsconda-forge_maincuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13is_rcFalse.yaml deleted file mode 100644 index aa913c621..000000000 --- a/.ci_support/linux_64_blas_implmklc_compiler_version13channel_targetsconda-forge_maincuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13is_rcFalse.yaml +++ /dev/null @@ -1,80 +0,0 @@ -blas_impl: -- mkl -c_compiler: -- gcc -c_compiler_version: -- '13' -c_stdlib: -- sysroot -c_stdlib_version: -- '2.17' -cdt_name: -- conda -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cuda_compiler: -- cuda-nvcc -cuda_compiler_version: -- '12.6' -cudnn: -- '9' -cxx_compiler: -- gxx -cxx_compiler_version: -- '13' -docker_image: -- quay.io/condaforge/linux-anvil-x86_64:alma9 -github_actions_labels: -- cirun-openstack-gpu-2xlarge -is_rc: -- 'False' -libabseil: -- '20240722' -libblas: -- 3.9 *netlib -libcblas: -- 3.9 *netlib -liblapack: -- 3.9 *netlib -libprotobuf: -- 5.28.3 -libtorch: -- '2.4' -megabuild: -- 'true' -mkl: -- '2024' -nccl: -- '2' -numpy: -- '2.0' -- '2.0' -- '2.0' -- '2' -- '2.0' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.10.* *_cpython -- 3.11.* *_cpython -- 3.12.* *_cpython -- 3.13.* *_cp313 -- 3.9.* *_cpython -pytorch: -- '2.4' -target_platform: -- linux-64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version - - cuda_compiler - - cuda_compiler_version - - docker_image -- - channel_targets - - is_rc -- - python - - numpy diff --git a/.ci_support/linux_aarch64_c_compiler_version13channel_targetsconda-forge_maincuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13is_rcFalse.yaml b/.ci_support/linux_aarch64_c_compiler_version13channel_targetsconda-forge_maincuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13is_rcFalse.yaml deleted file mode 100644 index d4635f051..000000000 --- a/.ci_support/linux_aarch64_c_compiler_version13channel_targetsconda-forge_maincuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13is_rcFalse.yaml +++ /dev/null @@ -1,80 +0,0 @@ -blas_impl: -- generic -c_compiler: -- gcc -c_compiler_version: -- '13' -c_stdlib: -- sysroot -c_stdlib_version: -- '2.17' -cdt_name: -- conda -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cuda_compiler: -- None -cuda_compiler_version: -- None -cudnn: -- '9' -cxx_compiler: -- gxx -cxx_compiler_version: -- '13' -docker_image: -- quay.io/condaforge/linux-anvil-x86_64:alma9 -github_actions_labels: -- cirun-openstack-gpu-2xlarge -is_rc: -- 'False' -libabseil: -- '20240722' -libblas: -- 3.9 *netlib -libcblas: -- 3.9 *netlib -liblapack: -- 3.9 *netlib -libprotobuf: -- 5.28.3 -libtorch: -- '2.4' -megabuild: -- 'true' -mkl: -- '2024' -nccl: -- '2' -numpy: -- '2.0' -- '2.0' -- '2.0' -- '2' -- '2.0' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.10.* *_cpython -- 3.11.* *_cpython -- 3.12.* *_cpython -- 3.13.* *_cp313 -- 3.9.* *_cpython -pytorch: -- '2.4' -target_platform: -- linux-aarch64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version - - cuda_compiler - - cuda_compiler_version - - docker_image -- - channel_targets - - is_rc -- - python - - numpy diff --git a/.ci_support/linux_aarch64_c_compiler_version13channel_targetsconda-forge_maincuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13is_rcFalse.yaml b/.ci_support/linux_aarch64_c_compiler_version13channel_targetsconda-forge_maincuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13is_rcFalse.yaml deleted file mode 100644 index a7d7b6591..000000000 --- a/.ci_support/linux_aarch64_c_compiler_version13channel_targetsconda-forge_maincuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13is_rcFalse.yaml +++ /dev/null @@ -1,80 +0,0 @@ -blas_impl: -- generic -c_compiler: -- gcc -c_compiler_version: -- '13' -c_stdlib: -- sysroot -c_stdlib_version: -- '2.17' -cdt_name: -- conda -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cuda_compiler: -- cuda-nvcc -cuda_compiler_version: -- '12.6' -cudnn: -- '9' -cxx_compiler: -- gxx -cxx_compiler_version: -- '13' -docker_image: -- quay.io/condaforge/linux-anvil-x86_64:alma9 -github_actions_labels: -- cirun-openstack-gpu-2xlarge -is_rc: -- 'False' -libabseil: -- '20240722' -libblas: -- 3.9 *netlib -libcblas: -- 3.9 *netlib -liblapack: -- 3.9 *netlib -libprotobuf: -- 5.28.3 -libtorch: -- '2.4' -megabuild: -- 'true' -mkl: -- '2024' -nccl: -- '2' -numpy: -- '2.0' -- '2.0' -- '2.0' -- '2' -- '2.0' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.10.* *_cpython -- 3.11.* *_cpython -- 3.12.* *_cpython -- 3.13.* *_cp313 -- 3.9.* *_cpython -pytorch: -- '2.4' -target_platform: -- linux-aarch64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version - - cuda_compiler - - cuda_compiler_version - - docker_image -- - channel_targets - - is_rc -- - python - - numpy diff --git a/.ci_support/osx_64_blas_implgenericchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.10.____cpython.yaml b/.ci_support/osx_64_blas_implgenericchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.10.____cpython.yaml deleted file mode 100644 index 66656f427..000000000 --- a/.ci_support/osx_64_blas_implgenericchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.10.____cpython.yaml +++ /dev/null @@ -1,67 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '10.15' -MACOSX_SDK_VERSION: -- '13.3' -blas_impl: -- generic -c_compiler: -- clang -c_compiler_version: -- '18' -c_stdlib: -- macosx_deployment_target -c_stdlib_version: -- '10.15' -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cuda_compiler: -- None -cuda_compiler_version: -- None -cxx_compiler: -- clangxx -cxx_compiler_version: -- '18' -is_rc: -- 'False' -libabseil: -- '20240722' -libblas: -- 3.9 *netlib -libcblas: -- 3.9 *netlib -liblapack: -- 3.9 *netlib -libprotobuf: -- 5.28.3 -libtorch: -- '2.4' -llvm_openmp: -- '18' -macos_machine: -- x86_64-apple-darwin13.4.0 -megabuild: -- 'false' -mkl: -- '2023' -numpy: -- '2.0' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.10.* *_cpython -pytorch: -- '2.4' -target_platform: -- osx-64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version -- - channel_targets - - is_rc -- - python - - numpy diff --git a/.ci_support/osx_64_blas_implgenericchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.11.____cpython.yaml b/.ci_support/osx_64_blas_implgenericchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.11.____cpython.yaml deleted file mode 100644 index 04aefc778..000000000 --- a/.ci_support/osx_64_blas_implgenericchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.11.____cpython.yaml +++ /dev/null @@ -1,67 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '10.15' -MACOSX_SDK_VERSION: -- '13.3' -blas_impl: -- generic -c_compiler: -- clang -c_compiler_version: -- '18' -c_stdlib: -- macosx_deployment_target -c_stdlib_version: -- '10.15' -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cuda_compiler: -- None -cuda_compiler_version: -- None -cxx_compiler: -- clangxx -cxx_compiler_version: -- '18' -is_rc: -- 'False' -libabseil: -- '20240722' -libblas: -- 3.9 *netlib -libcblas: -- 3.9 *netlib -liblapack: -- 3.9 *netlib -libprotobuf: -- 5.28.3 -libtorch: -- '2.4' -llvm_openmp: -- '18' -macos_machine: -- x86_64-apple-darwin13.4.0 -megabuild: -- 'false' -mkl: -- '2023' -numpy: -- '2.0' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.11.* *_cpython -pytorch: -- '2.4' -target_platform: -- osx-64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version -- - channel_targets - - is_rc -- - python - - numpy diff --git a/.ci_support/osx_64_blas_implgenericchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.12.____cpython.yaml b/.ci_support/osx_64_blas_implgenericchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.12.____cpython.yaml deleted file mode 100644 index cbbe6612f..000000000 --- a/.ci_support/osx_64_blas_implgenericchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.12.____cpython.yaml +++ /dev/null @@ -1,67 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '10.15' -MACOSX_SDK_VERSION: -- '13.3' -blas_impl: -- generic -c_compiler: -- clang -c_compiler_version: -- '18' -c_stdlib: -- macosx_deployment_target -c_stdlib_version: -- '10.15' -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cuda_compiler: -- None -cuda_compiler_version: -- None -cxx_compiler: -- clangxx -cxx_compiler_version: -- '18' -is_rc: -- 'False' -libabseil: -- '20240722' -libblas: -- 3.9 *netlib -libcblas: -- 3.9 *netlib -liblapack: -- 3.9 *netlib -libprotobuf: -- 5.28.3 -libtorch: -- '2.4' -llvm_openmp: -- '18' -macos_machine: -- x86_64-apple-darwin13.4.0 -megabuild: -- 'false' -mkl: -- '2023' -numpy: -- '2.0' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.12.* *_cpython -pytorch: -- '2.4' -target_platform: -- osx-64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version -- - channel_targets - - is_rc -- - python - - numpy diff --git a/.ci_support/osx_64_blas_implgenericchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.9.____cpython.yaml b/.ci_support/osx_64_blas_implgenericchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.9.____cpython.yaml deleted file mode 100644 index 02a4aa43b..000000000 --- a/.ci_support/osx_64_blas_implgenericchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.9.____cpython.yaml +++ /dev/null @@ -1,67 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '10.15' -MACOSX_SDK_VERSION: -- '13.3' -blas_impl: -- generic -c_compiler: -- clang -c_compiler_version: -- '18' -c_stdlib: -- macosx_deployment_target -c_stdlib_version: -- '10.15' -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cuda_compiler: -- None -cuda_compiler_version: -- None -cxx_compiler: -- clangxx -cxx_compiler_version: -- '18' -is_rc: -- 'False' -libabseil: -- '20240722' -libblas: -- 3.9 *netlib -libcblas: -- 3.9 *netlib -liblapack: -- 3.9 *netlib -libprotobuf: -- 5.28.3 -libtorch: -- '2.4' -llvm_openmp: -- '18' -macos_machine: -- x86_64-apple-darwin13.4.0 -megabuild: -- 'false' -mkl: -- '2023' -numpy: -- '2.0' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.9.* *_cpython -pytorch: -- '2.4' -target_platform: -- osx-64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version -- - channel_targets - - is_rc -- - python - - numpy diff --git a/.ci_support/osx_64_blas_implgenericchannel_targetsconda-forge_mainis_rcFalsenumpy2python3.13.____cp313.yaml b/.ci_support/osx_64_blas_implgenericchannel_targetsconda-forge_mainis_rcFalsenumpy2python3.13.____cp313.yaml deleted file mode 100644 index 2aef50475..000000000 --- a/.ci_support/osx_64_blas_implgenericchannel_targetsconda-forge_mainis_rcFalsenumpy2python3.13.____cp313.yaml +++ /dev/null @@ -1,67 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '10.15' -MACOSX_SDK_VERSION: -- '13.3' -blas_impl: -- generic -c_compiler: -- clang -c_compiler_version: -- '18' -c_stdlib: -- macosx_deployment_target -c_stdlib_version: -- '10.15' -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cuda_compiler: -- None -cuda_compiler_version: -- None -cxx_compiler: -- clangxx -cxx_compiler_version: -- '18' -is_rc: -- 'False' -libabseil: -- '20240722' -libblas: -- 3.9 *netlib -libcblas: -- 3.9 *netlib -liblapack: -- 3.9 *netlib -libprotobuf: -- 5.28.3 -libtorch: -- '2.4' -llvm_openmp: -- '18' -macos_machine: -- x86_64-apple-darwin13.4.0 -megabuild: -- 'false' -mkl: -- '2023' -numpy: -- '2' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.13.* *_cp313 -pytorch: -- '2.4' -target_platform: -- osx-64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version -- - channel_targets - - is_rc -- - python - - numpy diff --git a/.ci_support/osx_64_blas_implmklchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.10.____cpython.yaml b/.ci_support/osx_64_blas_implmklchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.10.____cpython.yaml deleted file mode 100644 index 023552294..000000000 --- a/.ci_support/osx_64_blas_implmklchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.10.____cpython.yaml +++ /dev/null @@ -1,67 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '10.15' -MACOSX_SDK_VERSION: -- '13.3' -blas_impl: -- mkl -c_compiler: -- clang -c_compiler_version: -- '18' -c_stdlib: -- macosx_deployment_target -c_stdlib_version: -- '10.15' -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cuda_compiler: -- None -cuda_compiler_version: -- None -cxx_compiler: -- clangxx -cxx_compiler_version: -- '18' -is_rc: -- 'False' -libabseil: -- '20240722' -libblas: -- 3.9 *netlib -libcblas: -- 3.9 *netlib -liblapack: -- 3.9 *netlib -libprotobuf: -- 5.28.3 -libtorch: -- '2.4' -llvm_openmp: -- '18' -macos_machine: -- x86_64-apple-darwin13.4.0 -megabuild: -- 'false' -mkl: -- '2023' -numpy: -- '2.0' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.10.* *_cpython -pytorch: -- '2.4' -target_platform: -- osx-64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version -- - channel_targets - - is_rc -- - python - - numpy diff --git a/.ci_support/osx_64_blas_implmklchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.11.____cpython.yaml b/.ci_support/osx_64_blas_implmklchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.11.____cpython.yaml deleted file mode 100644 index b57aaf092..000000000 --- a/.ci_support/osx_64_blas_implmklchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.11.____cpython.yaml +++ /dev/null @@ -1,67 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '10.15' -MACOSX_SDK_VERSION: -- '13.3' -blas_impl: -- mkl -c_compiler: -- clang -c_compiler_version: -- '18' -c_stdlib: -- macosx_deployment_target -c_stdlib_version: -- '10.15' -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cuda_compiler: -- None -cuda_compiler_version: -- None -cxx_compiler: -- clangxx -cxx_compiler_version: -- '18' -is_rc: -- 'False' -libabseil: -- '20240722' -libblas: -- 3.9 *netlib -libcblas: -- 3.9 *netlib -liblapack: -- 3.9 *netlib -libprotobuf: -- 5.28.3 -libtorch: -- '2.4' -llvm_openmp: -- '18' -macos_machine: -- x86_64-apple-darwin13.4.0 -megabuild: -- 'false' -mkl: -- '2023' -numpy: -- '2.0' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.11.* *_cpython -pytorch: -- '2.4' -target_platform: -- osx-64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version -- - channel_targets - - is_rc -- - python - - numpy diff --git a/.ci_support/osx_64_blas_implmklchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.12.____cpython.yaml b/.ci_support/osx_64_blas_implmklchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.12.____cpython.yaml deleted file mode 100644 index d549ae43e..000000000 --- a/.ci_support/osx_64_blas_implmklchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.12.____cpython.yaml +++ /dev/null @@ -1,67 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '10.15' -MACOSX_SDK_VERSION: -- '13.3' -blas_impl: -- mkl -c_compiler: -- clang -c_compiler_version: -- '18' -c_stdlib: -- macosx_deployment_target -c_stdlib_version: -- '10.15' -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cuda_compiler: -- None -cuda_compiler_version: -- None -cxx_compiler: -- clangxx -cxx_compiler_version: -- '18' -is_rc: -- 'False' -libabseil: -- '20240722' -libblas: -- 3.9 *netlib -libcblas: -- 3.9 *netlib -liblapack: -- 3.9 *netlib -libprotobuf: -- 5.28.3 -libtorch: -- '2.4' -llvm_openmp: -- '18' -macos_machine: -- x86_64-apple-darwin13.4.0 -megabuild: -- 'false' -mkl: -- '2023' -numpy: -- '2.0' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.12.* *_cpython -pytorch: -- '2.4' -target_platform: -- osx-64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version -- - channel_targets - - is_rc -- - python - - numpy diff --git a/.ci_support/osx_64_blas_implmklchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.9.____cpython.yaml b/.ci_support/osx_64_blas_implmklchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.9.____cpython.yaml deleted file mode 100644 index c5705b306..000000000 --- a/.ci_support/osx_64_blas_implmklchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.9.____cpython.yaml +++ /dev/null @@ -1,67 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '10.15' -MACOSX_SDK_VERSION: -- '13.3' -blas_impl: -- mkl -c_compiler: -- clang -c_compiler_version: -- '18' -c_stdlib: -- macosx_deployment_target -c_stdlib_version: -- '10.15' -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cuda_compiler: -- None -cuda_compiler_version: -- None -cxx_compiler: -- clangxx -cxx_compiler_version: -- '18' -is_rc: -- 'False' -libabseil: -- '20240722' -libblas: -- 3.9 *netlib -libcblas: -- 3.9 *netlib -liblapack: -- 3.9 *netlib -libprotobuf: -- 5.28.3 -libtorch: -- '2.4' -llvm_openmp: -- '18' -macos_machine: -- x86_64-apple-darwin13.4.0 -megabuild: -- 'false' -mkl: -- '2023' -numpy: -- '2.0' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.9.* *_cpython -pytorch: -- '2.4' -target_platform: -- osx-64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version -- - channel_targets - - is_rc -- - python - - numpy diff --git a/.ci_support/osx_64_blas_implmklchannel_targetsconda-forge_mainis_rcFalsenumpy2python3.13.____cp313.yaml b/.ci_support/osx_64_blas_implmklchannel_targetsconda-forge_mainis_rcFalsenumpy2python3.13.____cp313.yaml deleted file mode 100644 index 7c8113b3f..000000000 --- a/.ci_support/osx_64_blas_implmklchannel_targetsconda-forge_mainis_rcFalsenumpy2python3.13.____cp313.yaml +++ /dev/null @@ -1,67 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '10.15' -MACOSX_SDK_VERSION: -- '13.3' -blas_impl: -- mkl -c_compiler: -- clang -c_compiler_version: -- '18' -c_stdlib: -- macosx_deployment_target -c_stdlib_version: -- '10.15' -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cuda_compiler: -- None -cuda_compiler_version: -- None -cxx_compiler: -- clangxx -cxx_compiler_version: -- '18' -is_rc: -- 'False' -libabseil: -- '20240722' -libblas: -- 3.9 *netlib -libcblas: -- 3.9 *netlib -liblapack: -- 3.9 *netlib -libprotobuf: -- 5.28.3 -libtorch: -- '2.4' -llvm_openmp: -- '18' -macos_machine: -- x86_64-apple-darwin13.4.0 -megabuild: -- 'false' -mkl: -- '2023' -numpy: -- '2' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.13.* *_cp313 -pytorch: -- '2.4' -target_platform: -- osx-64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version -- - channel_targets - - is_rc -- - python - - numpy diff --git a/.ci_support/osx_arm64_channel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.10.____cpython.yaml b/.ci_support/osx_arm64_channel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.10.____cpython.yaml deleted file mode 100644 index 4ca2b50c8..000000000 --- a/.ci_support/osx_arm64_channel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.10.____cpython.yaml +++ /dev/null @@ -1,67 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '11.0' -MACOSX_SDK_VERSION: -- '13.3' -blas_impl: -- generic -c_compiler: -- clang -c_compiler_version: -- '18' -c_stdlib: -- macosx_deployment_target -c_stdlib_version: -- '11.0' -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cuda_compiler: -- None -cuda_compiler_version: -- None -cxx_compiler: -- clangxx -cxx_compiler_version: -- '18' -is_rc: -- 'False' -libabseil: -- '20240722' -libblas: -- 3.9 *netlib -libcblas: -- 3.9 *netlib -liblapack: -- 3.9 *netlib -libprotobuf: -- 5.28.3 -libtorch: -- '2.4' -llvm_openmp: -- '18' -macos_machine: -- arm64-apple-darwin20.0.0 -megabuild: -- 'false' -mkl: -- '2023' -numpy: -- '2.0' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.10.* *_cpython -pytorch: -- '2.4' -target_platform: -- osx-arm64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version -- - channel_targets - - is_rc -- - python - - numpy diff --git a/.ci_support/osx_arm64_channel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.11.____cpython.yaml b/.ci_support/osx_arm64_channel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.11.____cpython.yaml deleted file mode 100644 index 17f951bb4..000000000 --- a/.ci_support/osx_arm64_channel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.11.____cpython.yaml +++ /dev/null @@ -1,67 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '11.0' -MACOSX_SDK_VERSION: -- '13.3' -blas_impl: -- generic -c_compiler: -- clang -c_compiler_version: -- '18' -c_stdlib: -- macosx_deployment_target -c_stdlib_version: -- '11.0' -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cuda_compiler: -- None -cuda_compiler_version: -- None -cxx_compiler: -- clangxx -cxx_compiler_version: -- '18' -is_rc: -- 'False' -libabseil: -- '20240722' -libblas: -- 3.9 *netlib -libcblas: -- 3.9 *netlib -liblapack: -- 3.9 *netlib -libprotobuf: -- 5.28.3 -libtorch: -- '2.4' -llvm_openmp: -- '18' -macos_machine: -- arm64-apple-darwin20.0.0 -megabuild: -- 'false' -mkl: -- '2023' -numpy: -- '2.0' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.11.* *_cpython -pytorch: -- '2.4' -target_platform: -- osx-arm64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version -- - channel_targets - - is_rc -- - python - - numpy diff --git a/.ci_support/osx_arm64_channel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.12.____cpython.yaml b/.ci_support/osx_arm64_channel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.12.____cpython.yaml deleted file mode 100644 index 793a82255..000000000 --- a/.ci_support/osx_arm64_channel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.12.____cpython.yaml +++ /dev/null @@ -1,67 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '11.0' -MACOSX_SDK_VERSION: -- '13.3' -blas_impl: -- generic -c_compiler: -- clang -c_compiler_version: -- '18' -c_stdlib: -- macosx_deployment_target -c_stdlib_version: -- '11.0' -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cuda_compiler: -- None -cuda_compiler_version: -- None -cxx_compiler: -- clangxx -cxx_compiler_version: -- '18' -is_rc: -- 'False' -libabseil: -- '20240722' -libblas: -- 3.9 *netlib -libcblas: -- 3.9 *netlib -liblapack: -- 3.9 *netlib -libprotobuf: -- 5.28.3 -libtorch: -- '2.4' -llvm_openmp: -- '18' -macos_machine: -- arm64-apple-darwin20.0.0 -megabuild: -- 'false' -mkl: -- '2023' -numpy: -- '2.0' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.12.* *_cpython -pytorch: -- '2.4' -target_platform: -- osx-arm64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version -- - channel_targets - - is_rc -- - python - - numpy diff --git a/.ci_support/osx_arm64_channel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.9.____cpython.yaml b/.ci_support/osx_arm64_channel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.9.____cpython.yaml deleted file mode 100644 index 0ec714e44..000000000 --- a/.ci_support/osx_arm64_channel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.9.____cpython.yaml +++ /dev/null @@ -1,67 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '11.0' -MACOSX_SDK_VERSION: -- '13.3' -blas_impl: -- generic -c_compiler: -- clang -c_compiler_version: -- '18' -c_stdlib: -- macosx_deployment_target -c_stdlib_version: -- '11.0' -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cuda_compiler: -- None -cuda_compiler_version: -- None -cxx_compiler: -- clangxx -cxx_compiler_version: -- '18' -is_rc: -- 'False' -libabseil: -- '20240722' -libblas: -- 3.9 *netlib -libcblas: -- 3.9 *netlib -liblapack: -- 3.9 *netlib -libprotobuf: -- 5.28.3 -libtorch: -- '2.4' -llvm_openmp: -- '18' -macos_machine: -- arm64-apple-darwin20.0.0 -megabuild: -- 'false' -mkl: -- '2023' -numpy: -- '2.0' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.9.* *_cpython -pytorch: -- '2.4' -target_platform: -- osx-arm64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version -- - channel_targets - - is_rc -- - python - - numpy diff --git a/.ci_support/osx_arm64_channel_targetsconda-forge_mainis_rcFalsenumpy2python3.13.____cp313.yaml b/.ci_support/osx_arm64_channel_targetsconda-forge_mainis_rcFalsenumpy2python3.13.____cp313.yaml deleted file mode 100644 index abf491d5f..000000000 --- a/.ci_support/osx_arm64_channel_targetsconda-forge_mainis_rcFalsenumpy2python3.13.____cp313.yaml +++ /dev/null @@ -1,67 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '11.0' -MACOSX_SDK_VERSION: -- '13.3' -blas_impl: -- generic -c_compiler: -- clang -c_compiler_version: -- '18' -c_stdlib: -- macosx_deployment_target -c_stdlib_version: -- '11.0' -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cuda_compiler: -- None -cuda_compiler_version: -- None -cxx_compiler: -- clangxx -cxx_compiler_version: -- '18' -is_rc: -- 'False' -libabseil: -- '20240722' -libblas: -- 3.9 *netlib -libcblas: -- 3.9 *netlib -liblapack: -- 3.9 *netlib -libprotobuf: -- 5.28.3 -libtorch: -- '2.4' -llvm_openmp: -- '18' -macos_machine: -- arm64-apple-darwin20.0.0 -megabuild: -- 'false' -mkl: -- '2023' -numpy: -- '2' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.13.* *_cp313 -pytorch: -- '2.4' -target_platform: -- osx-arm64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version -- - channel_targets - - is_rc -- - python - - numpy diff --git a/.ci_support/win_64_channel_targetsconda-forge_maincuda_compilerNonecuda_compiler_versionNoneis_rcFalse.yaml b/.ci_support/win_64_channel_targetsconda-forge_maincuda_compilerNonecuda_compiler_versionNoneis_rcFalse.yaml index 483682129..4ab0009bf 100644 --- a/.ci_support/win_64_channel_targetsconda-forge_maincuda_compilerNonecuda_compiler_versionNoneis_rcFalse.yaml +++ b/.ci_support/win_64_channel_targetsconda-forge_maincuda_compilerNonecuda_compiler_versionNoneis_rcFalse.yaml @@ -12,8 +12,6 @@ cuda_compiler: - None cuda_compiler_version: - None -cudnn: -- '9' cxx_compiler: - vs2019 github_actions_labels: diff --git a/.ci_support/win_64_channel_targetsconda-forge_maincuda_compilercuda-nvcccuda_compiler_version12.6is_rcFalse.yaml b/.ci_support/win_64_channel_targetsconda-forge_maincuda_compilercuda-nvcccuda_compiler_version12.6is_rcFalse.yaml deleted file mode 100644 index c0402bfc3..000000000 --- a/.ci_support/win_64_channel_targetsconda-forge_maincuda_compilercuda-nvcccuda_compiler_version12.6is_rcFalse.yaml +++ /dev/null @@ -1,59 +0,0 @@ -blas_impl: -- mkl -c_compiler: -- vs2019 -c_stdlib: -- vs -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cuda_compiler: -- cuda-nvcc -cuda_compiler_version: -- '12.6' -cudnn: -- '9' -cxx_compiler: -- vs2019 -github_actions_labels: -- cirun-azure-windows-2xlarge -is_rc: -- 'False' -libabseil: -- '20240722' -libprotobuf: -- 5.28.3 -libtorch: -- '2.4' -megabuild: -- 'true' -mkl: -- '2024' -numpy: -- '2.0' -- '2.0' -- '2.0' -- '2' -- '2.0' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.10.* *_cpython -- 3.11.* *_cpython -- 3.12.* *_cpython -- 3.13.* *_cp313 -- 3.9.* *_cpython -pytorch: -- '2.4' -target_platform: -- win-64 -zip_keys: -- - channel_targets - - is_rc -- - cuda_compiler - - cuda_compiler_version -- - python - - numpy diff --git a/.github/workflows/conda-build.yml b/.github/workflows/conda-build.yml index 40a005a95..c94db1a19 100644 --- a/.github/workflows/conda-build.yml +++ b/.github/workflows/conda-build.yml @@ -21,50 +21,10 @@ jobs: fail-fast: false matrix: include: - - CONFIG: linux_64_blas_implgenericc_compiler_version13channel_targetsconda-forge_maincuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13is_rcFalse - UPLOAD_PACKAGES: True - os: ubuntu - runs_on: ['cirun-openstack-gpu-2xlarge--${{ github.run_id }}-linux_64_blas_implgenericc_compiler_hb59e174a3e', 'linux', 'x64', 'self-hosted'] - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 - CONDA_FORGE_DOCKER_RUN_ARGS: "--gpus all" - - CONFIG: linux_64_blas_implgenericc_compiler_version13channel_targetsconda-forge_maincuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13is_rcFalse - UPLOAD_PACKAGES: True - os: ubuntu - runs_on: ['cirun-openstack-gpu-2xlarge--${{ github.run_id }}-linux_64_blas_implgenericc_compiler_h5e2cde8be1', 'linux', 'x64', 'self-hosted'] - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 - CONDA_FORGE_DOCKER_RUN_ARGS: "--gpus all" - - CONFIG: linux_64_blas_implmklc_compiler_version13channel_targetsconda-forge_maincuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13is_rcFalse - UPLOAD_PACKAGES: True - os: ubuntu - runs_on: ['cirun-openstack-gpu-2xlarge--${{ github.run_id }}-linux_64_blas_implmklc_compiler_ver_h0b96eb68c6', 'linux', 'x64', 'self-hosted'] - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 - CONDA_FORGE_DOCKER_RUN_ARGS: "--gpus all" - - CONFIG: linux_64_blas_implmklc_compiler_version13channel_targetsconda-forge_maincuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13is_rcFalse - UPLOAD_PACKAGES: True - os: ubuntu - runs_on: ['cirun-openstack-gpu-2xlarge--${{ github.run_id }}-linux_64_blas_implmklc_compiler_ver_hc39dedf959', 'linux', 'x64', 'self-hosted'] - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 - CONDA_FORGE_DOCKER_RUN_ARGS: "--gpus all" - - CONFIG: linux_aarch64_c_compiler_version13channel_targetsconda-forge_maincuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13is_rcFalse - UPLOAD_PACKAGES: True - os: ubuntu - runs_on: ['cirun-openstack-gpu-2xlarge--${{ github.run_id }}-linux_aarch64_c_compiler_version13c_h352ed12235', 'linux', 'x64', 'self-hosted'] - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 - CONDA_FORGE_DOCKER_RUN_ARGS: "--gpus all" - - CONFIG: linux_aarch64_c_compiler_version13channel_targetsconda-forge_maincuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13is_rcFalse - UPLOAD_PACKAGES: True - os: ubuntu - runs_on: ['cirun-openstack-gpu-2xlarge--${{ github.run_id }}-linux_aarch64_c_compiler_version13c_h94771c6c09', 'linux', 'x64', 'self-hosted'] - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 - CONDA_FORGE_DOCKER_RUN_ARGS: "--gpus all" - CONFIG: win_64_channel_targetsconda-forge_maincuda_compilerNonecuda_compiler_versionNoneis_rcFalse UPLOAD_PACKAGES: True os: windows runs_on: ['cirun-azure-windows-2xlarge--${{ github.run_id }}-win_64_channel_targetsconda-forge_m_h0b759d4e63', 'windows', 'x64', 'self-hosted'] - - CONFIG: win_64_channel_targetsconda-forge_maincuda_compilercuda-nvcccuda_compiler_version12.6is_rcFalse - UPLOAD_PACKAGES: True - os: windows - runs_on: ['cirun-azure-windows-2xlarge--${{ github.run_id }}-win_64_channel_targetsconda-forge_m_h790f30616b', 'windows', 'x64', 'self-hosted'] steps: - name: Checkout code diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh deleted file mode 100755 index 827a29fbc..000000000 --- a/.scripts/build_steps.sh +++ /dev/null @@ -1,100 +0,0 @@ -#!/usr/bin/env bash - -# PLEASE NOTE: This script has been automatically generated by conda-smithy. Any changes here -# will be lost next time ``conda smithy rerender`` is run. If you would like to make permanent -# changes to this script, consider a proposal to conda-smithy so that other feedstocks can also -# benefit from the improvement. - -# -*- mode: jinja-shell -*- - -set -xeuo pipefail -export FEEDSTOCK_ROOT="${FEEDSTOCK_ROOT:-/home/conda/feedstock_root}" -source ${FEEDSTOCK_ROOT}/.scripts/logging_utils.sh - - -( endgroup "Start Docker" ) 2> /dev/null - -( startgroup "Configuring conda" ) 2> /dev/null - -export PYTHONUNBUFFERED=1 -export RECIPE_ROOT="${RECIPE_ROOT:-/home/conda/recipe_root}" -export CI_SUPPORT="${FEEDSTOCK_ROOT}/.ci_support" -export CONFIG_FILE="${CI_SUPPORT}/${CONFIG}.yaml" - -cat >~/.condarc < /opt/conda/conda-meta/history -micromamba install --root-prefix ~/.conda --prefix /opt/conda \ - --yes --override-channels --channel conda-forge --strict-channel-priority \ - pip python=3.12 conda-build conda-forge-ci-setup=4 "conda-build>=24.1" -export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1 - -# set up the condarc -setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" - -source run_conda_forge_build_setup - - - -# make the build number clobber -make_build_number "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" - -if [[ "${HOST_PLATFORM}" != "${BUILD_PLATFORM}" ]] && [[ "${HOST_PLATFORM}" != linux-* ]] && [[ "${BUILD_WITH_CONDA_DEBUG:-0}" != 1 ]]; then - EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --no-test" -fi - - -( endgroup "Configuring conda" ) 2> /dev/null - -if [[ -f "${FEEDSTOCK_ROOT}/LICENSE.txt" ]]; then - cp "${FEEDSTOCK_ROOT}/LICENSE.txt" "${RECIPE_ROOT}/recipe-scripts-license.txt" -fi - -if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then - if [[ "x${BUILD_OUTPUT_ID:-}" != "x" ]]; then - EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --output-id ${BUILD_OUTPUT_ID}" - fi - conda debug "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ - ${EXTRA_CB_OPTIONS:-} \ - --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" - - # Drop into an interactive shell - /bin/bash -else - conda-build "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ - --suppress-variables ${EXTRA_CB_OPTIONS:-} \ - --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" \ - --extra-meta flow_run_id="${flow_run_id:-}" remote_url="${remote_url:-}" sha="${sha:-}" - ( startgroup "Inspecting artifacts" ) 2> /dev/null - - # inspect_artifacts was only added in conda-forge-ci-setup 4.9.4 - command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts --recipe-dir "${RECIPE_ROOT}" -m "${CONFIG_FILE}" || echo "inspect_artifacts needs conda-forge-ci-setup >=4.9.4" - - ( endgroup "Inspecting artifacts" ) 2> /dev/null - ( startgroup "Validating outputs" ) 2> /dev/null - - validate_recipe_outputs "${FEEDSTOCK_NAME}" - - ( endgroup "Validating outputs" ) 2> /dev/null - - ( startgroup "Uploading packages" ) 2> /dev/null - - if [[ "${UPLOAD_PACKAGES}" != "False" ]] && [[ "${IS_PR_BUILD}" == "False" ]]; then - upload_package --validate --feedstock-name="${FEEDSTOCK_NAME}" "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" - fi - - ( endgroup "Uploading packages" ) 2> /dev/null -fi - -( startgroup "Final checks" ) 2> /dev/null - -touch "${FEEDSTOCK_ROOT}/build_artifacts/conda-forge-build-done-${CONFIG}" \ No newline at end of file diff --git a/.scripts/run_docker_build.sh b/.scripts/run_docker_build.sh deleted file mode 100755 index 00f377a80..000000000 --- a/.scripts/run_docker_build.sh +++ /dev/null @@ -1,114 +0,0 @@ -#!/usr/bin/env bash - -# PLEASE NOTE: This script has been automatically generated by conda-smithy. Any changes here -# will be lost next time ``conda smithy rerender`` is run. If you would like to make permanent -# changes to this script, consider a proposal to conda-smithy so that other feedstocks can also -# benefit from the improvement. - -source .scripts/logging_utils.sh - -( startgroup "Configure Docker" ) 2> /dev/null - -set -xeo pipefail - -THISDIR="$( cd "$( dirname "$0" )" >/dev/null && pwd )" -PROVIDER_DIR="$(basename $THISDIR)" - -FEEDSTOCK_ROOT="$( cd "$( dirname "$0" )/.." >/dev/null && pwd )" -RECIPE_ROOT="${FEEDSTOCK_ROOT}/recipe" - -if [ -z ${FEEDSTOCK_NAME} ]; then - export FEEDSTOCK_NAME=$(basename ${FEEDSTOCK_ROOT}) -fi - -if [[ "${sha:-}" == "" ]]; then - pushd "${FEEDSTOCK_ROOT}" - sha=$(git rev-parse HEAD) - popd -fi - -docker info - -# In order for the conda-build process in the container to write to the mounted -# volumes, we need to run with the same id as the host machine, which is -# normally the owner of the mounted volumes, or at least has write permission -export HOST_USER_ID=$(id -u) -# Check if docker-machine is being used (normally on OSX) and get the uid from -# the VM -if hash docker-machine 2> /dev/null && docker-machine active > /dev/null; then - export HOST_USER_ID=$(docker-machine ssh $(docker-machine active) id -u) -fi - -ARTIFACTS="$FEEDSTOCK_ROOT/build_artifacts" - -if [ -z "$CONFIG" ]; then - set +x - FILES=`ls .ci_support/linux_*` - CONFIGS="" - for file in $FILES; do - CONFIGS="${CONFIGS}'${file:12:-5}' or "; - done - echo "Need to set CONFIG env variable. Value can be one of ${CONFIGS:0:-4}" - exit 1 -fi - -if [ -z "${DOCKER_IMAGE}" ]; then - SHYAML_INSTALLED="$(shyaml -h || echo NO)" - if [ "${SHYAML_INSTALLED}" == "NO" ]; then - echo "WARNING: DOCKER_IMAGE variable not set and shyaml not installed. Trying to parse with coreutils" - DOCKER_IMAGE=$(cat .ci_support/${CONFIG}.yaml | grep '^docker_image:$' -A 1 | tail -n 1 | cut -b 3-) - if [ "${DOCKER_IMAGE}" = "" ]; then - echo "No docker_image entry found in ${CONFIG}. Falling back to quay.io/condaforge/linux-anvil-comp7" - DOCKER_IMAGE="quay.io/condaforge/linux-anvil-comp7" - fi - else - DOCKER_IMAGE="$(cat "${FEEDSTOCK_ROOT}/.ci_support/${CONFIG}.yaml" | shyaml get-value docker_image.0 quay.io/condaforge/linux-anvil-comp7 )" - fi -fi - -mkdir -p "$ARTIFACTS" -DONE_CANARY="$ARTIFACTS/conda-forge-build-done-${CONFIG}" -rm -f "$DONE_CANARY" - -# Allow people to specify extra default arguments to `docker run` (e.g. `--rm`) -DOCKER_RUN_ARGS="${CONDA_FORGE_DOCKER_RUN_ARGS}" -if [ -z "${CI}" ]; then - DOCKER_RUN_ARGS="-it ${DOCKER_RUN_ARGS}" -fi - -( endgroup "Configure Docker" ) 2> /dev/null - -( startgroup "Start Docker" ) 2> /dev/null - -export UPLOAD_PACKAGES="${UPLOAD_PACKAGES:-True}" -export IS_PR_BUILD="${IS_PR_BUILD:-False}" -docker pull "${DOCKER_IMAGE}" -docker run ${DOCKER_RUN_ARGS} \ - -v "${RECIPE_ROOT}":/home/conda/recipe_root:rw,z,delegated \ - -v "${FEEDSTOCK_ROOT}":/home/conda/feedstock_root:rw,z,delegated \ - -e CONFIG \ - -e HOST_USER_ID \ - -e UPLOAD_PACKAGES \ - -e IS_PR_BUILD \ - -e GIT_BRANCH \ - -e UPLOAD_ON_BRANCH \ - -e CI \ - -e FEEDSTOCK_NAME \ - -e CPU_COUNT \ - -e BUILD_WITH_CONDA_DEBUG \ - -e BUILD_OUTPUT_ID \ - -e flow_run_id \ - -e remote_url \ - -e sha \ - -e BINSTAR_TOKEN \ - -e FEEDSTOCK_TOKEN \ - -e STAGING_BINSTAR_TOKEN \ - "${DOCKER_IMAGE}" \ - bash \ - "/home/conda/feedstock_root/${PROVIDER_DIR}/build_steps.sh" - -# verify that the end of the script was reached -test -f "$DONE_CANARY" - -# This closes the last group opened in `build_steps.sh` -( endgroup "Final checks" ) 2> /dev/null \ No newline at end of file diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh deleted file mode 100755 index 0e3c39422..000000000 --- a/.scripts/run_osx_build.sh +++ /dev/null @@ -1,120 +0,0 @@ -#!/usr/bin/env bash - -# -*- mode: jinja-shell -*- - -source .scripts/logging_utils.sh - -set -xe - -MINIFORGE_HOME="${MINIFORGE_HOME:-${HOME}/miniforge3}" -MINIFORGE_HOME="${MINIFORGE_HOME%/}" # remove trailing slash -export CONDA_BLD_PATH="${CONDA_BLD_PATH:-${MINIFORGE_HOME}/conda-bld}" - -( startgroup "Provisioning base env with micromamba" ) 2> /dev/null -MICROMAMBA_VERSION="1.5.10-0" -if [[ "$(uname -m)" == "arm64" ]]; then - osx_arch="osx-arm64" -else - osx_arch="osx-64" -fi -MICROMAMBA_URL="https://github.com/mamba-org/micromamba-releases/releases/download/${MICROMAMBA_VERSION}/micromamba-${osx_arch}" -MAMBA_ROOT_PREFIX="${MINIFORGE_HOME}-micromamba-$(date +%s)" -echo "Downloading micromamba ${MICROMAMBA_VERSION}" -micromamba_exe="$(mktemp -d)/micromamba" -curl -L -o "${micromamba_exe}" "${MICROMAMBA_URL}" -chmod +x "${micromamba_exe}" -echo "Creating environment" -"${micromamba_exe}" create --yes --root-prefix "${MAMBA_ROOT_PREFIX}" --prefix "${MINIFORGE_HOME}" \ - --channel conda-forge \ - pip python=3.12 conda-build conda-forge-ci-setup=4 "conda-build>=24.1" -echo "Moving pkgs cache from ${MAMBA_ROOT_PREFIX} to ${MINIFORGE_HOME}" -mv "${MAMBA_ROOT_PREFIX}/pkgs" "${MINIFORGE_HOME}" -echo "Cleaning up micromamba" -rm -rf "${MAMBA_ROOT_PREFIX}" "${micromamba_exe}" || true -( endgroup "Provisioning base env with micromamba" ) 2> /dev/null - -( startgroup "Configuring conda" ) 2> /dev/null -echo "Activating environment" -source "${MINIFORGE_HOME}/etc/profile.d/conda.sh" -conda activate base -export CONDA_SOLVER="libmamba" -export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1 - - - - - -echo -e "\n\nSetting up the condarc and mangling the compiler." -setup_conda_rc ./ ./recipe ./.ci_support/${CONFIG}.yaml - -if [[ "${CI:-}" != "" ]]; then - mangle_compiler ./ ./recipe .ci_support/${CONFIG}.yaml -fi - -if [[ "${CI:-}" != "" ]]; then - echo -e "\n\nMangling homebrew in the CI to avoid conflicts." - /usr/bin/sudo mangle_homebrew - /usr/bin/sudo -k -else - echo -e "\n\nNot mangling homebrew as we are not running in CI" -fi - -if [[ "${sha:-}" == "" ]]; then - sha=$(git rev-parse HEAD) -fi - -echo -e "\n\nRunning the build setup script." -source run_conda_forge_build_setup - - - -( endgroup "Configuring conda" ) 2> /dev/null - -echo -e "\n\nMaking the build clobber file" -make_build_number ./ ./recipe ./.ci_support/${CONFIG}.yaml - -if [[ -f LICENSE.txt ]]; then - cp LICENSE.txt "recipe/recipe-scripts-license.txt" -fi - -if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then - if [[ "x${BUILD_OUTPUT_ID:-}" != "x" ]]; then - EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --output-id ${BUILD_OUTPUT_ID}" - fi - conda debug ./recipe -m ./.ci_support/${CONFIG}.yaml \ - ${EXTRA_CB_OPTIONS:-} \ - --clobber-file ./.ci_support/clobber_${CONFIG}.yaml - - # Drop into an interactive shell - /bin/bash -else - - if [[ "${HOST_PLATFORM}" != "${BUILD_PLATFORM}" ]]; then - EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --no-test" - fi - - conda-build ./recipe -m ./.ci_support/${CONFIG}.yaml \ - --suppress-variables ${EXTRA_CB_OPTIONS:-} \ - --clobber-file ./.ci_support/clobber_${CONFIG}.yaml \ - --extra-meta flow_run_id="$flow_run_id" remote_url="$remote_url" sha="$sha" - - ( startgroup "Inspecting artifacts" ) 2> /dev/null - - # inspect_artifacts was only added in conda-forge-ci-setup 4.9.4 - command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts --recipe-dir ./recipe -m ./.ci_support/${CONFIG}.yaml || echo "inspect_artifacts needs conda-forge-ci-setup >=4.9.4" - - ( endgroup "Inspecting artifacts" ) 2> /dev/null - ( startgroup "Validating outputs" ) 2> /dev/null - - validate_recipe_outputs "${FEEDSTOCK_NAME}" - - ( endgroup "Validating outputs" ) 2> /dev/null - - ( startgroup "Uploading packages" ) 2> /dev/null - - if [[ "${UPLOAD_PACKAGES}" != "False" ]] && [[ "${IS_PR_BUILD}" == "False" ]]; then - upload_package --validate --feedstock-name="${FEEDSTOCK_NAME}" ./ ./recipe ./.ci_support/${CONFIG}.yaml - fi - - ( endgroup "Uploading packages" ) 2> /dev/null -fi \ No newline at end of file diff --git a/README.md b/README.md index 0047ae415..41347c19b 100644 --- a/README.md +++ b/README.md @@ -16,185 +16,6 @@ Current build status - - - - -
Azure -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
VariantStatus
linux_64_blas_implgenericc_compiler_version13channel_targetsconda-forge_maincuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13is_rcFalse - - variant - -
linux_64_blas_implgenericc_compiler_version13channel_targetsconda-forge_maincuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13is_rcFalse - - variant - -
linux_64_blas_implmklc_compiler_version13channel_targetsconda-forge_maincuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13is_rcFalse - - variant - -
linux_64_blas_implmklc_compiler_version13channel_targetsconda-forge_maincuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13is_rcFalse - - variant - -
linux_aarch64_c_compiler_version13channel_targetsconda-forge_maincuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13is_rcFalse - - variant - -
linux_aarch64_c_compiler_version13channel_targetsconda-forge_maincuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13is_rcFalse - - variant - -
osx_64_blas_implgenericchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.10.____cpython - - variant - -
osx_64_blas_implgenericchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.11.____cpython - - variant - -
osx_64_blas_implgenericchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.12.____cpython - - variant - -
osx_64_blas_implgenericchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.9.____cpython - - variant - -
osx_64_blas_implgenericchannel_targetsconda-forge_mainis_rcFalsenumpy2python3.13.____cp313 - - variant - -
osx_64_blas_implmklchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.10.____cpython - - variant - -
osx_64_blas_implmklchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.11.____cpython - - variant - -
osx_64_blas_implmklchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.12.____cpython - - variant - -
osx_64_blas_implmklchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.9.____cpython - - variant - -
osx_64_blas_implmklchannel_targetsconda-forge_mainis_rcFalsenumpy2python3.13.____cp313 - - variant - -
osx_arm64_channel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.10.____cpython - - variant - -
osx_arm64_channel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.11.____cpython - - variant - -
osx_arm64_channel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.12.____cpython - - variant - -
osx_arm64_channel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.9.____cpython - - variant - -
osx_arm64_channel_targetsconda-forge_mainis_rcFalsenumpy2python3.13.____cp313 - - variant - -
win_64_channel_targetsconda-forge_maincuda_compilerNonecuda_compiler_versionNoneis_rcFalse - - variant - -
win_64_channel_targetsconda-forge_maincuda_compilercuda-nvcccuda_compiler_version12.6is_rcFalse - - variant - -
-
-
Current release info @@ -205,7 +26,6 @@ Current release info | [![Conda Recipe](https://img.shields.io/badge/recipe-libtorch-green.svg)](https://anaconda.org/conda-forge/libtorch) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/libtorch.svg)](https://anaconda.org/conda-forge/libtorch) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/libtorch.svg)](https://anaconda.org/conda-forge/libtorch) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/libtorch.svg)](https://anaconda.org/conda-forge/libtorch) | | [![Conda Recipe](https://img.shields.io/badge/recipe-pytorch-green.svg)](https://anaconda.org/conda-forge/pytorch) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/pytorch.svg)](https://anaconda.org/conda-forge/pytorch) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/pytorch.svg)](https://anaconda.org/conda-forge/pytorch) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/pytorch.svg)](https://anaconda.org/conda-forge/pytorch) | | [![Conda Recipe](https://img.shields.io/badge/recipe-pytorch--cpu-green.svg)](https://anaconda.org/conda-forge/pytorch-cpu) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/pytorch-cpu.svg)](https://anaconda.org/conda-forge/pytorch-cpu) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/pytorch-cpu.svg)](https://anaconda.org/conda-forge/pytorch-cpu) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/pytorch-cpu.svg)](https://anaconda.org/conda-forge/pytorch-cpu) | -| [![Conda Recipe](https://img.shields.io/badge/recipe-pytorch--gpu-green.svg)](https://anaconda.org/conda-forge/pytorch-gpu) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/pytorch-gpu.svg)](https://anaconda.org/conda-forge/pytorch-gpu) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/pytorch-gpu.svg)](https://anaconda.org/conda-forge/pytorch-gpu) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/pytorch-gpu.svg)](https://anaconda.org/conda-forge/pytorch-gpu) | Installing pytorch-cpu ====================== @@ -217,16 +37,16 @@ conda config --add channels conda-forge conda config --set channel_priority strict ``` -Once the `conda-forge` channel has been enabled, `libtorch, pytorch, pytorch-cpu, pytorch-gpu` can be installed with `conda`: +Once the `conda-forge` channel has been enabled, `libtorch, pytorch, pytorch-cpu` can be installed with `conda`: ``` -conda install libtorch pytorch pytorch-cpu pytorch-gpu +conda install libtorch pytorch pytorch-cpu ``` or with `mamba`: ``` -mamba install libtorch pytorch pytorch-cpu pytorch-gpu +mamba install libtorch pytorch pytorch-cpu ``` It is possible to list all of the versions of `libtorch` available on your platform with `conda`: diff --git a/azure-pipelines.yml b/azure-pipelines.yml deleted file mode 100644 index a13f0ae28..000000000 --- a/azure-pipelines.yml +++ /dev/null @@ -1,31 +0,0 @@ -# This file was generated automatically from conda-smithy. To update this configuration, -# update the conda-forge.yml and/or the recipe/meta.yaml. -# -*- mode: yaml -*- - -stages: -- stage: Check - jobs: - - job: Skip - pool: - vmImage: 'ubuntu-22.04' - variables: - DECODE_PERCENTS: 'false' - RET: 'true' - steps: - - checkout: self - fetchDepth: '2' - - bash: | - git_log=`git log --max-count=1 --skip=1 --pretty=format:"%B" | tr "\n" " "` - echo "##vso[task.setvariable variable=log]$git_log" - displayName: Obtain commit message - - bash: echo "##vso[task.setvariable variable=RET]false" - condition: and(eq(variables['Build.Reason'], 'PullRequest'), or(contains(variables.log, '[skip azp]'), contains(variables.log, '[azp skip]'), contains(variables.log, '[skip ci]'), contains(variables.log, '[ci skip]'))) - displayName: Skip build? - - bash: echo "##vso[task.setvariable variable=start_main;isOutput=true]$RET" - name: result - displayName: Export result -- stage: Build - condition: and(succeeded(), eq(dependencies.Check.outputs['Skip.result.start_main'], 'true')) - dependsOn: Check - jobs: - - template: ./.azure-pipelines/azure-pipelines-osx.yml \ No newline at end of file From f8375c32fd579f710847ab986fdb45c4f7612196 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Mon, 20 Jan 2025 18:00:41 +0100 Subject: [PATCH 11/43] Move torch_python as well --- recipe/bld.bat | 15 +++++++-------- recipe/meta.yaml | 2 ++ 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/recipe/bld.bat b/recipe/bld.bat index a38ca90da..8ffeed4ca 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -221,14 +221,13 @@ if "%PKG_NAME%" == "libtorch" ( if %ERRORLEVEL% neq 0 exit 1 ) - @REM Delete all files from the lib directory that do not start with torch_python - for %%f in (%SP_DIR%\torch\lib\*) do ( - set "FILENAME=%%~nf" - if "!FILENAME:~0,12!" neq "torch_python" ( - del %%f - if %ERRORLEVEL% neq 0 exit 1 - ) - ) + @REM Move libtorch_python and remove the lib directory afterwards. + robocopy /NP /NFL /NDL /NJH /E torch\lib\torch_python.dll %LIBRARY_BIN%\ + if %ERRORLEVEL% neq 1 exit 1 + robocopy /NP /NFL /NDL /NJH /E torch\lib\torch_python.lib %LIBRARY_LIB%\ + if %ERRORLEVEL% neq 1 exit 1 + rmdir /s /q %SP_DIR%\torch\lib + if %ERRORLEVEL% neq 1 exit 1 ) @REM Show the sccache stats. diff --git a/recipe/meta.yaml b/recipe/meta.yaml index f13ade6cd..8d910bcbf 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -381,6 +381,8 @@ outputs: # python-version-specific library (default location in SP_DIR symlinks back to this) - test -f $PREFIX/lib/libtorch_python${SHLIB_EXT} # [unix] + - if not exist %LIBRARY_BIN%\torch_python.dll exit 1 # [win] + - if not exist %LIBRARY_LIB%\torch_python.lib exit 1 # [win] # a reasonably safe subset of tests that should run under 15 minutes # disable hypothesis because it randomly yields health check errors From 776ef156880390e42ca8b19d041e69740e65f4bc Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Mon, 20 Jan 2025 14:46:08 -0500 Subject: [PATCH 12/43] trigger --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 8d910bcbf..91db9a08a 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -15,7 +15,7 @@ # https://github.com/pytorch/pytorch/blob/main/RELEASE.md#triton-dependency-for-the-release {% set triton = "3.1.0" %} -# TODO Temporary pin, remove +# TODO Temporary pin, remove me {% set mkl = "<2025" %} package: From 1eb3609baed45f2a94e1989e001f5b183310a3c0 Mon Sep 17 00:00:00 2001 From: h-vetinari Date: Tue, 21 Jan 2025 13:10:20 +1100 Subject: [PATCH 13/43] fix robocopy syntax --- recipe/bld.bat | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipe/bld.bat b/recipe/bld.bat index 8ffeed4ca..170667aa9 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -185,11 +185,11 @@ if "%PKG_NAME%" == "libtorch" ( if %ERRORLEVEL% neq 0 exit 1 @REM Move the binaries into the packages site-package directory - robocopy /NP /NFL /NDL /NJH /E torch\bin\*.* %LIBRARY_BIN%\ + robocopy /NP /NFL /NDL /NJH /E torch\bin\ %LIBRARY_BIN%\ if %ERRORLEVEL% neq 1 exit 1 - robocopy /NP /NFL /NDL /NJH /E torch\lib\*.dll %LIBRARY_BIN%\ + robocopy /NP /NFL /NDL /NJH /E torch\lib\ %LIBRARY_BIN%\ *.dll if %ERRORLEVEL% neq 1 exit 1 - robocopy /NP /NFL /NDL /NJH /E torch\lib\*.lib %LIBRARY_LIB%\ + robocopy /NP /NFL /NDL /NJH /E torch\lib\ %LIBRARY_LIB%\ *.lib if %ERRORLEVEL% neq 1 exit 1 robocopy /NP /NFL /NDL /NJH /E torch\share %LIBRARY_PREFIX%\ if %ERRORLEVEL% neq 1 exit 1 From afa02aaac6e2fab7dc4a4dd6e5417d35c216dc9b Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Tue, 21 Jan 2025 16:56:21 +1100 Subject: [PATCH 14/43] syntax fixes --- recipe/bld.bat | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/recipe/bld.bat b/recipe/bld.bat index 170667aa9..a452d13b1 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -175,13 +175,14 @@ if "%PKG_NAME%" == "libtorch" ( if not exist "%SRC_DIR%/dist" mkdir %SRC_DIR%/dist pushd %SRC_DIR%/dist if %ERRORLEVEL% neq 0 exit 1 - for %%f in (../torch-*.whl) do ( + for /f %%f in ('dir /b /S ..\torch-*.whl') do ( wheel unpack %%f if %ERRORLEVEL% neq 0 exit 1 ) - @REM Navigate into the unpacked wheel - pushd torch-* + @REM Navigate into the unpacked wheel; naming pattern of the folder is documented: + @REM https://github.com/pypa/wheel/blob/0.45.1/src/wheel/cli/unpack.py#L11-L12 + pushd torch-%PKG_VERSION% if %ERRORLEVEL% neq 0 exit 1 @REM Move the binaries into the packages site-package directory From f21264de9f3b37a1e7440b64dec1e9f65576e04c Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Tue, 21 Jan 2025 16:56:40 +1100 Subject: [PATCH 15/43] remove superfluous errorlevel checks and remove unused label --- recipe/bld.bat | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/recipe/bld.bat b/recipe/bld.bat index a452d13b1..d2f179893 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -174,7 +174,6 @@ if "%PKG_NAME%" == "libtorch" ( @REM Extract the compiled wheel into a temporary directory if not exist "%SRC_DIR%/dist" mkdir %SRC_DIR%/dist pushd %SRC_DIR%/dist - if %ERRORLEVEL% neq 0 exit 1 for /f %%f in ('dir /b /S ..\torch-*.whl') do ( wheel unpack %%f if %ERRORLEVEL% neq 0 exit 1 @@ -205,21 +204,16 @@ if "%PKG_NAME%" == "libtorch" ( if %ERRORLEVEL% neq 0 exit 1 popd - if %ERRORLEVEL% neq 0 exit 1 popd - if %ERRORLEVEL% neq 0 exit 1 @REM Keep the original backed up to sed later copy build\CMakeCache.txt build\CMakeCache.txt.orig if %ERRORLEVEL% neq 0 exit 1 ) else if "%PKG_NAME%" == "pytorch" ( rmdir /s /q %SP_DIR%\torch\bin - if %ERRORLEVEL% neq 0 exit 1 rmdir /s /q %SP_DIR%\torch\share - if %ERRORLEVEL% neq 0 exit 1 for %%f in (ATen caffe2 torch c10) do ( rmdir /s /q %SP_DIR%\torch\include\%%f - if %ERRORLEVEL% neq 0 exit 1 ) @REM Move libtorch_python and remove the lib directory afterwards. @@ -228,14 +222,7 @@ if "%PKG_NAME%" == "libtorch" ( robocopy /NP /NFL /NDL /NJH /E torch\lib\torch_python.lib %LIBRARY_LIB%\ if %ERRORLEVEL% neq 1 exit 1 rmdir /s /q %SP_DIR%\torch\lib - if %ERRORLEVEL% neq 1 exit 1 ) @REM Show the sccache stats. sccache --show-stats - -goto :EOF - -:error -echo Failed with error %errorlevel% -exit /b %errorlevel% From 3fb0821435cbfb24fc7ac2ba580768d56fdadf2d Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Tue, 21 Jan 2025 20:04:13 +1100 Subject: [PATCH 16/43] use backslashes for windows paths --- recipe/bld.bat | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/bld.bat b/recipe/bld.bat index d2f179893..0f3e3442f 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -172,8 +172,8 @@ if %ERRORLEVEL% neq 0 exit 1 if "%PKG_NAME%" == "libtorch" ( @REM Extract the compiled wheel into a temporary directory - if not exist "%SRC_DIR%/dist" mkdir %SRC_DIR%/dist - pushd %SRC_DIR%/dist + if not exist "%SRC_DIR%\dist" mkdir %SRC_DIR%\dist + pushd %SRC_DIR%\dist for /f %%f in ('dir /b /S ..\torch-*.whl') do ( wheel unpack %%f if %ERRORLEVEL% neq 0 exit 1 From 0cbb90f403e101ffac7a7bc018c8f2a2fb0ff783 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Tue, 21 Jan 2025 20:04:56 +1100 Subject: [PATCH 17/43] don't bother with errorlevel checking for robocopy a successful copy operation may either turn 1, 3, 5 or 7, see https://learn.microsoft.com/en-us/windows-server/administration/windows-commands/robocopy#exit-return-codes and given how atrocious boolean comparisions are in batch (no && or ||, much less set inclusions), just avoid it; c.f. also https://superuser.com/a/280434 --- recipe/bld.bat | 7 ------- 1 file changed, 7 deletions(-) diff --git a/recipe/bld.bat b/recipe/bld.bat index 0f3e3442f..90c0d4b9c 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -186,16 +186,11 @@ if "%PKG_NAME%" == "libtorch" ( @REM Move the binaries into the packages site-package directory robocopy /NP /NFL /NDL /NJH /E torch\bin\ %LIBRARY_BIN%\ - if %ERRORLEVEL% neq 1 exit 1 robocopy /NP /NFL /NDL /NJH /E torch\lib\ %LIBRARY_BIN%\ *.dll - if %ERRORLEVEL% neq 1 exit 1 robocopy /NP /NFL /NDL /NJH /E torch\lib\ %LIBRARY_LIB%\ *.lib - if %ERRORLEVEL% neq 1 exit 1 robocopy /NP /NFL /NDL /NJH /E torch\share %LIBRARY_PREFIX%\ - if %ERRORLEVEL% neq 1 exit 1 for %%f in (ATen caffe2 torch c10) do ( robocopy /NP /NFL /NDL /NJH /E torch\include\%%f %LIBRARY_INC%\%%f\ - if %ERRORLEVEL% neq 1 exit 1 ) @REM Remove the python binary file, that is placed in the site-packages @@ -218,9 +213,7 @@ if "%PKG_NAME%" == "libtorch" ( @REM Move libtorch_python and remove the lib directory afterwards. robocopy /NP /NFL /NDL /NJH /E torch\lib\torch_python.dll %LIBRARY_BIN%\ - if %ERRORLEVEL% neq 1 exit 1 robocopy /NP /NFL /NDL /NJH /E torch\lib\torch_python.lib %LIBRARY_LIB%\ - if %ERRORLEVEL% neq 1 exit 1 rmdir /s /q %SP_DIR%\torch\lib ) From 9b3c70fdb46dc04c76a24e4eec02f60acf1bd045 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Tue, 21 Jan 2025 12:56:02 +0000 Subject: [PATCH 18/43] Apply suggestions from code review Co-authored-by: h-vetinari --- recipe/bld.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/bld.bat b/recipe/bld.bat index 90c0d4b9c..c609d6c12 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -188,7 +188,7 @@ if "%PKG_NAME%" == "libtorch" ( robocopy /NP /NFL /NDL /NJH /E torch\bin\ %LIBRARY_BIN%\ robocopy /NP /NFL /NDL /NJH /E torch\lib\ %LIBRARY_BIN%\ *.dll robocopy /NP /NFL /NDL /NJH /E torch\lib\ %LIBRARY_LIB%\ *.lib - robocopy /NP /NFL /NDL /NJH /E torch\share %LIBRARY_PREFIX%\ + robocopy /NP /NFL /NDL /NJH /E torch\share\ %LIBRARY_PREFIX%\share for %%f in (ATen caffe2 torch c10) do ( robocopy /NP /NFL /NDL /NJH /E torch\include\%%f %LIBRARY_INC%\%%f\ ) From 0674c1799c2414e322a48ab1853cb665bb63408c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Tue, 21 Jan 2025 13:59:59 +0100 Subject: [PATCH 19/43] Add a test for TorchConfig.cmake being installed --- recipe/meta.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 91db9a08a..25bdc8293 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -224,6 +224,10 @@ test: - test -f $PREFIX/lib/lib{{ each_lib }}.so # [linux and cuda_compiler_version != "None"] {% endfor %} + # CMake files in share + - test -f $PREFIX/share/cmake/Torch/TorchConfig.cmake # [linux] + - if not exist %LIBRARY_PREFIX%\share\cmake\Torch\TorchConfig.cmake exit 1 # [win] + outputs: - name: libtorch - name: pytorch From 855f15caf99f98aca864f478ab71bdc34da867fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Tue, 21 Jan 2025 14:35:36 +0100 Subject: [PATCH 20/43] Copy torch_python.lib back to site-packages --- recipe/bld.bat | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/recipe/bld.bat b/recipe/bld.bat index c609d6c12..ea59cc487 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -215,6 +215,10 @@ if "%PKG_NAME%" == "libtorch" ( robocopy /NP /NFL /NDL /NJH /E torch\lib\torch_python.dll %LIBRARY_BIN%\ robocopy /NP /NFL /NDL /NJH /E torch\lib\torch_python.lib %LIBRARY_LIB%\ rmdir /s /q %SP_DIR%\torch\lib + + @REM Copy libtorch_python.lib back -- that's much easier than the for loop + @REM needed to remove everything else. + robocopy /NP /NFL /NDL /NJH /E %LIBRARY_LIB%\torch_python.lib torch\lib\ ) @REM Show the sccache stats. From c142c1e898cbf582b115d030819444ee7275ea54 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Wed, 22 Jan 2025 00:52:20 +1100 Subject: [PATCH 21/43] align indentation --- recipe/meta.yaml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 25bdc8293..7e6a9a27d 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -196,32 +196,32 @@ test: commands: # libraries {% for each_lib in [ 'c10', 'shm', 'torch', 'torch_cpu', 'torch_global_deps'] %} - - test -f $PREFIX/lib/lib{{ each_lib }}.so # [linux] - - test -f $PREFIX/lib/lib{{ each_lib }}.dylib # [osx] - - if not exist %LIBRARY_BIN%\{{ each_lib }}.dll exit 1 # [win] + - test -f $PREFIX/lib/lib{{ each_lib }}.so # [linux] + - test -f $PREFIX/lib/lib{{ each_lib }}.dylib # [osx] + - if not exist %LIBRARY_BIN%\{{ each_lib }}.dll exit 1 # [win] {% endfor %} # Windows specific .LIB files {% for each_lib in [ 'c10', 'shm', 'torch', 'torch_cpu'] %} - - if not exist %LIBRARY_LIB%\{{ each_lib }}.lib exit 1 # [win] + - if not exist %LIBRARY_LIB%\{{ each_lib }}.lib exit 1 # [win] {% endfor %} # Windows specific libraries {% for each_lib in [ 'asmjit', 'fbgemm'] %} - - if not exist %LIBRARY_BIN%\{{ each_lib }}.dll exit 1 # [win] - - if not exist %LIBRARY_LIB%\{{ each_lib }}.lib exit 1 # [win] + - if not exist %LIBRARY_BIN%\{{ each_lib }}.dll exit 1 # [win] + - if not exist %LIBRARY_LIB%\{{ each_lib }}.lib exit 1 # [win] {% endfor %} # Cuda only libraries {% for each_lib in ['c10_cuda', 'caffe2_nvrtc', 'torch_cuda'] %} - - test -f $PREFIX/lib/lib{{ each_lib }}.so # [linux and cuda_compiler_version != "None"] - - if not exist %LIBRARY_BIN%\{{ each_lib }}.dll exit 1 # [win and cuda_compiler_version != "None"] - - if not exist %LIBRARY_LIB%\{{ each_lib }}.lib exit 1 # [win and cuda_compiler_version != "None"] + - test -f $PREFIX/lib/lib{{ each_lib }}.so # [linux and cuda_compiler_version != "None"] + - if not exist %LIBRARY_BIN%\{{ each_lib }}.dll exit 1 # [win and cuda_compiler_version != "None"] + - if not exist %LIBRARY_LIB%\{{ each_lib }}.lib exit 1 # [win and cuda_compiler_version != "None"] {% endfor %} # Linux specific cuda libraries {% for each_lib in [ 'torch_cuda_linalg'] %} - - test -f $PREFIX/lib/lib{{ each_lib }}.so # [linux and cuda_compiler_version != "None"] + - test -f $PREFIX/lib/lib{{ each_lib }}.so # [linux and cuda_compiler_version != "None"] {% endfor %} # CMake files in share From 58874135273911a90697ac8b8b5b42006fc43a04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Tue, 21 Jan 2025 20:41:20 +0100 Subject: [PATCH 22/43] Fix copying libtorch_python.* --- recipe/bld.bat | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/bld.bat b/recipe/bld.bat index ea59cc487..4e84fd1b3 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -212,8 +212,8 @@ if "%PKG_NAME%" == "libtorch" ( ) @REM Move libtorch_python and remove the lib directory afterwards. - robocopy /NP /NFL /NDL /NJH /E torch\lib\torch_python.dll %LIBRARY_BIN%\ - robocopy /NP /NFL /NDL /NJH /E torch\lib\torch_python.lib %LIBRARY_LIB%\ + robocopy /NP /NFL /NDL /NJH /E %SP_DIR%\torch\lib\torch_python.dll %LIBRARY_BIN%\ + robocopy /NP /NFL /NDL /NJH /E %SP_DIR%\torch\lib\torch_python.lib %LIBRARY_LIB%\ rmdir /s /q %SP_DIR%\torch\lib @REM Copy libtorch_python.lib back -- that's much easier than the for loop From cb1bef2e89fc24f8ee690a69404f1ca3a15c6b3f Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Wed, 22 Jan 2025 08:06:32 +1100 Subject: [PATCH 23/43] remove skips --- recipe/meta.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 7e6a9a27d..86796c9e1 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -67,8 +67,6 @@ source: build: number: {{ build }} # cuda 11.8 was dropped due to maintenance effort, see discussion in #177 - skip: true # [not win] - skip: true # [cuda_compiler_version != "None"] skip: true # [cuda_compiler_version == "11.8"] # This logic allows two rc variants to be defined in the conda_build_config, but only one to actually be built. # We want to be able to define two variants in the cbc so we can assign different labels to each in the upload channel From 1ce4bd8391a0e7764bdbc63f9f0d7cee32628e7f Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Wed, 22 Jan 2025 13:27:18 +1100 Subject: [PATCH 24/43] copy first, delete later --- recipe/bld.bat | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/recipe/bld.bat b/recipe/bld.bat index 4e84fd1b3..e89264295 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -205,17 +205,16 @@ if "%PKG_NAME%" == "libtorch" ( copy build\CMakeCache.txt build\CMakeCache.txt.orig if %ERRORLEVEL% neq 0 exit 1 ) else if "%PKG_NAME%" == "pytorch" ( + @REM Move libtorch_python and remove the other directories afterwards. + robocopy /NP /NFL /NDL /NJH /E %SP_DIR%\torch\lib\torch_python.dll %LIBRARY_BIN%\ + robocopy /NP /NFL /NDL /NJH /E %SP_DIR%\torch\lib\torch_python.lib %LIBRARY_LIB%\ + rmdir /s /q %SP_DIR%\torch\lib rmdir /s /q %SP_DIR%\torch\bin rmdir /s /q %SP_DIR%\torch\share for %%f in (ATen caffe2 torch c10) do ( rmdir /s /q %SP_DIR%\torch\include\%%f ) - @REM Move libtorch_python and remove the lib directory afterwards. - robocopy /NP /NFL /NDL /NJH /E %SP_DIR%\torch\lib\torch_python.dll %LIBRARY_BIN%\ - robocopy /NP /NFL /NDL /NJH /E %SP_DIR%\torch\lib\torch_python.lib %LIBRARY_LIB%\ - rmdir /s /q %SP_DIR%\torch\lib - @REM Copy libtorch_python.lib back -- that's much easier than the for loop @REM needed to remove everything else. robocopy /NP /NFL /NDL /NJH /E %LIBRARY_LIB%\torch_python.lib torch\lib\ From 7b18054b8a810799045f7bb3215152363f50ff9d Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Wed, 22 Jan 2025 17:21:57 +1100 Subject: [PATCH 25/43] more robocopy syntax fixes --- recipe/bld.bat | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipe/bld.bat b/recipe/bld.bat index e89264295..90714b91d 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -206,8 +206,8 @@ if "%PKG_NAME%" == "libtorch" ( if %ERRORLEVEL% neq 0 exit 1 ) else if "%PKG_NAME%" == "pytorch" ( @REM Move libtorch_python and remove the other directories afterwards. - robocopy /NP /NFL /NDL /NJH /E %SP_DIR%\torch\lib\torch_python.dll %LIBRARY_BIN%\ - robocopy /NP /NFL /NDL /NJH /E %SP_DIR%\torch\lib\torch_python.lib %LIBRARY_LIB%\ + robocopy /NP /NFL /NDL /NJH /E %SP_DIR%\torch\lib\ %LIBRARY_BIN%\ torch_python.dll + robocopy /NP /NFL /NDL /NJH /E %SP_DIR%\torch\lib\ %LIBRARY_LIB%\ torch_python.lib rmdir /s /q %SP_DIR%\torch\lib rmdir /s /q %SP_DIR%\torch\bin rmdir /s /q %SP_DIR%\torch\share @@ -217,7 +217,7 @@ if "%PKG_NAME%" == "libtorch" ( @REM Copy libtorch_python.lib back -- that's much easier than the for loop @REM needed to remove everything else. - robocopy /NP /NFL /NDL /NJH /E %LIBRARY_LIB%\torch_python.lib torch\lib\ + robocopy /NP /NFL /NDL /NJH /E %LIBRARY_LIB%\ torch\lib\ torch_python.lib ) @REM Show the sccache stats. From a8d4380c426475c54b47ffe20742fa256c530212 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Wed, 22 Jan 2025 17:35:51 +1100 Subject: [PATCH 26/43] move _C.lib back to site-packages --- recipe/bld.bat | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/recipe/bld.bat b/recipe/bld.bat index 90714b91d..535111708 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -195,7 +195,7 @@ if "%PKG_NAME%" == "libtorch" ( @REM Remove the python binary file, that is placed in the site-packages @REM directory by the specific python specific pytorch package. - del %LIBRARY_BIN%\torch_python.* %LIBRARY_LIB%\torch_python.* + del %LIBRARY_BIN%\torch_python.* %LIBRARY_LIB%\torch_python.* %LIBRARY_LIB%\_C.lib if %ERRORLEVEL% neq 0 exit 1 popd @@ -208,6 +208,7 @@ if "%PKG_NAME%" == "libtorch" ( @REM Move libtorch_python and remove the other directories afterwards. robocopy /NP /NFL /NDL /NJH /E %SP_DIR%\torch\lib\ %LIBRARY_BIN%\ torch_python.dll robocopy /NP /NFL /NDL /NJH /E %SP_DIR%\torch\lib\ %LIBRARY_LIB%\ torch_python.lib + robocopy /NP /NFL /NDL /NJH /E %SP_DIR%\torch\lib\ %LIBRARY_LIB%\ _C.lib rmdir /s /q %SP_DIR%\torch\lib rmdir /s /q %SP_DIR%\torch\bin rmdir /s /q %SP_DIR%\torch\share @@ -218,6 +219,7 @@ if "%PKG_NAME%" == "libtorch" ( @REM Copy libtorch_python.lib back -- that's much easier than the for loop @REM needed to remove everything else. robocopy /NP /NFL /NDL /NJH /E %LIBRARY_LIB%\ torch\lib\ torch_python.lib + robocopy /NP /NFL /NDL /NJH /E %LIBRARY_LIB%\ torch\lib\ _C.lib ) @REM Show the sccache stats. From a2393928200b2bb54be3c83188cc1389cb738c11 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Wed, 22 Jan 2025 18:08:07 +1100 Subject: [PATCH 27/43] do not package `fmt.lib` in `libtorch` --- recipe/bld.bat | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/recipe/bld.bat b/recipe/bld.bat index 535111708..9913ea3e0 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -184,6 +184,10 @@ if "%PKG_NAME%" == "libtorch" ( pushd torch-%PKG_VERSION% if %ERRORLEVEL% neq 0 exit 1 + @REM Do not package `fmt.lib`; delete before because it may exist in host before installation already + del %LIBRARY_LIB%\fmt.lib + if %ERRORLEVEL% neq 0 exit 1 + @REM Move the binaries into the packages site-package directory robocopy /NP /NFL /NDL /NJH /E torch\bin\ %LIBRARY_BIN%\ robocopy /NP /NFL /NDL /NJH /E torch\lib\ %LIBRARY_BIN%\ *.dll From fc5693c26e749f09f5cf314c4d77b32ce2290248 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Wed, 22 Jan 2025 20:21:21 +1100 Subject: [PATCH 28/43] pin python in build environment to same version as in host --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 86796c9e1..e27c8de0b 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -242,7 +242,7 @@ outputs: - libmagma_sparse requirements: build: - - python # [build_platform != target_platform] + - python {{ python }} # [build_platform != target_platform] - cross-python_{{ target_platform }} # [build_platform != target_platform] - numpy # [build_platform != target_platform] - {{ stdlib('c') }} @@ -285,7 +285,7 @@ outputs: - libcusparse-dev {% endif %} # other requirements - - python + - python {{ python }} - numpy - pip # see https://github.com/pytorch/pytorch/issues/136541 From 3ebf1a9684a23d971b582d88d851948c134e6d50 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Wed, 22 Jan 2025 22:26:26 +1100 Subject: [PATCH 29/43] DEBUG: build only one python version --- recipe/meta.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index e27c8de0b..496d9053d 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -232,6 +232,8 @@ outputs: script: build.sh # [unix] script: bld.bat # [win] build: + # debug + skip: true # [py!=312] string: cuda{{ cuda_compiler_version | replace('.', '') }}_{{ blas_impl }}_py{{ CONDA_PY }}_h{{ PKG_HASH }}_{{ PKG_BUILDNUM }} # [cuda_compiler_version != "None"] string: cpu_{{ blas_impl }}_py{{ CONDA_PY }}_h{{ PKG_HASH }}_{{ PKG_BUILDNUM }} # [cuda_compiler_version == "None"] detect_binary_files_with_prefix: false From 7a1e86bed1d05731be05f7fd296c3403b804db72 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Wed, 22 Jan 2025 23:04:09 +1100 Subject: [PATCH 30/43] also delete fmt metadata --- recipe/bld.bat | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/recipe/bld.bat b/recipe/bld.bat index 9913ea3e0..70ba39e47 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -184,9 +184,12 @@ if "%PKG_NAME%" == "libtorch" ( pushd torch-%PKG_VERSION% if %ERRORLEVEL% neq 0 exit 1 - @REM Do not package `fmt.lib`; delete before because it may exist in host before installation already - del %LIBRARY_LIB%\fmt.lib + @REM Do not package `fmt.lib` (and its metadata); delete it before the move into + @REM %LIBRARY_BIN% because it may exist in host before installation already + del torch\lib\fmt.lib torch\lib\pkgconfig\fmt.pc if %ERRORLEVEL% neq 0 exit 1 + @REM also delete rest of fmt metadata + rmdir /s /q torch\lib\cmake\fmt @REM Move the binaries into the packages site-package directory robocopy /NP /NFL /NDL /NJH /E torch\bin\ %LIBRARY_BIN%\ From 67a8fc5f070fc88fe1fdefc69e77639a4d427c7b Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Wed, 22 Jan 2025 23:04:38 +1100 Subject: [PATCH 31/43] only move torch* libraries into `%LIBRARY_{BIN,LIB}%` --- recipe/bld.bat | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipe/bld.bat b/recipe/bld.bat index 70ba39e47..f83b5e16b 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -192,9 +192,9 @@ if "%PKG_NAME%" == "libtorch" ( rmdir /s /q torch\lib\cmake\fmt @REM Move the binaries into the packages site-package directory - robocopy /NP /NFL /NDL /NJH /E torch\bin\ %LIBRARY_BIN%\ - robocopy /NP /NFL /NDL /NJH /E torch\lib\ %LIBRARY_BIN%\ *.dll - robocopy /NP /NFL /NDL /NJH /E torch\lib\ %LIBRARY_LIB%\ *.lib + @REM the only content of torch\bin, {asmjit,fbgemm}.dll, also exists in torch\lib + robocopy /NP /NFL /NDL /NJH /E torch\lib\ %LIBRARY_BIN%\ torch*.dll + robocopy /NP /NFL /NDL /NJH /E torch\lib\ %LIBRARY_LIB%\ torch*.lib robocopy /NP /NFL /NDL /NJH /E torch\share\ %LIBRARY_PREFIX%\share for %%f in (ATen caffe2 torch c10) do ( robocopy /NP /NFL /NDL /NJH /E torch\include\%%f %LIBRARY_INC%\%%f\ From eb8dc6fe4cb8da46b438ad8cb28ca5038a1f748b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Wed, 22 Jan 2025 19:28:44 +0100 Subject: [PATCH 32/43] Update tests to match new list of installed libs --- recipe/meta.yaml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 496d9053d..cb9742592 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -196,23 +196,21 @@ test: {% for each_lib in [ 'c10', 'shm', 'torch', 'torch_cpu', 'torch_global_deps'] %} - test -f $PREFIX/lib/lib{{ each_lib }}.so # [linux] - test -f $PREFIX/lib/lib{{ each_lib }}.dylib # [osx] + {% endfor %} + {% for each_lib in [ 'torch', 'torch_cpu', 'torch_global_deps'] %} - if not exist %LIBRARY_BIN%\{{ each_lib }}.dll exit 1 # [win] {% endfor %} # Windows specific .LIB files - {% for each_lib in [ 'c10', 'shm', 'torch', 'torch_cpu'] %} - - if not exist %LIBRARY_LIB%\{{ each_lib }}.lib exit 1 # [win] - {% endfor %} - - # Windows specific libraries - {% for each_lib in [ 'asmjit', 'fbgemm'] %} - - if not exist %LIBRARY_BIN%\{{ each_lib }}.dll exit 1 # [win] + {% for each_lib in [ 'torch', 'torch_cpu'] %} - if not exist %LIBRARY_LIB%\{{ each_lib }}.lib exit 1 # [win] {% endfor %} # Cuda only libraries {% for each_lib in ['c10_cuda', 'caffe2_nvrtc', 'torch_cuda'] %} - test -f $PREFIX/lib/lib{{ each_lib }}.so # [linux and cuda_compiler_version != "None"] + {% endfor %} + {% for each_lib in ['torch_cuda'] %} - if not exist %LIBRARY_BIN%\{{ each_lib }}.dll exit 1 # [win and cuda_compiler_version != "None"] - if not exist %LIBRARY_LIB%\{{ each_lib }}.lib exit 1 # [win and cuda_compiler_version != "None"] {% endfor %} From 851aae4b92ce92ad70976b7b59df818c210cd89d Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Thu, 23 Jan 2025 05:56:30 +1100 Subject: [PATCH 33/43] move c10/smh to %LIBRARY_PREFIX% as on unix; also asmjit/fbgemm; consolidate lib testing --- recipe/bld.bat | 4 ++-- recipe/meta.yaml | 36 ++++++++++++++---------------------- 2 files changed, 16 insertions(+), 24 deletions(-) diff --git a/recipe/bld.bat b/recipe/bld.bat index f83b5e16b..05e840a09 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -193,8 +193,8 @@ if "%PKG_NAME%" == "libtorch" ( @REM Move the binaries into the packages site-package directory @REM the only content of torch\bin, {asmjit,fbgemm}.dll, also exists in torch\lib - robocopy /NP /NFL /NDL /NJH /E torch\lib\ %LIBRARY_BIN%\ torch*.dll - robocopy /NP /NFL /NDL /NJH /E torch\lib\ %LIBRARY_LIB%\ torch*.lib + robocopy /NP /NFL /NDL /NJH /E torch\lib\ %LIBRARY_BIN%\ torch*.dll c10.dll shm.dll asmjit.dll fbgemm.dll + robocopy /NP /NFL /NDL /NJH /E torch\lib\ %LIBRARY_LIB%\ torch*.lib c10.lib shm.lib asmjit.lib fbgemm.lib robocopy /NP /NFL /NDL /NJH /E torch\share\ %LIBRARY_PREFIX%\share for %%f in (ATen caffe2 torch c10) do ( robocopy /NP /NFL /NDL /NJH /E torch\include\%%f %LIBRARY_INC%\%%f\ diff --git a/recipe/meta.yaml b/recipe/meta.yaml index cb9742592..57b274db3 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -192,32 +192,24 @@ requirements: # the global build stage, including tests test: commands: - # libraries - {% for each_lib in [ 'c10', 'shm', 'torch', 'torch_cpu', 'torch_global_deps'] %} + # libraries; peculiar formatting to avoid linter false positives about selectors + {% set torch_libs = [ + "c10", "shm", "torch", "torch_cpu", "torch_global_deps" + ] + (cuda_compiler_version != "None" and target_platform.startswith("linux")) * [ + "c10_cuda", "caffe2_nvrtc", "torch_cuda_linalg" + ] + (cuda_compiler_version != "None") * [ + "torch_cuda" + ] + target_platform.startswith("win") * [ + "asmjit", "fbgemm" + ] + %} + {% for each_lib in torch_libs %} - test -f $PREFIX/lib/lib{{ each_lib }}.so # [linux] - test -f $PREFIX/lib/lib{{ each_lib }}.dylib # [osx] - {% endfor %} - {% for each_lib in [ 'torch', 'torch_cpu', 'torch_global_deps'] %} - if not exist %LIBRARY_BIN%\{{ each_lib }}.dll exit 1 # [win] - {% endfor %} - - # Windows specific .LIB files - {% for each_lib in [ 'torch', 'torch_cpu'] %} + {% if each_lib != "torch_global_deps" %} - if not exist %LIBRARY_LIB%\{{ each_lib }}.lib exit 1 # [win] - {% endfor %} - - # Cuda only libraries - {% for each_lib in ['c10_cuda', 'caffe2_nvrtc', 'torch_cuda'] %} - - test -f $PREFIX/lib/lib{{ each_lib }}.so # [linux and cuda_compiler_version != "None"] - {% endfor %} - {% for each_lib in ['torch_cuda'] %} - - if not exist %LIBRARY_BIN%\{{ each_lib }}.dll exit 1 # [win and cuda_compiler_version != "None"] - - if not exist %LIBRARY_LIB%\{{ each_lib }}.lib exit 1 # [win and cuda_compiler_version != "None"] - {% endfor %} - - # Linux specific cuda libraries - {% for each_lib in [ 'torch_cuda_linalg'] %} - - test -f $PREFIX/lib/lib{{ each_lib }}.so # [linux and cuda_compiler_version != "None"] + {% endif %} {% endfor %} # CMake files in share From e0e34e37edb8ae492e15129693e5e1c01c282070 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Thu, 23 Jan 2025 23:07:48 +1100 Subject: [PATCH 34/43] adapt the way pytorch constructs include paths to $PREFIX/include --- recipe/meta.yaml | 4 ++ ...-of-python-3-and-error-without-numpy.patch | 2 +- recipe/patches/0002-Help-find-numpy.patch | 2 +- ...03-Add-USE_SYSTEM_NVTX-option-138287.patch | 2 +- .../patches/0004-Update-sympy-version.patch | 2 +- .../0005-Fix-duplicate-linker-script.patch | 2 +- ...kle-error-in-serialization.py-136034.patch | 2 +- ...verwrite-ld-with-environment-variabl.patch | 2 +- ...008-Allow-libcufile-for-conda-builds.patch | 2 +- ...-Allow-overriding-CUDA-related-paths.patch | 2 +- ...st-test_linalg.py-for-NumPy-2-136800.patch | 2 +- ...est-failures-in-test_torch.py-137740.patch | 2 +- ...AS_USE_CBLAS_DOT-for-OpenBLAS-builds.patch | 2 +- recipe/patches/0013-fix-issue-142484.patch | 2 +- recipe/patches/0014-Fix-FindOpenBLAS.patch | 2 +- ...Enable-Python-3.13-on-windows-138095.patch | 2 +- ...tils.cpp_extension.include_paths-use.patch | 51 +++++++++++++++++++ ...oint-include-paths-to-PREFIX-include.patch | 33 ++++++++++++ 18 files changed, 103 insertions(+), 15 deletions(-) create mode 100644 recipe/patches/0016-simplify-torch.utils.cpp_extension.include_paths-use.patch create mode 100644 recipe/patches/0017-point-include-paths-to-PREFIX-include.patch diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 57b274db3..2d8ef2ed7 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -63,6 +63,10 @@ source: - patches/0014-Fix-FindOpenBLAS.patch # backport https://github.com/pytorch/pytorch/pull/138095 - patches/0015-CD-Enable-Python-3.13-on-windows-138095.patch + # backport https://github.com/pytorch/pytorch/pull/145480 + - patches/0016-simplify-torch.utils.cpp_extension.include_paths-use.patch + # point to headers that are now living in $PREFIX/include instead of $SP_DIR/torch/include + - patches/0017-point-include-paths-to-PREFIX-include.patch build: number: {{ build }} diff --git a/recipe/patches/0001-Force-usage-of-python-3-and-error-without-numpy.patch b/recipe/patches/0001-Force-usage-of-python-3-and-error-without-numpy.patch index fab6479d1..9261e825c 100644 --- a/recipe/patches/0001-Force-usage-of-python-3-and-error-without-numpy.patch +++ b/recipe/patches/0001-Force-usage-of-python-3-and-error-without-numpy.patch @@ -1,7 +1,7 @@ From f3a0f9aab6dce56eea590b946f60256014b61bf7 Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Sun, 1 Sep 2024 17:35:40 -0400 -Subject: [PATCH 01/15] Force usage of python 3 and error without numpy +Subject: [PATCH 01/17] Force usage of python 3 and error without numpy --- cmake/Dependencies.cmake | 6 +++--- diff --git a/recipe/patches/0002-Help-find-numpy.patch b/recipe/patches/0002-Help-find-numpy.patch index 58792c4b0..ff94df907 100644 --- a/recipe/patches/0002-Help-find-numpy.patch +++ b/recipe/patches/0002-Help-find-numpy.patch @@ -1,7 +1,7 @@ From 21c30036b5b86f403c0cf4426165d9a6a50edb1a Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Tue, 1 Oct 2024 00:28:40 -0400 -Subject: [PATCH 02/15] Help find numpy +Subject: [PATCH 02/17] Help find numpy --- tools/setup_helpers/cmake.py | 6 ++++++ diff --git a/recipe/patches/0003-Add-USE_SYSTEM_NVTX-option-138287.patch b/recipe/patches/0003-Add-USE_SYSTEM_NVTX-option-138287.patch index 38baefeb5..651017639 100644 --- a/recipe/patches/0003-Add-USE_SYSTEM_NVTX-option-138287.patch +++ b/recipe/patches/0003-Add-USE_SYSTEM_NVTX-option-138287.patch @@ -1,7 +1,7 @@ From d1826af525db41eda5020a1404f5d5521d67a5dc Mon Sep 17 00:00:00 2001 From: Jeongseok Lee Date: Sat, 19 Oct 2024 04:26:01 +0000 -Subject: [PATCH 03/15] Add USE_SYSTEM_NVTX option (#138287) +Subject: [PATCH 03/17] Add USE_SYSTEM_NVTX option (#138287) ## Summary diff --git a/recipe/patches/0004-Update-sympy-version.patch b/recipe/patches/0004-Update-sympy-version.patch index 3767fdfc6..eda585111 100644 --- a/recipe/patches/0004-Update-sympy-version.patch +++ b/recipe/patches/0004-Update-sympy-version.patch @@ -1,7 +1,7 @@ From e3219c5fe8834753b0cf9e92be4d1ef1e874f370 Mon Sep 17 00:00:00 2001 From: Jeongseok Lee Date: Thu, 17 Oct 2024 15:04:05 -0700 -Subject: [PATCH 04/15] Update sympy version +Subject: [PATCH 04/17] Update sympy version --- setup.py | 2 +- diff --git a/recipe/patches/0005-Fix-duplicate-linker-script.patch b/recipe/patches/0005-Fix-duplicate-linker-script.patch index 9fc6adab2..6ab800fe5 100644 --- a/recipe/patches/0005-Fix-duplicate-linker-script.patch +++ b/recipe/patches/0005-Fix-duplicate-linker-script.patch @@ -1,7 +1,7 @@ From 08a1f44fbc81324aa98d720dfb7b87a261923ac2 Mon Sep 17 00:00:00 2001 From: Jeongseok Lee Date: Sun, 3 Nov 2024 01:12:36 -0700 -Subject: [PATCH 05/15] Fix duplicate linker script +Subject: [PATCH 05/17] Fix duplicate linker script --- setup.py | 4 +++- diff --git a/recipe/patches/0006-fix-3.13-pickle-error-in-serialization.py-136034.patch b/recipe/patches/0006-fix-3.13-pickle-error-in-serialization.py-136034.patch index d4253916a..ea928c2d8 100644 --- a/recipe/patches/0006-fix-3.13-pickle-error-in-serialization.py-136034.patch +++ b/recipe/patches/0006-fix-3.13-pickle-error-in-serialization.py-136034.patch @@ -1,7 +1,7 @@ From 15df314a41c69a31c0443254d5552aa1b39d708d Mon Sep 17 00:00:00 2001 From: William Wen Date: Fri, 13 Sep 2024 13:02:33 -0700 -Subject: [PATCH 06/15] fix 3.13 pickle error in serialization.py (#136034) +Subject: [PATCH 06/17] fix 3.13 pickle error in serialization.py (#136034) Error encountered when adding dynamo 3.13 support. Pull Request resolved: https://github.com/pytorch/pytorch/pull/136034 diff --git a/recipe/patches/0007-Allow-users-to-overwrite-ld-with-environment-variabl.patch b/recipe/patches/0007-Allow-users-to-overwrite-ld-with-environment-variabl.patch index 514982cc7..046b0d60f 100644 --- a/recipe/patches/0007-Allow-users-to-overwrite-ld-with-environment-variabl.patch +++ b/recipe/patches/0007-Allow-users-to-overwrite-ld-with-environment-variabl.patch @@ -1,7 +1,7 @@ From 655f694854c3eafdd631235b60bc6c1b279218ed Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Thu, 3 Oct 2024 22:49:56 -0400 -Subject: [PATCH 07/15] Allow users to overwrite ld with environment variables +Subject: [PATCH 07/17] Allow users to overwrite ld with environment variables This should help in the case of cross compilation. diff --git a/recipe/patches/0008-Allow-libcufile-for-conda-builds.patch b/recipe/patches/0008-Allow-libcufile-for-conda-builds.patch index 95c7a842b..7e6ca54c6 100644 --- a/recipe/patches/0008-Allow-libcufile-for-conda-builds.patch +++ b/recipe/patches/0008-Allow-libcufile-for-conda-builds.patch @@ -1,7 +1,7 @@ From 2578bf017b0453c8eb028a09b7523fb150429eca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Fri, 22 Nov 2024 17:50:53 +0100 -Subject: [PATCH 08/15] Allow libcufile for conda builds +Subject: [PATCH 08/17] Allow libcufile for conda builds --- CMakeLists.txt | 2 +- diff --git a/recipe/patches/0009-Allow-overriding-CUDA-related-paths.patch b/recipe/patches/0009-Allow-overriding-CUDA-related-paths.patch index 8c09887b7..a164eb1ca 100644 --- a/recipe/patches/0009-Allow-overriding-CUDA-related-paths.patch +++ b/recipe/patches/0009-Allow-overriding-CUDA-related-paths.patch @@ -1,7 +1,7 @@ From 52e530f222f2d30531c8da889695ac2674964245 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Wed, 27 Nov 2024 13:47:23 +0100 -Subject: [PATCH 09/15] Allow overriding CUDA-related paths +Subject: [PATCH 09/17] Allow overriding CUDA-related paths --- cmake/Modules/FindCUDAToolkit.cmake | 2 +- diff --git a/recipe/patches/0010-Fix-test-test_linalg.py-for-NumPy-2-136800.patch b/recipe/patches/0010-Fix-test-test_linalg.py-for-NumPy-2-136800.patch index 4dcc58a8a..b005bfc98 100644 --- a/recipe/patches/0010-Fix-test-test_linalg.py-for-NumPy-2-136800.patch +++ b/recipe/patches/0010-Fix-test-test_linalg.py-for-NumPy-2-136800.patch @@ -1,7 +1,7 @@ From db0902077a0ef68d0a48ae42f3b60f9cff7b2248 Mon Sep 17 00:00:00 2001 From: Haifeng Jin Date: Tue, 1 Oct 2024 07:53:24 +0000 -Subject: [PATCH 10/15] Fix test/test_linalg.py for NumPy 2 (#136800) +Subject: [PATCH 10/17] Fix test/test_linalg.py for NumPy 2 (#136800) Related to #107302. diff --git a/recipe/patches/0011-Fixes-NumPy-2-test-failures-in-test_torch.py-137740.patch b/recipe/patches/0011-Fixes-NumPy-2-test-failures-in-test_torch.py-137740.patch index fe156f3d4..962adf146 100644 --- a/recipe/patches/0011-Fixes-NumPy-2-test-failures-in-test_torch.py-137740.patch +++ b/recipe/patches/0011-Fixes-NumPy-2-test-failures-in-test_torch.py-137740.patch @@ -1,7 +1,7 @@ From a1ced1daa37fdcf5345aa0c3095cab8674c1cded Mon Sep 17 00:00:00 2001 From: Haifeng Jin Date: Sat, 12 Oct 2024 02:40:17 +0000 -Subject: [PATCH 11/15] Fixes NumPy 2 test failures in test_torch.py (#137740) +Subject: [PATCH 11/17] Fixes NumPy 2 test failures in test_torch.py (#137740) Related to #107302 diff --git a/recipe/patches/0012-Use-BLAS_USE_CBLAS_DOT-for-OpenBLAS-builds.patch b/recipe/patches/0012-Use-BLAS_USE_CBLAS_DOT-for-OpenBLAS-builds.patch index 4d2159dd5..7e7ccfdd4 100644 --- a/recipe/patches/0012-Use-BLAS_USE_CBLAS_DOT-for-OpenBLAS-builds.patch +++ b/recipe/patches/0012-Use-BLAS_USE_CBLAS_DOT-for-OpenBLAS-builds.patch @@ -1,7 +1,7 @@ From e74a39d09953d4c4dd293e167121cfe83fb172ec Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Wed, 18 Dec 2024 03:59:00 +0000 -Subject: [PATCH 12/15] Use BLAS_USE_CBLAS_DOT for OpenBLAS builds +Subject: [PATCH 12/17] Use BLAS_USE_CBLAS_DOT for OpenBLAS builds There are two calling conventions for *dotu functions diff --git a/recipe/patches/0013-fix-issue-142484.patch b/recipe/patches/0013-fix-issue-142484.patch index 528b0371e..4fdb5d7a7 100644 --- a/recipe/patches/0013-fix-issue-142484.patch +++ b/recipe/patches/0013-fix-issue-142484.patch @@ -1,7 +1,7 @@ From 67b122f715e93592f1d7913ab970619f7b571b96 Mon Sep 17 00:00:00 2001 From: "Zheng, Zhaoqiong" Date: Fri, 27 Dec 2024 13:49:36 +0800 -Subject: [PATCH 13/15] fix issue 142484 +Subject: [PATCH 13/17] fix issue 142484 From https://github.com/pytorch/pytorch/pull/143894 --- diff --git a/recipe/patches/0014-Fix-FindOpenBLAS.patch b/recipe/patches/0014-Fix-FindOpenBLAS.patch index 33fb2ffb9..e27613b3c 100644 --- a/recipe/patches/0014-Fix-FindOpenBLAS.patch +++ b/recipe/patches/0014-Fix-FindOpenBLAS.patch @@ -1,7 +1,7 @@ From a6924f47769d3d068b6d8e40686733b7ff32544e Mon Sep 17 00:00:00 2001 From: Bas Zalmstra Date: Thu, 16 May 2024 10:46:49 +0200 -Subject: [PATCH 14/15] Fix FindOpenBLAS +Subject: [PATCH 14/17] Fix FindOpenBLAS --- cmake/Modules/FindOpenBLAS.cmake | 15 +++++++++------ diff --git a/recipe/patches/0015-CD-Enable-Python-3.13-on-windows-138095.patch b/recipe/patches/0015-CD-Enable-Python-3.13-on-windows-138095.patch index b62f6456c..391496b0a 100644 --- a/recipe/patches/0015-CD-Enable-Python-3.13-on-windows-138095.patch +++ b/recipe/patches/0015-CD-Enable-Python-3.13-on-windows-138095.patch @@ -1,7 +1,7 @@ From 66fa234eccfe98339bfa2bba6eae425ce27a037d Mon Sep 17 00:00:00 2001 From: atalman Date: Tue, 12 Nov 2024 12:28:10 +0000 -Subject: [PATCH 15/15] CD Enable Python 3.13 on windows (#138095) +Subject: [PATCH 15/17] CD Enable Python 3.13 on windows (#138095) Adding CD windows. Part of: https://github.com/pytorch/pytorch/issues/130249 Builder PR landed with smoke test: https://github.com/pytorch/builder/pull/2035 diff --git a/recipe/patches/0016-simplify-torch.utils.cpp_extension.include_paths-use.patch b/recipe/patches/0016-simplify-torch.utils.cpp_extension.include_paths-use.patch new file mode 100644 index 000000000..99eb183cb --- /dev/null +++ b/recipe/patches/0016-simplify-torch.utils.cpp_extension.include_paths-use.patch @@ -0,0 +1,51 @@ +From d28eeca9a0692c0783bcbb9626917e87396128cd Mon Sep 17 00:00:00 2001 +From: "H. Vetinari" +Date: Thu, 23 Jan 2025 22:46:58 +1100 +Subject: [PATCH 16/17] simplify torch.utils.cpp_extension.include_paths; use + it in cpp_builder + +The /TH headers have not existed since pytorch 1.11 +--- + torch/_inductor/cpp_builder.py | 13 +++---------- + torch/utils/cpp_extension.py | 4 ---- + 2 files changed, 3 insertions(+), 14 deletions(-) + +diff --git a/torch/_inductor/cpp_builder.py b/torch/_inductor/cpp_builder.py +index 95a0bff86fd..860e7fb062f 100644 +--- a/torch/_inductor/cpp_builder.py ++++ b/torch/_inductor/cpp_builder.py +@@ -743,16 +743,9 @@ def _get_build_args_of_chosen_isa(vec_isa: VecISA) -> Tuple[List[str], List[str] + def _get_torch_related_args( + include_pytorch: bool, aot_mode: bool + ) -> Tuple[List[str], List[str], List[str]]: +- from torch.utils.cpp_extension import _TORCH_PATH, TORCH_LIB_PATH +- +- include_dirs = [ +- os.path.join(_TORCH_PATH, "include"), +- os.path.join(_TORCH_PATH, "include", "torch", "csrc", "api", "include"), +- # Some internal (old) Torch headers don't properly prefix their includes, +- # so we need to pass -Itorch/lib/include/TH as well. +- os.path.join(_TORCH_PATH, "include", "TH"), +- os.path.join(_TORCH_PATH, "include", "THC"), +- ] ++ from torch.utils.cpp_extension import include_paths, TORCH_LIB_PATH ++ ++ include_dirs = include_paths() + libraries_dirs = [TORCH_LIB_PATH] + libraries = [] + if sys.platform != "darwin" and not config.is_fbcode(): +diff --git a/torch/utils/cpp_extension.py b/torch/utils/cpp_extension.py +index aaa45ea4c90..3f584ef5598 100644 +--- a/torch/utils/cpp_extension.py ++++ b/torch/utils/cpp_extension.py +@@ -1159,10 +1159,6 @@ def include_paths(cuda: bool = False) -> List[str]: + lib_include, + # Remove this once torch/torch.h is officially no longer supported for C++ extensions. + os.path.join(lib_include, 'torch', 'csrc', 'api', 'include'), +- # Some internal (old) Torch headers don't properly prefix their includes, +- # so we need to pass -Itorch/lib/include/TH as well. +- os.path.join(lib_include, 'TH'), +- os.path.join(lib_include, 'THC') + ] + if cuda and IS_HIP_EXTENSION: + paths.append(os.path.join(lib_include, 'THH')) diff --git a/recipe/patches/0017-point-include-paths-to-PREFIX-include.patch b/recipe/patches/0017-point-include-paths-to-PREFIX-include.patch new file mode 100644 index 000000000..2e89787bf --- /dev/null +++ b/recipe/patches/0017-point-include-paths-to-PREFIX-include.patch @@ -0,0 +1,33 @@ +From 7c4094fe8edfd01d72b664c91a60cc14bb5a4dbe Mon Sep 17 00:00:00 2001 +From: "H. Vetinari" +Date: Thu, 23 Jan 2025 22:58:14 +1100 +Subject: [PATCH 17/17] point include paths to $PREFIX/include + +--- + torch/utils/cpp_extension.py | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/torch/utils/cpp_extension.py b/torch/utils/cpp_extension.py +index 3f584ef5598..4210f62b6db 100644 +--- a/torch/utils/cpp_extension.py ++++ b/torch/utils/cpp_extension.py +@@ -1155,10 +1155,19 @@ def include_paths(cuda: bool = False) -> List[str]: + A list of include path strings. + """ + lib_include = os.path.join(_TORCH_PATH, 'include') ++ if os.environ.get("CONDA_BUILD", None) is not None: ++ pieces = [os.environ["PREFIX"]] + IS_WINDOWS * ["Library"] + ["include"] ++ lib_include = os.path.join(*pieces) ++ elif os.environ.get("CONDA_PREFIX", None) is not None: ++ pieces = [os.environ["CONDA_PREFIX"]] + IS_WINDOWS * ["Library"] + ["include"] ++ lib_include = os.path.join(*pieces) + paths = [ + lib_include, + # Remove this once torch/torch.h is officially no longer supported for C++ extensions. + os.path.join(lib_include, 'torch', 'csrc', 'api', 'include'), ++ # add site-packages/torch/include again (`lib_include` may have been pointing to ++ # $PREFIX/include), as some torch-internal headers are still in this directory ++ os.path.join(_TORCH_PATH, 'include'), + ] + if cuda and IS_HIP_EXTENSION: + paths.append(os.path.join(lib_include, 'THH')) From c26c87a2b9c50ad324cad51711d2cee524744274 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Wed, 22 Jan 2025 19:21:16 +0100 Subject: [PATCH 35/43] Match Python in build env Include Python in build env also when building natively. Otherwise, we end up with Python 3.13 in build env and Python files are byte-compiled for both target Python and 3.13. --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 2d8ef2ed7..86267dee7 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -238,7 +238,7 @@ outputs: - libmagma_sparse requirements: build: - - python {{ python }} # [build_platform != target_platform] + - python - cross-python_{{ target_platform }} # [build_platform != target_platform] - numpy # [build_platform != target_platform] - {{ stdlib('c') }} From 6355886d13ceab7cc31b609f6e53974e0d3948e2 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Fri, 24 Jan 2025 09:12:02 +1100 Subject: [PATCH 36/43] fix handling of CUDA libraries on windows --- recipe/bld.bat | 4 ++++ recipe/meta.yaml | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/recipe/bld.bat b/recipe/bld.bat index 05e840a09..dd597fa4d 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -195,6 +195,10 @@ if "%PKG_NAME%" == "libtorch" ( @REM the only content of torch\bin, {asmjit,fbgemm}.dll, also exists in torch\lib robocopy /NP /NFL /NDL /NJH /E torch\lib\ %LIBRARY_BIN%\ torch*.dll c10.dll shm.dll asmjit.dll fbgemm.dll robocopy /NP /NFL /NDL /NJH /E torch\lib\ %LIBRARY_LIB%\ torch*.lib c10.lib shm.lib asmjit.lib fbgemm.lib + if not "%cuda_compiler_version%" == "None" ( + robocopy /NP /NFL /NDL /NJH /E torch\lib\ %LIBRARY_BIN%\ c10_cuda.dll caffe2_nvrtc.dll + robocopy /NP /NFL /NDL /NJH /E torch\lib\ %LIBRARY_LIB%\ c10_cuda.lib caffe2_nvrtc.lib + ) robocopy /NP /NFL /NDL /NJH /E torch\share\ %LIBRARY_PREFIX%\share for %%f in (ATen caffe2 torch c10) do ( robocopy /NP /NFL /NDL /NJH /E torch\include\%%f %LIBRARY_INC%\%%f\ diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 86267dee7..c04f195ef 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -200,9 +200,9 @@ test: {% set torch_libs = [ "c10", "shm", "torch", "torch_cpu", "torch_global_deps" ] + (cuda_compiler_version != "None" and target_platform.startswith("linux")) * [ - "c10_cuda", "caffe2_nvrtc", "torch_cuda_linalg" + "torch_cuda_linalg" ] + (cuda_compiler_version != "None") * [ - "torch_cuda" + "c10_cuda", "caffe2_nvrtc", "torch_cuda" ] + target_platform.startswith("win") * [ "asmjit", "fbgemm" ] From 6c7d83fa13bc2bc413fd72403cc23d6e0979a144 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Fri, 24 Jan 2025 09:18:39 +1100 Subject: [PATCH 37/43] add regression test for duplicate `.pyc` files --- recipe/meta.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index c04f195ef..fe1f856ec 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -446,6 +446,12 @@ outputs: - python -m pytest -n 2 {{ tests }} -k "not ({{ skips }})" --durations=50 # [unix and (not aarch64 or py==312)] - python -m pytest -v -s {{ tests }} -k "not ({{ skips }})" --durations=50 # [win] + # regression test for https://github.com/conda-forge/pytorch-cpu-feedstock/issues/329, where we picked up + # duplicate `.pyc` files due to newest py-ver (3.13) in the build environment not matching the one in host; + # obviously this test can only be done for other python versions. + - test ! -f $SP_DIR/functorch/__pycache__/__init__.cpython-313.pyc # [py!=313 and unix] + - if exist %SP_DIR%\functorch\__pycache__\__init__.cpython-313.pyc exit 1 # [py!=313 and win] + # 2021/08/01, hmaarrfk # While this seems like a roundabout way of defining the package name # It helps the linter avoid errors on a package not having tests. From eb3c6d0b161a09cfddeeef8f12bb6e9ebe37d146 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Fri, 24 Jan 2025 09:18:56 +1100 Subject: [PATCH 38/43] Revert "DEBUG: build only one python version" This reverts commit 3ebf1a9684a23d971b582d88d851948c134e6d50. --- recipe/meta.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index fe1f856ec..f273a9ea4 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -226,8 +226,6 @@ outputs: script: build.sh # [unix] script: bld.bat # [win] build: - # debug - skip: true # [py!=312] string: cuda{{ cuda_compiler_version | replace('.', '') }}_{{ blas_impl }}_py{{ CONDA_PY }}_h{{ PKG_HASH }}_{{ PKG_BUILDNUM }} # [cuda_compiler_version != "None"] string: cpu_{{ blas_impl }}_py{{ CONDA_PY }}_h{{ PKG_HASH }}_{{ PKG_BUILDNUM }} # [cuda_compiler_version == "None"] detect_binary_files_with_prefix: false From 1c1ac050465affa48c961c5179b3b3da2d9a1880 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Fri, 24 Jan 2025 09:31:02 +1100 Subject: [PATCH 39/43] MNT: Re-rendered with conda-build 25.1.1, conda-smithy 3.45.3, and conda-forge-pinning 2025.01.23.20.59.37 --- .azure-pipelines/azure-pipelines-osx.yml | 79 ++++++++ ...nNonecxx_compiler_version13is_rcFalse.yaml | 82 ++++++++ ...n12.6cxx_compiler_version13is_rcFalse.yaml | 82 ++++++++ ...nNonecxx_compiler_version13is_rcFalse.yaml | 82 ++++++++ ...n12.6cxx_compiler_version13is_rcFalse.yaml | 82 ++++++++ ...nNonecxx_compiler_version13is_rcFalse.yaml | 82 ++++++++ ...n12.6cxx_compiler_version13is_rcFalse.yaml | 82 ++++++++ ...rcFalsenumpy2.0python3.10.____cpython.yaml | 69 +++++++ ...rcFalsenumpy2.0python3.11.____cpython.yaml | 69 +++++++ ...rcFalsenumpy2.0python3.12.____cpython.yaml | 69 +++++++ ..._rcFalsenumpy2.0python3.9.____cpython.yaml | 69 +++++++ ...nis_rcFalsenumpy2python3.13.____cp313.yaml | 69 +++++++ ...rcFalsenumpy2.0python3.10.____cpython.yaml | 69 +++++++ ...rcFalsenumpy2.0python3.11.____cpython.yaml | 69 +++++++ ...rcFalsenumpy2.0python3.12.____cpython.yaml | 69 +++++++ ..._rcFalsenumpy2.0python3.9.____cpython.yaml | 69 +++++++ ...nis_rcFalsenumpy2python3.13.____cp313.yaml | 69 +++++++ ...rcFalsenumpy2.0python3.10.____cpython.yaml | 69 +++++++ ...rcFalsenumpy2.0python3.11.____cpython.yaml | 69 +++++++ ...rcFalsenumpy2.0python3.12.____cpython.yaml | 69 +++++++ ..._rcFalsenumpy2.0python3.9.____cpython.yaml | 69 +++++++ ...nis_rcFalsenumpy2python3.13.____cp313.yaml | 69 +++++++ ...necuda_compiler_versionNoneis_rcFalse.yaml | 4 + ...cccuda_compiler_version12.6is_rcFalse.yaml | 61 ++++++ .github/workflows/conda-build.yml | 40 ++++ .scripts/build_steps.sh | 100 ++++++++++ .scripts/run_docker_build.sh | 114 +++++++++++ .scripts/run_osx_build.sh | 120 +++++++++++ README.md | 186 +++++++++++++++++- azure-pipelines.yml | 31 +++ 30 files changed, 2259 insertions(+), 3 deletions(-) create mode 100755 .azure-pipelines/azure-pipelines-osx.yml create mode 100644 .ci_support/linux_64_blas_implgenericc_compiler_version13channel_targetsconda-forge_maincuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13is_rcFalse.yaml create mode 100644 .ci_support/linux_64_blas_implgenericc_compiler_version13channel_targetsconda-forge_maincuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13is_rcFalse.yaml create mode 100644 .ci_support/linux_64_blas_implmklc_compiler_version13channel_targetsconda-forge_maincuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13is_rcFalse.yaml create mode 100644 .ci_support/linux_64_blas_implmklc_compiler_version13channel_targetsconda-forge_maincuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13is_rcFalse.yaml create mode 100644 .ci_support/linux_aarch64_c_compiler_version13channel_targetsconda-forge_maincuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13is_rcFalse.yaml create mode 100644 .ci_support/linux_aarch64_c_compiler_version13channel_targetsconda-forge_maincuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13is_rcFalse.yaml create mode 100644 .ci_support/osx_64_blas_implgenericchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.10.____cpython.yaml create mode 100644 .ci_support/osx_64_blas_implgenericchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.11.____cpython.yaml create mode 100644 .ci_support/osx_64_blas_implgenericchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.12.____cpython.yaml create mode 100644 .ci_support/osx_64_blas_implgenericchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.9.____cpython.yaml create mode 100644 .ci_support/osx_64_blas_implgenericchannel_targetsconda-forge_mainis_rcFalsenumpy2python3.13.____cp313.yaml create mode 100644 .ci_support/osx_64_blas_implmklchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.10.____cpython.yaml create mode 100644 .ci_support/osx_64_blas_implmklchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.11.____cpython.yaml create mode 100644 .ci_support/osx_64_blas_implmklchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.12.____cpython.yaml create mode 100644 .ci_support/osx_64_blas_implmklchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.9.____cpython.yaml create mode 100644 .ci_support/osx_64_blas_implmklchannel_targetsconda-forge_mainis_rcFalsenumpy2python3.13.____cp313.yaml create mode 100644 .ci_support/osx_arm64_channel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.10.____cpython.yaml create mode 100644 .ci_support/osx_arm64_channel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.11.____cpython.yaml create mode 100644 .ci_support/osx_arm64_channel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.12.____cpython.yaml create mode 100644 .ci_support/osx_arm64_channel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.9.____cpython.yaml create mode 100644 .ci_support/osx_arm64_channel_targetsconda-forge_mainis_rcFalsenumpy2python3.13.____cp313.yaml create mode 100644 .ci_support/win_64_channel_targetsconda-forge_maincuda_compilercuda-nvcccuda_compiler_version12.6is_rcFalse.yaml create mode 100755 .scripts/build_steps.sh create mode 100755 .scripts/run_docker_build.sh create mode 100755 .scripts/run_osx_build.sh create mode 100644 azure-pipelines.yml diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml new file mode 100755 index 000000000..bcfc9f37a --- /dev/null +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -0,0 +1,79 @@ +# This file was generated automatically from conda-smithy. To update this configuration, +# update the conda-forge.yml and/or the recipe/meta.yaml. +# -*- mode: yaml -*- + +jobs: +- job: osx + pool: + vmImage: macOS-13 + strategy: + matrix: + osx_64_blas_implgenericchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.10.____cpython: + CONFIG: osx_64_blas_implgenericchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.10.____cpython + UPLOAD_PACKAGES: 'True' + osx_64_blas_implgenericchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.11.____cpython: + CONFIG: osx_64_blas_implgenericchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.11.____cpython + UPLOAD_PACKAGES: 'True' + osx_64_blas_implgenericchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.12.____cpython: + CONFIG: osx_64_blas_implgenericchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.12.____cpython + UPLOAD_PACKAGES: 'True' + osx_64_blas_implgenericchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.9.____cpython: + CONFIG: osx_64_blas_implgenericchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.9.____cpython + UPLOAD_PACKAGES: 'True' + osx_64_blas_implgenericchannel_targetsconda-forge_mainis_rcFalsenumpy2python3.13.____cp313: + CONFIG: osx_64_blas_implgenericchannel_targetsconda-forge_mainis_rcFalsenumpy2python3.13.____cp313 + UPLOAD_PACKAGES: 'True' + osx_64_blas_implmklchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.10.____cpython: + CONFIG: osx_64_blas_implmklchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.10.____cpython + UPLOAD_PACKAGES: 'True' + osx_64_blas_implmklchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.11.____cpython: + CONFIG: osx_64_blas_implmklchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.11.____cpython + UPLOAD_PACKAGES: 'True' + osx_64_blas_implmklchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.12.____cpython: + CONFIG: osx_64_blas_implmklchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.12.____cpython + UPLOAD_PACKAGES: 'True' + osx_64_blas_implmklchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.9.____cpython: + CONFIG: osx_64_blas_implmklchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.9.____cpython + UPLOAD_PACKAGES: 'True' + osx_64_blas_implmklchannel_targetsconda-forge_mainis_rcFalsenumpy2python3.13.____cp313: + CONFIG: osx_64_blas_implmklchannel_targetsconda-forge_mainis_rcFalsenumpy2python3.13.____cp313 + UPLOAD_PACKAGES: 'True' + osx_arm64_channel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.10.____cpython: + CONFIG: osx_arm64_channel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.10.____cpython + UPLOAD_PACKAGES: 'True' + osx_arm64_channel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.11.____cpython: + CONFIG: osx_arm64_channel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.11.____cpython + UPLOAD_PACKAGES: 'True' + osx_arm64_channel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.12.____cpython: + CONFIG: osx_arm64_channel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.12.____cpython + UPLOAD_PACKAGES: 'True' + osx_arm64_channel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.9.____cpython: + CONFIG: osx_arm64_channel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.9.____cpython + UPLOAD_PACKAGES: 'True' + osx_arm64_channel_targetsconda-forge_mainis_rcFalsenumpy2python3.13.____cp313: + CONFIG: osx_arm64_channel_targetsconda-forge_mainis_rcFalsenumpy2python3.13.____cp313 + UPLOAD_PACKAGES: 'True' + timeoutInMinutes: 360 + variables: {} + + steps: + # TODO: Fast finish on azure pipelines? + - script: | + export CI=azure + export flow_run_id=azure_$(Build.BuildNumber).$(System.JobAttempt) + export remote_url=$(Build.Repository.Uri) + export sha=$(Build.SourceVersion) + export OSX_FORCE_SDK_DOWNLOAD="1" + export GIT_BRANCH=$BUILD_SOURCEBRANCHNAME + export FEEDSTOCK_NAME=$(basename ${BUILD_REPOSITORY_NAME}) + if [[ "${BUILD_REASON:-}" == "PullRequest" ]]; then + export IS_PR_BUILD="True" + else + export IS_PR_BUILD="False" + fi + ./.scripts/run_osx_build.sh + displayName: Run OSX build + env: + BINSTAR_TOKEN: $(BINSTAR_TOKEN) + FEEDSTOCK_TOKEN: $(FEEDSTOCK_TOKEN) + STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) \ No newline at end of file diff --git a/.ci_support/linux_64_blas_implgenericc_compiler_version13channel_targetsconda-forge_maincuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13is_rcFalse.yaml b/.ci_support/linux_64_blas_implgenericc_compiler_version13channel_targetsconda-forge_maincuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13is_rcFalse.yaml new file mode 100644 index 000000000..3df538354 --- /dev/null +++ b/.ci_support/linux_64_blas_implgenericc_compiler_version13channel_targetsconda-forge_maincuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13is_rcFalse.yaml @@ -0,0 +1,82 @@ +blas_impl: +- generic +c_compiler: +- gcc +c_compiler_version: +- '13' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' +cdt_name: +- conda +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cuda_compiler: +- None +cuda_compiler_version: +- None +cudnn: +- '9' +cxx_compiler: +- gxx +cxx_compiler_version: +- '13' +docker_image: +- quay.io/condaforge/linux-anvil-x86_64:alma9 +github_actions_labels: +- cirun-openstack-gpu-2xlarge +is_rc: +- 'False' +libabseil: +- '20240722' +libblas: +- 3.9.* *netlib +libcblas: +- 3.9.* *netlib +liblapack: +- 3.9.* *netlib +libprotobuf: +- 5.28.3 +libtorch: +- '2.4' +megabuild: +- 'true' +mkl: +- '2024' +nccl: +- '2' +numpy: +- '2.0' +- '2.0' +- '2.0' +- '2' +- '2.0' +orc: +- 2.0.3 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.10.* *_cpython +- 3.11.* *_cpython +- 3.12.* *_cpython +- 3.13.* *_cp313 +- 3.9.* *_cpython +pytorch: +- '2.4' +target_platform: +- linux-64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version + - cuda_compiler + - cuda_compiler_version + - docker_image +- - channel_targets + - is_rc +- - python + - numpy diff --git a/.ci_support/linux_64_blas_implgenericc_compiler_version13channel_targetsconda-forge_maincuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13is_rcFalse.yaml b/.ci_support/linux_64_blas_implgenericc_compiler_version13channel_targetsconda-forge_maincuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13is_rcFalse.yaml new file mode 100644 index 000000000..9f8a62b5a --- /dev/null +++ b/.ci_support/linux_64_blas_implgenericc_compiler_version13channel_targetsconda-forge_maincuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13is_rcFalse.yaml @@ -0,0 +1,82 @@ +blas_impl: +- generic +c_compiler: +- gcc +c_compiler_version: +- '13' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' +cdt_name: +- conda +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cuda_compiler: +- cuda-nvcc +cuda_compiler_version: +- '12.6' +cudnn: +- '9' +cxx_compiler: +- gxx +cxx_compiler_version: +- '13' +docker_image: +- quay.io/condaforge/linux-anvil-x86_64:alma9 +github_actions_labels: +- cirun-openstack-gpu-2xlarge +is_rc: +- 'False' +libabseil: +- '20240722' +libblas: +- 3.9.* *netlib +libcblas: +- 3.9.* *netlib +liblapack: +- 3.9.* *netlib +libprotobuf: +- 5.28.3 +libtorch: +- '2.4' +megabuild: +- 'true' +mkl: +- '2024' +nccl: +- '2' +numpy: +- '2.0' +- '2.0' +- '2.0' +- '2' +- '2.0' +orc: +- 2.0.3 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.10.* *_cpython +- 3.11.* *_cpython +- 3.12.* *_cpython +- 3.13.* *_cp313 +- 3.9.* *_cpython +pytorch: +- '2.4' +target_platform: +- linux-64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version + - cuda_compiler + - cuda_compiler_version + - docker_image +- - channel_targets + - is_rc +- - python + - numpy diff --git a/.ci_support/linux_64_blas_implmklc_compiler_version13channel_targetsconda-forge_maincuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13is_rcFalse.yaml b/.ci_support/linux_64_blas_implmklc_compiler_version13channel_targetsconda-forge_maincuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13is_rcFalse.yaml new file mode 100644 index 000000000..f3434835e --- /dev/null +++ b/.ci_support/linux_64_blas_implmklc_compiler_version13channel_targetsconda-forge_maincuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13is_rcFalse.yaml @@ -0,0 +1,82 @@ +blas_impl: +- mkl +c_compiler: +- gcc +c_compiler_version: +- '13' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' +cdt_name: +- conda +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cuda_compiler: +- None +cuda_compiler_version: +- None +cudnn: +- '9' +cxx_compiler: +- gxx +cxx_compiler_version: +- '13' +docker_image: +- quay.io/condaforge/linux-anvil-x86_64:alma9 +github_actions_labels: +- cirun-openstack-gpu-2xlarge +is_rc: +- 'False' +libabseil: +- '20240722' +libblas: +- 3.9.* *netlib +libcblas: +- 3.9.* *netlib +liblapack: +- 3.9.* *netlib +libprotobuf: +- 5.28.3 +libtorch: +- '2.4' +megabuild: +- 'true' +mkl: +- '2024' +nccl: +- '2' +numpy: +- '2.0' +- '2.0' +- '2.0' +- '2' +- '2.0' +orc: +- 2.0.3 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.10.* *_cpython +- 3.11.* *_cpython +- 3.12.* *_cpython +- 3.13.* *_cp313 +- 3.9.* *_cpython +pytorch: +- '2.4' +target_platform: +- linux-64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version + - cuda_compiler + - cuda_compiler_version + - docker_image +- - channel_targets + - is_rc +- - python + - numpy diff --git a/.ci_support/linux_64_blas_implmklc_compiler_version13channel_targetsconda-forge_maincuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13is_rcFalse.yaml b/.ci_support/linux_64_blas_implmklc_compiler_version13channel_targetsconda-forge_maincuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13is_rcFalse.yaml new file mode 100644 index 000000000..3348ffc3a --- /dev/null +++ b/.ci_support/linux_64_blas_implmklc_compiler_version13channel_targetsconda-forge_maincuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13is_rcFalse.yaml @@ -0,0 +1,82 @@ +blas_impl: +- mkl +c_compiler: +- gcc +c_compiler_version: +- '13' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' +cdt_name: +- conda +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cuda_compiler: +- cuda-nvcc +cuda_compiler_version: +- '12.6' +cudnn: +- '9' +cxx_compiler: +- gxx +cxx_compiler_version: +- '13' +docker_image: +- quay.io/condaforge/linux-anvil-x86_64:alma9 +github_actions_labels: +- cirun-openstack-gpu-2xlarge +is_rc: +- 'False' +libabseil: +- '20240722' +libblas: +- 3.9.* *netlib +libcblas: +- 3.9.* *netlib +liblapack: +- 3.9.* *netlib +libprotobuf: +- 5.28.3 +libtorch: +- '2.4' +megabuild: +- 'true' +mkl: +- '2024' +nccl: +- '2' +numpy: +- '2.0' +- '2.0' +- '2.0' +- '2' +- '2.0' +orc: +- 2.0.3 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.10.* *_cpython +- 3.11.* *_cpython +- 3.12.* *_cpython +- 3.13.* *_cp313 +- 3.9.* *_cpython +pytorch: +- '2.4' +target_platform: +- linux-64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version + - cuda_compiler + - cuda_compiler_version + - docker_image +- - channel_targets + - is_rc +- - python + - numpy diff --git a/.ci_support/linux_aarch64_c_compiler_version13channel_targetsconda-forge_maincuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13is_rcFalse.yaml b/.ci_support/linux_aarch64_c_compiler_version13channel_targetsconda-forge_maincuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13is_rcFalse.yaml new file mode 100644 index 000000000..9a5eb8c59 --- /dev/null +++ b/.ci_support/linux_aarch64_c_compiler_version13channel_targetsconda-forge_maincuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13is_rcFalse.yaml @@ -0,0 +1,82 @@ +blas_impl: +- generic +c_compiler: +- gcc +c_compiler_version: +- '13' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' +cdt_name: +- conda +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cuda_compiler: +- None +cuda_compiler_version: +- None +cudnn: +- '9' +cxx_compiler: +- gxx +cxx_compiler_version: +- '13' +docker_image: +- quay.io/condaforge/linux-anvil-x86_64:alma9 +github_actions_labels: +- cirun-openstack-gpu-2xlarge +is_rc: +- 'False' +libabseil: +- '20240722' +libblas: +- 3.9.* *netlib +libcblas: +- 3.9.* *netlib +liblapack: +- 3.9.* *netlib +libprotobuf: +- 5.28.3 +libtorch: +- '2.4' +megabuild: +- 'true' +mkl: +- '2024' +nccl: +- '2' +numpy: +- '2.0' +- '2.0' +- '2.0' +- '2' +- '2.0' +orc: +- 2.0.3 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.10.* *_cpython +- 3.11.* *_cpython +- 3.12.* *_cpython +- 3.13.* *_cp313 +- 3.9.* *_cpython +pytorch: +- '2.4' +target_platform: +- linux-aarch64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version + - cuda_compiler + - cuda_compiler_version + - docker_image +- - channel_targets + - is_rc +- - python + - numpy diff --git a/.ci_support/linux_aarch64_c_compiler_version13channel_targetsconda-forge_maincuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13is_rcFalse.yaml b/.ci_support/linux_aarch64_c_compiler_version13channel_targetsconda-forge_maincuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13is_rcFalse.yaml new file mode 100644 index 000000000..99655f8b9 --- /dev/null +++ b/.ci_support/linux_aarch64_c_compiler_version13channel_targetsconda-forge_maincuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13is_rcFalse.yaml @@ -0,0 +1,82 @@ +blas_impl: +- generic +c_compiler: +- gcc +c_compiler_version: +- '13' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' +cdt_name: +- conda +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cuda_compiler: +- cuda-nvcc +cuda_compiler_version: +- '12.6' +cudnn: +- '9' +cxx_compiler: +- gxx +cxx_compiler_version: +- '13' +docker_image: +- quay.io/condaforge/linux-anvil-x86_64:alma9 +github_actions_labels: +- cirun-openstack-gpu-2xlarge +is_rc: +- 'False' +libabseil: +- '20240722' +libblas: +- 3.9.* *netlib +libcblas: +- 3.9.* *netlib +liblapack: +- 3.9.* *netlib +libprotobuf: +- 5.28.3 +libtorch: +- '2.4' +megabuild: +- 'true' +mkl: +- '2024' +nccl: +- '2' +numpy: +- '2.0' +- '2.0' +- '2.0' +- '2' +- '2.0' +orc: +- 2.0.3 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.10.* *_cpython +- 3.11.* *_cpython +- 3.12.* *_cpython +- 3.13.* *_cp313 +- 3.9.* *_cpython +pytorch: +- '2.4' +target_platform: +- linux-aarch64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version + - cuda_compiler + - cuda_compiler_version + - docker_image +- - channel_targets + - is_rc +- - python + - numpy diff --git a/.ci_support/osx_64_blas_implgenericchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.10.____cpython.yaml b/.ci_support/osx_64_blas_implgenericchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.10.____cpython.yaml new file mode 100644 index 000000000..c6feec780 --- /dev/null +++ b/.ci_support/osx_64_blas_implgenericchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.10.____cpython.yaml @@ -0,0 +1,69 @@ +MACOSX_DEPLOYMENT_TARGET: +- '10.15' +MACOSX_SDK_VERSION: +- '13.3' +blas_impl: +- generic +c_compiler: +- clang +c_compiler_version: +- '18' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '10.15' +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cuda_compiler: +- None +cuda_compiler_version: +- None +cxx_compiler: +- clangxx +cxx_compiler_version: +- '18' +is_rc: +- 'False' +libabseil: +- '20240722' +libblas: +- 3.9.* *netlib +libcblas: +- 3.9.* *netlib +liblapack: +- 3.9.* *netlib +libprotobuf: +- 5.28.3 +libtorch: +- '2.4' +llvm_openmp: +- '18' +macos_machine: +- x86_64-apple-darwin13.4.0 +megabuild: +- 'false' +mkl: +- '2023' +numpy: +- '2.0' +orc: +- 2.0.3 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.10.* *_cpython +pytorch: +- '2.4' +target_platform: +- osx-64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - channel_targets + - is_rc +- - python + - numpy diff --git a/.ci_support/osx_64_blas_implgenericchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.11.____cpython.yaml b/.ci_support/osx_64_blas_implgenericchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.11.____cpython.yaml new file mode 100644 index 000000000..20e3ffe5f --- /dev/null +++ b/.ci_support/osx_64_blas_implgenericchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.11.____cpython.yaml @@ -0,0 +1,69 @@ +MACOSX_DEPLOYMENT_TARGET: +- '10.15' +MACOSX_SDK_VERSION: +- '13.3' +blas_impl: +- generic +c_compiler: +- clang +c_compiler_version: +- '18' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '10.15' +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cuda_compiler: +- None +cuda_compiler_version: +- None +cxx_compiler: +- clangxx +cxx_compiler_version: +- '18' +is_rc: +- 'False' +libabseil: +- '20240722' +libblas: +- 3.9.* *netlib +libcblas: +- 3.9.* *netlib +liblapack: +- 3.9.* *netlib +libprotobuf: +- 5.28.3 +libtorch: +- '2.4' +llvm_openmp: +- '18' +macos_machine: +- x86_64-apple-darwin13.4.0 +megabuild: +- 'false' +mkl: +- '2023' +numpy: +- '2.0' +orc: +- 2.0.3 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.11.* *_cpython +pytorch: +- '2.4' +target_platform: +- osx-64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - channel_targets + - is_rc +- - python + - numpy diff --git a/.ci_support/osx_64_blas_implgenericchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.12.____cpython.yaml b/.ci_support/osx_64_blas_implgenericchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.12.____cpython.yaml new file mode 100644 index 000000000..db9bacb32 --- /dev/null +++ b/.ci_support/osx_64_blas_implgenericchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.12.____cpython.yaml @@ -0,0 +1,69 @@ +MACOSX_DEPLOYMENT_TARGET: +- '10.15' +MACOSX_SDK_VERSION: +- '13.3' +blas_impl: +- generic +c_compiler: +- clang +c_compiler_version: +- '18' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '10.15' +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cuda_compiler: +- None +cuda_compiler_version: +- None +cxx_compiler: +- clangxx +cxx_compiler_version: +- '18' +is_rc: +- 'False' +libabseil: +- '20240722' +libblas: +- 3.9.* *netlib +libcblas: +- 3.9.* *netlib +liblapack: +- 3.9.* *netlib +libprotobuf: +- 5.28.3 +libtorch: +- '2.4' +llvm_openmp: +- '18' +macos_machine: +- x86_64-apple-darwin13.4.0 +megabuild: +- 'false' +mkl: +- '2023' +numpy: +- '2.0' +orc: +- 2.0.3 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.12.* *_cpython +pytorch: +- '2.4' +target_platform: +- osx-64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - channel_targets + - is_rc +- - python + - numpy diff --git a/.ci_support/osx_64_blas_implgenericchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.9.____cpython.yaml b/.ci_support/osx_64_blas_implgenericchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.9.____cpython.yaml new file mode 100644 index 000000000..634c6e7a5 --- /dev/null +++ b/.ci_support/osx_64_blas_implgenericchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.9.____cpython.yaml @@ -0,0 +1,69 @@ +MACOSX_DEPLOYMENT_TARGET: +- '10.15' +MACOSX_SDK_VERSION: +- '13.3' +blas_impl: +- generic +c_compiler: +- clang +c_compiler_version: +- '18' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '10.15' +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cuda_compiler: +- None +cuda_compiler_version: +- None +cxx_compiler: +- clangxx +cxx_compiler_version: +- '18' +is_rc: +- 'False' +libabseil: +- '20240722' +libblas: +- 3.9.* *netlib +libcblas: +- 3.9.* *netlib +liblapack: +- 3.9.* *netlib +libprotobuf: +- 5.28.3 +libtorch: +- '2.4' +llvm_openmp: +- '18' +macos_machine: +- x86_64-apple-darwin13.4.0 +megabuild: +- 'false' +mkl: +- '2023' +numpy: +- '2.0' +orc: +- 2.0.3 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.9.* *_cpython +pytorch: +- '2.4' +target_platform: +- osx-64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - channel_targets + - is_rc +- - python + - numpy diff --git a/.ci_support/osx_64_blas_implgenericchannel_targetsconda-forge_mainis_rcFalsenumpy2python3.13.____cp313.yaml b/.ci_support/osx_64_blas_implgenericchannel_targetsconda-forge_mainis_rcFalsenumpy2python3.13.____cp313.yaml new file mode 100644 index 000000000..c30fcfeb8 --- /dev/null +++ b/.ci_support/osx_64_blas_implgenericchannel_targetsconda-forge_mainis_rcFalsenumpy2python3.13.____cp313.yaml @@ -0,0 +1,69 @@ +MACOSX_DEPLOYMENT_TARGET: +- '10.15' +MACOSX_SDK_VERSION: +- '13.3' +blas_impl: +- generic +c_compiler: +- clang +c_compiler_version: +- '18' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '10.15' +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cuda_compiler: +- None +cuda_compiler_version: +- None +cxx_compiler: +- clangxx +cxx_compiler_version: +- '18' +is_rc: +- 'False' +libabseil: +- '20240722' +libblas: +- 3.9.* *netlib +libcblas: +- 3.9.* *netlib +liblapack: +- 3.9.* *netlib +libprotobuf: +- 5.28.3 +libtorch: +- '2.4' +llvm_openmp: +- '18' +macos_machine: +- x86_64-apple-darwin13.4.0 +megabuild: +- 'false' +mkl: +- '2023' +numpy: +- '2' +orc: +- 2.0.3 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.13.* *_cp313 +pytorch: +- '2.4' +target_platform: +- osx-64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - channel_targets + - is_rc +- - python + - numpy diff --git a/.ci_support/osx_64_blas_implmklchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.10.____cpython.yaml b/.ci_support/osx_64_blas_implmklchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.10.____cpython.yaml new file mode 100644 index 000000000..54a51beef --- /dev/null +++ b/.ci_support/osx_64_blas_implmklchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.10.____cpython.yaml @@ -0,0 +1,69 @@ +MACOSX_DEPLOYMENT_TARGET: +- '10.15' +MACOSX_SDK_VERSION: +- '13.3' +blas_impl: +- mkl +c_compiler: +- clang +c_compiler_version: +- '18' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '10.15' +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cuda_compiler: +- None +cuda_compiler_version: +- None +cxx_compiler: +- clangxx +cxx_compiler_version: +- '18' +is_rc: +- 'False' +libabseil: +- '20240722' +libblas: +- 3.9.* *netlib +libcblas: +- 3.9.* *netlib +liblapack: +- 3.9.* *netlib +libprotobuf: +- 5.28.3 +libtorch: +- '2.4' +llvm_openmp: +- '18' +macos_machine: +- x86_64-apple-darwin13.4.0 +megabuild: +- 'false' +mkl: +- '2023' +numpy: +- '2.0' +orc: +- 2.0.3 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.10.* *_cpython +pytorch: +- '2.4' +target_platform: +- osx-64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - channel_targets + - is_rc +- - python + - numpy diff --git a/.ci_support/osx_64_blas_implmklchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.11.____cpython.yaml b/.ci_support/osx_64_blas_implmklchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.11.____cpython.yaml new file mode 100644 index 000000000..5b2d139d0 --- /dev/null +++ b/.ci_support/osx_64_blas_implmklchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.11.____cpython.yaml @@ -0,0 +1,69 @@ +MACOSX_DEPLOYMENT_TARGET: +- '10.15' +MACOSX_SDK_VERSION: +- '13.3' +blas_impl: +- mkl +c_compiler: +- clang +c_compiler_version: +- '18' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '10.15' +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cuda_compiler: +- None +cuda_compiler_version: +- None +cxx_compiler: +- clangxx +cxx_compiler_version: +- '18' +is_rc: +- 'False' +libabseil: +- '20240722' +libblas: +- 3.9.* *netlib +libcblas: +- 3.9.* *netlib +liblapack: +- 3.9.* *netlib +libprotobuf: +- 5.28.3 +libtorch: +- '2.4' +llvm_openmp: +- '18' +macos_machine: +- x86_64-apple-darwin13.4.0 +megabuild: +- 'false' +mkl: +- '2023' +numpy: +- '2.0' +orc: +- 2.0.3 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.11.* *_cpython +pytorch: +- '2.4' +target_platform: +- osx-64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - channel_targets + - is_rc +- - python + - numpy diff --git a/.ci_support/osx_64_blas_implmklchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.12.____cpython.yaml b/.ci_support/osx_64_blas_implmklchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.12.____cpython.yaml new file mode 100644 index 000000000..9ba9f9253 --- /dev/null +++ b/.ci_support/osx_64_blas_implmklchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.12.____cpython.yaml @@ -0,0 +1,69 @@ +MACOSX_DEPLOYMENT_TARGET: +- '10.15' +MACOSX_SDK_VERSION: +- '13.3' +blas_impl: +- mkl +c_compiler: +- clang +c_compiler_version: +- '18' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '10.15' +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cuda_compiler: +- None +cuda_compiler_version: +- None +cxx_compiler: +- clangxx +cxx_compiler_version: +- '18' +is_rc: +- 'False' +libabseil: +- '20240722' +libblas: +- 3.9.* *netlib +libcblas: +- 3.9.* *netlib +liblapack: +- 3.9.* *netlib +libprotobuf: +- 5.28.3 +libtorch: +- '2.4' +llvm_openmp: +- '18' +macos_machine: +- x86_64-apple-darwin13.4.0 +megabuild: +- 'false' +mkl: +- '2023' +numpy: +- '2.0' +orc: +- 2.0.3 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.12.* *_cpython +pytorch: +- '2.4' +target_platform: +- osx-64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - channel_targets + - is_rc +- - python + - numpy diff --git a/.ci_support/osx_64_blas_implmklchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.9.____cpython.yaml b/.ci_support/osx_64_blas_implmklchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.9.____cpython.yaml new file mode 100644 index 000000000..532cd94d8 --- /dev/null +++ b/.ci_support/osx_64_blas_implmklchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.9.____cpython.yaml @@ -0,0 +1,69 @@ +MACOSX_DEPLOYMENT_TARGET: +- '10.15' +MACOSX_SDK_VERSION: +- '13.3' +blas_impl: +- mkl +c_compiler: +- clang +c_compiler_version: +- '18' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '10.15' +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cuda_compiler: +- None +cuda_compiler_version: +- None +cxx_compiler: +- clangxx +cxx_compiler_version: +- '18' +is_rc: +- 'False' +libabseil: +- '20240722' +libblas: +- 3.9.* *netlib +libcblas: +- 3.9.* *netlib +liblapack: +- 3.9.* *netlib +libprotobuf: +- 5.28.3 +libtorch: +- '2.4' +llvm_openmp: +- '18' +macos_machine: +- x86_64-apple-darwin13.4.0 +megabuild: +- 'false' +mkl: +- '2023' +numpy: +- '2.0' +orc: +- 2.0.3 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.9.* *_cpython +pytorch: +- '2.4' +target_platform: +- osx-64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - channel_targets + - is_rc +- - python + - numpy diff --git a/.ci_support/osx_64_blas_implmklchannel_targetsconda-forge_mainis_rcFalsenumpy2python3.13.____cp313.yaml b/.ci_support/osx_64_blas_implmklchannel_targetsconda-forge_mainis_rcFalsenumpy2python3.13.____cp313.yaml new file mode 100644 index 000000000..56565a9de --- /dev/null +++ b/.ci_support/osx_64_blas_implmklchannel_targetsconda-forge_mainis_rcFalsenumpy2python3.13.____cp313.yaml @@ -0,0 +1,69 @@ +MACOSX_DEPLOYMENT_TARGET: +- '10.15' +MACOSX_SDK_VERSION: +- '13.3' +blas_impl: +- mkl +c_compiler: +- clang +c_compiler_version: +- '18' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '10.15' +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cuda_compiler: +- None +cuda_compiler_version: +- None +cxx_compiler: +- clangxx +cxx_compiler_version: +- '18' +is_rc: +- 'False' +libabseil: +- '20240722' +libblas: +- 3.9.* *netlib +libcblas: +- 3.9.* *netlib +liblapack: +- 3.9.* *netlib +libprotobuf: +- 5.28.3 +libtorch: +- '2.4' +llvm_openmp: +- '18' +macos_machine: +- x86_64-apple-darwin13.4.0 +megabuild: +- 'false' +mkl: +- '2023' +numpy: +- '2' +orc: +- 2.0.3 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.13.* *_cp313 +pytorch: +- '2.4' +target_platform: +- osx-64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - channel_targets + - is_rc +- - python + - numpy diff --git a/.ci_support/osx_arm64_channel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.10.____cpython.yaml b/.ci_support/osx_arm64_channel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.10.____cpython.yaml new file mode 100644 index 000000000..ecc6bdbc8 --- /dev/null +++ b/.ci_support/osx_arm64_channel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.10.____cpython.yaml @@ -0,0 +1,69 @@ +MACOSX_DEPLOYMENT_TARGET: +- '11.0' +MACOSX_SDK_VERSION: +- '13.3' +blas_impl: +- generic +c_compiler: +- clang +c_compiler_version: +- '18' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '11.0' +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cuda_compiler: +- None +cuda_compiler_version: +- None +cxx_compiler: +- clangxx +cxx_compiler_version: +- '18' +is_rc: +- 'False' +libabseil: +- '20240722' +libblas: +- 3.9.* *netlib +libcblas: +- 3.9.* *netlib +liblapack: +- 3.9.* *netlib +libprotobuf: +- 5.28.3 +libtorch: +- '2.4' +llvm_openmp: +- '18' +macos_machine: +- arm64-apple-darwin20.0.0 +megabuild: +- 'false' +mkl: +- '2023' +numpy: +- '2.0' +orc: +- 2.0.3 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.10.* *_cpython +pytorch: +- '2.4' +target_platform: +- osx-arm64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - channel_targets + - is_rc +- - python + - numpy diff --git a/.ci_support/osx_arm64_channel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.11.____cpython.yaml b/.ci_support/osx_arm64_channel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.11.____cpython.yaml new file mode 100644 index 000000000..8fbb298f0 --- /dev/null +++ b/.ci_support/osx_arm64_channel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.11.____cpython.yaml @@ -0,0 +1,69 @@ +MACOSX_DEPLOYMENT_TARGET: +- '11.0' +MACOSX_SDK_VERSION: +- '13.3' +blas_impl: +- generic +c_compiler: +- clang +c_compiler_version: +- '18' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '11.0' +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cuda_compiler: +- None +cuda_compiler_version: +- None +cxx_compiler: +- clangxx +cxx_compiler_version: +- '18' +is_rc: +- 'False' +libabseil: +- '20240722' +libblas: +- 3.9.* *netlib +libcblas: +- 3.9.* *netlib +liblapack: +- 3.9.* *netlib +libprotobuf: +- 5.28.3 +libtorch: +- '2.4' +llvm_openmp: +- '18' +macos_machine: +- arm64-apple-darwin20.0.0 +megabuild: +- 'false' +mkl: +- '2023' +numpy: +- '2.0' +orc: +- 2.0.3 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.11.* *_cpython +pytorch: +- '2.4' +target_platform: +- osx-arm64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - channel_targets + - is_rc +- - python + - numpy diff --git a/.ci_support/osx_arm64_channel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.12.____cpython.yaml b/.ci_support/osx_arm64_channel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.12.____cpython.yaml new file mode 100644 index 000000000..576ca03cf --- /dev/null +++ b/.ci_support/osx_arm64_channel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.12.____cpython.yaml @@ -0,0 +1,69 @@ +MACOSX_DEPLOYMENT_TARGET: +- '11.0' +MACOSX_SDK_VERSION: +- '13.3' +blas_impl: +- generic +c_compiler: +- clang +c_compiler_version: +- '18' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '11.0' +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cuda_compiler: +- None +cuda_compiler_version: +- None +cxx_compiler: +- clangxx +cxx_compiler_version: +- '18' +is_rc: +- 'False' +libabseil: +- '20240722' +libblas: +- 3.9.* *netlib +libcblas: +- 3.9.* *netlib +liblapack: +- 3.9.* *netlib +libprotobuf: +- 5.28.3 +libtorch: +- '2.4' +llvm_openmp: +- '18' +macos_machine: +- arm64-apple-darwin20.0.0 +megabuild: +- 'false' +mkl: +- '2023' +numpy: +- '2.0' +orc: +- 2.0.3 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.12.* *_cpython +pytorch: +- '2.4' +target_platform: +- osx-arm64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - channel_targets + - is_rc +- - python + - numpy diff --git a/.ci_support/osx_arm64_channel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.9.____cpython.yaml b/.ci_support/osx_arm64_channel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.9.____cpython.yaml new file mode 100644 index 000000000..ef8363fab --- /dev/null +++ b/.ci_support/osx_arm64_channel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.9.____cpython.yaml @@ -0,0 +1,69 @@ +MACOSX_DEPLOYMENT_TARGET: +- '11.0' +MACOSX_SDK_VERSION: +- '13.3' +blas_impl: +- generic +c_compiler: +- clang +c_compiler_version: +- '18' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '11.0' +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cuda_compiler: +- None +cuda_compiler_version: +- None +cxx_compiler: +- clangxx +cxx_compiler_version: +- '18' +is_rc: +- 'False' +libabseil: +- '20240722' +libblas: +- 3.9.* *netlib +libcblas: +- 3.9.* *netlib +liblapack: +- 3.9.* *netlib +libprotobuf: +- 5.28.3 +libtorch: +- '2.4' +llvm_openmp: +- '18' +macos_machine: +- arm64-apple-darwin20.0.0 +megabuild: +- 'false' +mkl: +- '2023' +numpy: +- '2.0' +orc: +- 2.0.3 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.9.* *_cpython +pytorch: +- '2.4' +target_platform: +- osx-arm64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - channel_targets + - is_rc +- - python + - numpy diff --git a/.ci_support/osx_arm64_channel_targetsconda-forge_mainis_rcFalsenumpy2python3.13.____cp313.yaml b/.ci_support/osx_arm64_channel_targetsconda-forge_mainis_rcFalsenumpy2python3.13.____cp313.yaml new file mode 100644 index 000000000..82cd46011 --- /dev/null +++ b/.ci_support/osx_arm64_channel_targetsconda-forge_mainis_rcFalsenumpy2python3.13.____cp313.yaml @@ -0,0 +1,69 @@ +MACOSX_DEPLOYMENT_TARGET: +- '11.0' +MACOSX_SDK_VERSION: +- '13.3' +blas_impl: +- generic +c_compiler: +- clang +c_compiler_version: +- '18' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '11.0' +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cuda_compiler: +- None +cuda_compiler_version: +- None +cxx_compiler: +- clangxx +cxx_compiler_version: +- '18' +is_rc: +- 'False' +libabseil: +- '20240722' +libblas: +- 3.9.* *netlib +libcblas: +- 3.9.* *netlib +liblapack: +- 3.9.* *netlib +libprotobuf: +- 5.28.3 +libtorch: +- '2.4' +llvm_openmp: +- '18' +macos_machine: +- arm64-apple-darwin20.0.0 +megabuild: +- 'false' +mkl: +- '2023' +numpy: +- '2' +orc: +- 2.0.3 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.13.* *_cp313 +pytorch: +- '2.4' +target_platform: +- osx-arm64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - channel_targets + - is_rc +- - python + - numpy diff --git a/.ci_support/win_64_channel_targetsconda-forge_maincuda_compilerNonecuda_compiler_versionNoneis_rcFalse.yaml b/.ci_support/win_64_channel_targetsconda-forge_maincuda_compilerNonecuda_compiler_versionNoneis_rcFalse.yaml index 4ab0009bf..ad886cb08 100644 --- a/.ci_support/win_64_channel_targetsconda-forge_maincuda_compilerNonecuda_compiler_versionNoneis_rcFalse.yaml +++ b/.ci_support/win_64_channel_targetsconda-forge_maincuda_compilerNonecuda_compiler_versionNoneis_rcFalse.yaml @@ -12,6 +12,8 @@ cuda_compiler: - None cuda_compiler_version: - None +cudnn: +- '9' cxx_compiler: - vs2019 github_actions_labels: @@ -34,6 +36,8 @@ numpy: - '2.0' - '2' - '2.0' +orc: +- 2.0.3 pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/win_64_channel_targetsconda-forge_maincuda_compilercuda-nvcccuda_compiler_version12.6is_rcFalse.yaml b/.ci_support/win_64_channel_targetsconda-forge_maincuda_compilercuda-nvcccuda_compiler_version12.6is_rcFalse.yaml new file mode 100644 index 000000000..f5b631f70 --- /dev/null +++ b/.ci_support/win_64_channel_targetsconda-forge_maincuda_compilercuda-nvcccuda_compiler_version12.6is_rcFalse.yaml @@ -0,0 +1,61 @@ +blas_impl: +- mkl +c_compiler: +- vs2019 +c_stdlib: +- vs +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cuda_compiler: +- cuda-nvcc +cuda_compiler_version: +- '12.6' +cudnn: +- '9' +cxx_compiler: +- vs2019 +github_actions_labels: +- cirun-azure-windows-2xlarge +is_rc: +- 'False' +libabseil: +- '20240722' +libprotobuf: +- 5.28.3 +libtorch: +- '2.4' +megabuild: +- 'true' +mkl: +- '2024' +numpy: +- '2.0' +- '2.0' +- '2.0' +- '2' +- '2.0' +orc: +- 2.0.3 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.10.* *_cpython +- 3.11.* *_cpython +- 3.12.* *_cpython +- 3.13.* *_cp313 +- 3.9.* *_cpython +pytorch: +- '2.4' +target_platform: +- win-64 +zip_keys: +- - channel_targets + - is_rc +- - cuda_compiler + - cuda_compiler_version +- - python + - numpy diff --git a/.github/workflows/conda-build.yml b/.github/workflows/conda-build.yml index c94db1a19..40a005a95 100644 --- a/.github/workflows/conda-build.yml +++ b/.github/workflows/conda-build.yml @@ -21,10 +21,50 @@ jobs: fail-fast: false matrix: include: + - CONFIG: linux_64_blas_implgenericc_compiler_version13channel_targetsconda-forge_maincuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13is_rcFalse + UPLOAD_PACKAGES: True + os: ubuntu + runs_on: ['cirun-openstack-gpu-2xlarge--${{ github.run_id }}-linux_64_blas_implgenericc_compiler_hb59e174a3e', 'linux', 'x64', 'self-hosted'] + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 + CONDA_FORGE_DOCKER_RUN_ARGS: "--gpus all" + - CONFIG: linux_64_blas_implgenericc_compiler_version13channel_targetsconda-forge_maincuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13is_rcFalse + UPLOAD_PACKAGES: True + os: ubuntu + runs_on: ['cirun-openstack-gpu-2xlarge--${{ github.run_id }}-linux_64_blas_implgenericc_compiler_h5e2cde8be1', 'linux', 'x64', 'self-hosted'] + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 + CONDA_FORGE_DOCKER_RUN_ARGS: "--gpus all" + - CONFIG: linux_64_blas_implmklc_compiler_version13channel_targetsconda-forge_maincuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13is_rcFalse + UPLOAD_PACKAGES: True + os: ubuntu + runs_on: ['cirun-openstack-gpu-2xlarge--${{ github.run_id }}-linux_64_blas_implmklc_compiler_ver_h0b96eb68c6', 'linux', 'x64', 'self-hosted'] + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 + CONDA_FORGE_DOCKER_RUN_ARGS: "--gpus all" + - CONFIG: linux_64_blas_implmklc_compiler_version13channel_targetsconda-forge_maincuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13is_rcFalse + UPLOAD_PACKAGES: True + os: ubuntu + runs_on: ['cirun-openstack-gpu-2xlarge--${{ github.run_id }}-linux_64_blas_implmklc_compiler_ver_hc39dedf959', 'linux', 'x64', 'self-hosted'] + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 + CONDA_FORGE_DOCKER_RUN_ARGS: "--gpus all" + - CONFIG: linux_aarch64_c_compiler_version13channel_targetsconda-forge_maincuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13is_rcFalse + UPLOAD_PACKAGES: True + os: ubuntu + runs_on: ['cirun-openstack-gpu-2xlarge--${{ github.run_id }}-linux_aarch64_c_compiler_version13c_h352ed12235', 'linux', 'x64', 'self-hosted'] + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 + CONDA_FORGE_DOCKER_RUN_ARGS: "--gpus all" + - CONFIG: linux_aarch64_c_compiler_version13channel_targetsconda-forge_maincuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13is_rcFalse + UPLOAD_PACKAGES: True + os: ubuntu + runs_on: ['cirun-openstack-gpu-2xlarge--${{ github.run_id }}-linux_aarch64_c_compiler_version13c_h94771c6c09', 'linux', 'x64', 'self-hosted'] + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 + CONDA_FORGE_DOCKER_RUN_ARGS: "--gpus all" - CONFIG: win_64_channel_targetsconda-forge_maincuda_compilerNonecuda_compiler_versionNoneis_rcFalse UPLOAD_PACKAGES: True os: windows runs_on: ['cirun-azure-windows-2xlarge--${{ github.run_id }}-win_64_channel_targetsconda-forge_m_h0b759d4e63', 'windows', 'x64', 'self-hosted'] + - CONFIG: win_64_channel_targetsconda-forge_maincuda_compilercuda-nvcccuda_compiler_version12.6is_rcFalse + UPLOAD_PACKAGES: True + os: windows + runs_on: ['cirun-azure-windows-2xlarge--${{ github.run_id }}-win_64_channel_targetsconda-forge_m_h790f30616b', 'windows', 'x64', 'self-hosted'] steps: - name: Checkout code diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh new file mode 100755 index 000000000..827a29fbc --- /dev/null +++ b/.scripts/build_steps.sh @@ -0,0 +1,100 @@ +#!/usr/bin/env bash + +# PLEASE NOTE: This script has been automatically generated by conda-smithy. Any changes here +# will be lost next time ``conda smithy rerender`` is run. If you would like to make permanent +# changes to this script, consider a proposal to conda-smithy so that other feedstocks can also +# benefit from the improvement. + +# -*- mode: jinja-shell -*- + +set -xeuo pipefail +export FEEDSTOCK_ROOT="${FEEDSTOCK_ROOT:-/home/conda/feedstock_root}" +source ${FEEDSTOCK_ROOT}/.scripts/logging_utils.sh + + +( endgroup "Start Docker" ) 2> /dev/null + +( startgroup "Configuring conda" ) 2> /dev/null + +export PYTHONUNBUFFERED=1 +export RECIPE_ROOT="${RECIPE_ROOT:-/home/conda/recipe_root}" +export CI_SUPPORT="${FEEDSTOCK_ROOT}/.ci_support" +export CONFIG_FILE="${CI_SUPPORT}/${CONFIG}.yaml" + +cat >~/.condarc < /opt/conda/conda-meta/history +micromamba install --root-prefix ~/.conda --prefix /opt/conda \ + --yes --override-channels --channel conda-forge --strict-channel-priority \ + pip python=3.12 conda-build conda-forge-ci-setup=4 "conda-build>=24.1" +export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1 + +# set up the condarc +setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" + +source run_conda_forge_build_setup + + + +# make the build number clobber +make_build_number "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" + +if [[ "${HOST_PLATFORM}" != "${BUILD_PLATFORM}" ]] && [[ "${HOST_PLATFORM}" != linux-* ]] && [[ "${BUILD_WITH_CONDA_DEBUG:-0}" != 1 ]]; then + EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --no-test" +fi + + +( endgroup "Configuring conda" ) 2> /dev/null + +if [[ -f "${FEEDSTOCK_ROOT}/LICENSE.txt" ]]; then + cp "${FEEDSTOCK_ROOT}/LICENSE.txt" "${RECIPE_ROOT}/recipe-scripts-license.txt" +fi + +if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then + if [[ "x${BUILD_OUTPUT_ID:-}" != "x" ]]; then + EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --output-id ${BUILD_OUTPUT_ID}" + fi + conda debug "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ + ${EXTRA_CB_OPTIONS:-} \ + --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" + + # Drop into an interactive shell + /bin/bash +else + conda-build "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ + --suppress-variables ${EXTRA_CB_OPTIONS:-} \ + --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" \ + --extra-meta flow_run_id="${flow_run_id:-}" remote_url="${remote_url:-}" sha="${sha:-}" + ( startgroup "Inspecting artifacts" ) 2> /dev/null + + # inspect_artifacts was only added in conda-forge-ci-setup 4.9.4 + command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts --recipe-dir "${RECIPE_ROOT}" -m "${CONFIG_FILE}" || echo "inspect_artifacts needs conda-forge-ci-setup >=4.9.4" + + ( endgroup "Inspecting artifacts" ) 2> /dev/null + ( startgroup "Validating outputs" ) 2> /dev/null + + validate_recipe_outputs "${FEEDSTOCK_NAME}" + + ( endgroup "Validating outputs" ) 2> /dev/null + + ( startgroup "Uploading packages" ) 2> /dev/null + + if [[ "${UPLOAD_PACKAGES}" != "False" ]] && [[ "${IS_PR_BUILD}" == "False" ]]; then + upload_package --validate --feedstock-name="${FEEDSTOCK_NAME}" "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" + fi + + ( endgroup "Uploading packages" ) 2> /dev/null +fi + +( startgroup "Final checks" ) 2> /dev/null + +touch "${FEEDSTOCK_ROOT}/build_artifacts/conda-forge-build-done-${CONFIG}" \ No newline at end of file diff --git a/.scripts/run_docker_build.sh b/.scripts/run_docker_build.sh new file mode 100755 index 000000000..00f377a80 --- /dev/null +++ b/.scripts/run_docker_build.sh @@ -0,0 +1,114 @@ +#!/usr/bin/env bash + +# PLEASE NOTE: This script has been automatically generated by conda-smithy. Any changes here +# will be lost next time ``conda smithy rerender`` is run. If you would like to make permanent +# changes to this script, consider a proposal to conda-smithy so that other feedstocks can also +# benefit from the improvement. + +source .scripts/logging_utils.sh + +( startgroup "Configure Docker" ) 2> /dev/null + +set -xeo pipefail + +THISDIR="$( cd "$( dirname "$0" )" >/dev/null && pwd )" +PROVIDER_DIR="$(basename $THISDIR)" + +FEEDSTOCK_ROOT="$( cd "$( dirname "$0" )/.." >/dev/null && pwd )" +RECIPE_ROOT="${FEEDSTOCK_ROOT}/recipe" + +if [ -z ${FEEDSTOCK_NAME} ]; then + export FEEDSTOCK_NAME=$(basename ${FEEDSTOCK_ROOT}) +fi + +if [[ "${sha:-}" == "" ]]; then + pushd "${FEEDSTOCK_ROOT}" + sha=$(git rev-parse HEAD) + popd +fi + +docker info + +# In order for the conda-build process in the container to write to the mounted +# volumes, we need to run with the same id as the host machine, which is +# normally the owner of the mounted volumes, or at least has write permission +export HOST_USER_ID=$(id -u) +# Check if docker-machine is being used (normally on OSX) and get the uid from +# the VM +if hash docker-machine 2> /dev/null && docker-machine active > /dev/null; then + export HOST_USER_ID=$(docker-machine ssh $(docker-machine active) id -u) +fi + +ARTIFACTS="$FEEDSTOCK_ROOT/build_artifacts" + +if [ -z "$CONFIG" ]; then + set +x + FILES=`ls .ci_support/linux_*` + CONFIGS="" + for file in $FILES; do + CONFIGS="${CONFIGS}'${file:12:-5}' or "; + done + echo "Need to set CONFIG env variable. Value can be one of ${CONFIGS:0:-4}" + exit 1 +fi + +if [ -z "${DOCKER_IMAGE}" ]; then + SHYAML_INSTALLED="$(shyaml -h || echo NO)" + if [ "${SHYAML_INSTALLED}" == "NO" ]; then + echo "WARNING: DOCKER_IMAGE variable not set and shyaml not installed. Trying to parse with coreutils" + DOCKER_IMAGE=$(cat .ci_support/${CONFIG}.yaml | grep '^docker_image:$' -A 1 | tail -n 1 | cut -b 3-) + if [ "${DOCKER_IMAGE}" = "" ]; then + echo "No docker_image entry found in ${CONFIG}. Falling back to quay.io/condaforge/linux-anvil-comp7" + DOCKER_IMAGE="quay.io/condaforge/linux-anvil-comp7" + fi + else + DOCKER_IMAGE="$(cat "${FEEDSTOCK_ROOT}/.ci_support/${CONFIG}.yaml" | shyaml get-value docker_image.0 quay.io/condaforge/linux-anvil-comp7 )" + fi +fi + +mkdir -p "$ARTIFACTS" +DONE_CANARY="$ARTIFACTS/conda-forge-build-done-${CONFIG}" +rm -f "$DONE_CANARY" + +# Allow people to specify extra default arguments to `docker run` (e.g. `--rm`) +DOCKER_RUN_ARGS="${CONDA_FORGE_DOCKER_RUN_ARGS}" +if [ -z "${CI}" ]; then + DOCKER_RUN_ARGS="-it ${DOCKER_RUN_ARGS}" +fi + +( endgroup "Configure Docker" ) 2> /dev/null + +( startgroup "Start Docker" ) 2> /dev/null + +export UPLOAD_PACKAGES="${UPLOAD_PACKAGES:-True}" +export IS_PR_BUILD="${IS_PR_BUILD:-False}" +docker pull "${DOCKER_IMAGE}" +docker run ${DOCKER_RUN_ARGS} \ + -v "${RECIPE_ROOT}":/home/conda/recipe_root:rw,z,delegated \ + -v "${FEEDSTOCK_ROOT}":/home/conda/feedstock_root:rw,z,delegated \ + -e CONFIG \ + -e HOST_USER_ID \ + -e UPLOAD_PACKAGES \ + -e IS_PR_BUILD \ + -e GIT_BRANCH \ + -e UPLOAD_ON_BRANCH \ + -e CI \ + -e FEEDSTOCK_NAME \ + -e CPU_COUNT \ + -e BUILD_WITH_CONDA_DEBUG \ + -e BUILD_OUTPUT_ID \ + -e flow_run_id \ + -e remote_url \ + -e sha \ + -e BINSTAR_TOKEN \ + -e FEEDSTOCK_TOKEN \ + -e STAGING_BINSTAR_TOKEN \ + "${DOCKER_IMAGE}" \ + bash \ + "/home/conda/feedstock_root/${PROVIDER_DIR}/build_steps.sh" + +# verify that the end of the script was reached +test -f "$DONE_CANARY" + +# This closes the last group opened in `build_steps.sh` +( endgroup "Final checks" ) 2> /dev/null \ No newline at end of file diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh new file mode 100755 index 000000000..0e3c39422 --- /dev/null +++ b/.scripts/run_osx_build.sh @@ -0,0 +1,120 @@ +#!/usr/bin/env bash + +# -*- mode: jinja-shell -*- + +source .scripts/logging_utils.sh + +set -xe + +MINIFORGE_HOME="${MINIFORGE_HOME:-${HOME}/miniforge3}" +MINIFORGE_HOME="${MINIFORGE_HOME%/}" # remove trailing slash +export CONDA_BLD_PATH="${CONDA_BLD_PATH:-${MINIFORGE_HOME}/conda-bld}" + +( startgroup "Provisioning base env with micromamba" ) 2> /dev/null +MICROMAMBA_VERSION="1.5.10-0" +if [[ "$(uname -m)" == "arm64" ]]; then + osx_arch="osx-arm64" +else + osx_arch="osx-64" +fi +MICROMAMBA_URL="https://github.com/mamba-org/micromamba-releases/releases/download/${MICROMAMBA_VERSION}/micromamba-${osx_arch}" +MAMBA_ROOT_PREFIX="${MINIFORGE_HOME}-micromamba-$(date +%s)" +echo "Downloading micromamba ${MICROMAMBA_VERSION}" +micromamba_exe="$(mktemp -d)/micromamba" +curl -L -o "${micromamba_exe}" "${MICROMAMBA_URL}" +chmod +x "${micromamba_exe}" +echo "Creating environment" +"${micromamba_exe}" create --yes --root-prefix "${MAMBA_ROOT_PREFIX}" --prefix "${MINIFORGE_HOME}" \ + --channel conda-forge \ + pip python=3.12 conda-build conda-forge-ci-setup=4 "conda-build>=24.1" +echo "Moving pkgs cache from ${MAMBA_ROOT_PREFIX} to ${MINIFORGE_HOME}" +mv "${MAMBA_ROOT_PREFIX}/pkgs" "${MINIFORGE_HOME}" +echo "Cleaning up micromamba" +rm -rf "${MAMBA_ROOT_PREFIX}" "${micromamba_exe}" || true +( endgroup "Provisioning base env with micromamba" ) 2> /dev/null + +( startgroup "Configuring conda" ) 2> /dev/null +echo "Activating environment" +source "${MINIFORGE_HOME}/etc/profile.d/conda.sh" +conda activate base +export CONDA_SOLVER="libmamba" +export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1 + + + + + +echo -e "\n\nSetting up the condarc and mangling the compiler." +setup_conda_rc ./ ./recipe ./.ci_support/${CONFIG}.yaml + +if [[ "${CI:-}" != "" ]]; then + mangle_compiler ./ ./recipe .ci_support/${CONFIG}.yaml +fi + +if [[ "${CI:-}" != "" ]]; then + echo -e "\n\nMangling homebrew in the CI to avoid conflicts." + /usr/bin/sudo mangle_homebrew + /usr/bin/sudo -k +else + echo -e "\n\nNot mangling homebrew as we are not running in CI" +fi + +if [[ "${sha:-}" == "" ]]; then + sha=$(git rev-parse HEAD) +fi + +echo -e "\n\nRunning the build setup script." +source run_conda_forge_build_setup + + + +( endgroup "Configuring conda" ) 2> /dev/null + +echo -e "\n\nMaking the build clobber file" +make_build_number ./ ./recipe ./.ci_support/${CONFIG}.yaml + +if [[ -f LICENSE.txt ]]; then + cp LICENSE.txt "recipe/recipe-scripts-license.txt" +fi + +if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then + if [[ "x${BUILD_OUTPUT_ID:-}" != "x" ]]; then + EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --output-id ${BUILD_OUTPUT_ID}" + fi + conda debug ./recipe -m ./.ci_support/${CONFIG}.yaml \ + ${EXTRA_CB_OPTIONS:-} \ + --clobber-file ./.ci_support/clobber_${CONFIG}.yaml + + # Drop into an interactive shell + /bin/bash +else + + if [[ "${HOST_PLATFORM}" != "${BUILD_PLATFORM}" ]]; then + EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --no-test" + fi + + conda-build ./recipe -m ./.ci_support/${CONFIG}.yaml \ + --suppress-variables ${EXTRA_CB_OPTIONS:-} \ + --clobber-file ./.ci_support/clobber_${CONFIG}.yaml \ + --extra-meta flow_run_id="$flow_run_id" remote_url="$remote_url" sha="$sha" + + ( startgroup "Inspecting artifacts" ) 2> /dev/null + + # inspect_artifacts was only added in conda-forge-ci-setup 4.9.4 + command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts --recipe-dir ./recipe -m ./.ci_support/${CONFIG}.yaml || echo "inspect_artifacts needs conda-forge-ci-setup >=4.9.4" + + ( endgroup "Inspecting artifacts" ) 2> /dev/null + ( startgroup "Validating outputs" ) 2> /dev/null + + validate_recipe_outputs "${FEEDSTOCK_NAME}" + + ( endgroup "Validating outputs" ) 2> /dev/null + + ( startgroup "Uploading packages" ) 2> /dev/null + + if [[ "${UPLOAD_PACKAGES}" != "False" ]] && [[ "${IS_PR_BUILD}" == "False" ]]; then + upload_package --validate --feedstock-name="${FEEDSTOCK_NAME}" ./ ./recipe ./.ci_support/${CONFIG}.yaml + fi + + ( endgroup "Uploading packages" ) 2> /dev/null +fi \ No newline at end of file diff --git a/README.md b/README.md index 7923cddab..22e879dc5 100644 --- a/README.md +++ b/README.md @@ -16,6 +16,185 @@ Current build status + + + + +
Azure +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
VariantStatus
linux_64_blas_implgenericc_compiler_version13channel_targetsconda-forge_maincuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13is_rcFalse + + variant + +
linux_64_blas_implgenericc_compiler_version13channel_targetsconda-forge_maincuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13is_rcFalse + + variant + +
linux_64_blas_implmklc_compiler_version13channel_targetsconda-forge_maincuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13is_rcFalse + + variant + +
linux_64_blas_implmklc_compiler_version13channel_targetsconda-forge_maincuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13is_rcFalse + + variant + +
linux_aarch64_c_compiler_version13channel_targetsconda-forge_maincuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13is_rcFalse + + variant + +
linux_aarch64_c_compiler_version13channel_targetsconda-forge_maincuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version13is_rcFalse + + variant + +
osx_64_blas_implgenericchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.10.____cpython + + variant + +
osx_64_blas_implgenericchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.11.____cpython + + variant + +
osx_64_blas_implgenericchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.12.____cpython + + variant + +
osx_64_blas_implgenericchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.9.____cpython + + variant + +
osx_64_blas_implgenericchannel_targetsconda-forge_mainis_rcFalsenumpy2python3.13.____cp313 + + variant + +
osx_64_blas_implmklchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.10.____cpython + + variant + +
osx_64_blas_implmklchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.11.____cpython + + variant + +
osx_64_blas_implmklchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.12.____cpython + + variant + +
osx_64_blas_implmklchannel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.9.____cpython + + variant + +
osx_64_blas_implmklchannel_targetsconda-forge_mainis_rcFalsenumpy2python3.13.____cp313 + + variant + +
osx_arm64_channel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.10.____cpython + + variant + +
osx_arm64_channel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.11.____cpython + + variant + +
osx_arm64_channel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.12.____cpython + + variant + +
osx_arm64_channel_targetsconda-forge_mainis_rcFalsenumpy2.0python3.9.____cpython + + variant + +
osx_arm64_channel_targetsconda-forge_mainis_rcFalsenumpy2python3.13.____cp313 + + variant + +
win_64_channel_targetsconda-forge_maincuda_compilerNonecuda_compiler_versionNoneis_rcFalse + + variant + +
win_64_channel_targetsconda-forge_maincuda_compilercuda-nvcccuda_compiler_version12.6is_rcFalse + + variant + +
+
+
Current release info @@ -26,6 +205,7 @@ Current release info | [![Conda Recipe](https://img.shields.io/badge/recipe-libtorch-green.svg)](https://anaconda.org/conda-forge/libtorch) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/libtorch.svg)](https://anaconda.org/conda-forge/libtorch) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/libtorch.svg)](https://anaconda.org/conda-forge/libtorch) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/libtorch.svg)](https://anaconda.org/conda-forge/libtorch) | | [![Conda Recipe](https://img.shields.io/badge/recipe-pytorch-green.svg)](https://anaconda.org/conda-forge/pytorch) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/pytorch.svg)](https://anaconda.org/conda-forge/pytorch) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/pytorch.svg)](https://anaconda.org/conda-forge/pytorch) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/pytorch.svg)](https://anaconda.org/conda-forge/pytorch) | | [![Conda Recipe](https://img.shields.io/badge/recipe-pytorch--cpu-green.svg)](https://anaconda.org/conda-forge/pytorch-cpu) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/pytorch-cpu.svg)](https://anaconda.org/conda-forge/pytorch-cpu) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/pytorch-cpu.svg)](https://anaconda.org/conda-forge/pytorch-cpu) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/pytorch-cpu.svg)](https://anaconda.org/conda-forge/pytorch-cpu) | +| [![Conda Recipe](https://img.shields.io/badge/recipe-pytorch--gpu-green.svg)](https://anaconda.org/conda-forge/pytorch-gpu) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/pytorch-gpu.svg)](https://anaconda.org/conda-forge/pytorch-gpu) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/pytorch-gpu.svg)](https://anaconda.org/conda-forge/pytorch-gpu) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/pytorch-gpu.svg)](https://anaconda.org/conda-forge/pytorch-gpu) | Installing pytorch-cpu ====================== @@ -37,16 +217,16 @@ conda config --add channels conda-forge conda config --set channel_priority strict ``` -Once the `conda-forge` channel has been enabled, `libtorch, pytorch, pytorch-cpu` can be installed with `conda`: +Once the `conda-forge` channel has been enabled, `libtorch, pytorch, pytorch-cpu, pytorch-gpu` can be installed with `conda`: ``` -conda install libtorch pytorch pytorch-cpu +conda install libtorch pytorch pytorch-cpu pytorch-gpu ``` or with `mamba`: ``` -mamba install libtorch pytorch pytorch-cpu +mamba install libtorch pytorch pytorch-cpu pytorch-gpu ``` It is possible to list all of the versions of `libtorch` available on your platform with `conda`: diff --git a/azure-pipelines.yml b/azure-pipelines.yml new file mode 100644 index 000000000..a13f0ae28 --- /dev/null +++ b/azure-pipelines.yml @@ -0,0 +1,31 @@ +# This file was generated automatically from conda-smithy. To update this configuration, +# update the conda-forge.yml and/or the recipe/meta.yaml. +# -*- mode: yaml -*- + +stages: +- stage: Check + jobs: + - job: Skip + pool: + vmImage: 'ubuntu-22.04' + variables: + DECODE_PERCENTS: 'false' + RET: 'true' + steps: + - checkout: self + fetchDepth: '2' + - bash: | + git_log=`git log --max-count=1 --skip=1 --pretty=format:"%B" | tr "\n" " "` + echo "##vso[task.setvariable variable=log]$git_log" + displayName: Obtain commit message + - bash: echo "##vso[task.setvariable variable=RET]false" + condition: and(eq(variables['Build.Reason'], 'PullRequest'), or(contains(variables.log, '[skip azp]'), contains(variables.log, '[azp skip]'), contains(variables.log, '[skip ci]'), contains(variables.log, '[ci skip]'))) + displayName: Skip build? + - bash: echo "##vso[task.setvariable variable=start_main;isOutput=true]$RET" + name: result + displayName: Export result +- stage: Build + condition: and(succeeded(), eq(dependencies.Check.outputs['Skip.result.start_main'], 'true')) + dependsOn: Check + jobs: + - template: ./.azure-pipelines/azure-pipelines-osx.yml \ No newline at end of file From 1c3a92538789daeba107a9bc03647fd6138e397e Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Fri, 24 Jan 2025 09:31:11 +1100 Subject: [PATCH 40/43] Revert "pin python in build environment to same version as in host" This reverts commit fc5693c26e749f09f5cf314c4d77b32ce2290248. --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index f55bdc1a5..ef8228cd3 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -279,7 +279,7 @@ outputs: - libcusparse-dev {% endif %} # other requirements - - python {{ python }} + - python - numpy - pip # see https://github.com/pytorch/pytorch/issues/136541 From e067df153f87fc19d629ddf07ef664e7520b964a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Thu, 23 Jan 2025 17:42:24 +0100 Subject: [PATCH 41/43] Remove TH_BINARY_BUILD Fixes #330 --- recipe/bld.bat | 1 - recipe/build.sh | 1 - 2 files changed, 2 deletions(-) diff --git a/recipe/bld.bat b/recipe/bld.bat index dd597fa4d..e4d0bae51 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -7,7 +7,6 @@ if EXIST pyproject.toml ( if %ERRORLEVEL% neq 0 exit 1 ) -set TH_BINARY_BUILD=1 set PYTORCH_BUILD_VERSION=%PKG_VERSION% @REM Always pass 0 to avoid appending ".post" to version string. @REM https://github.com/conda-forge/pytorch-cpu-feedstock/issues/315 diff --git a/recipe/build.sh b/recipe/build.sh index 973d2c55f..57044b090 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -61,7 +61,6 @@ for ARG in $CMAKE_ARGS; do done CMAKE_FIND_ROOT_PATH+=";$SRC_DIR" unset CMAKE_INSTALL_PREFIX -export TH_BINARY_BUILD=1 export PYTORCH_BUILD_VERSION=$PKG_VERSION # Always pass 0 to avoid appending ".post" to version string. # https://github.com/conda-forge/pytorch-cpu-feedstock/issues/315 From 6fb1a3ed4a35f773298a2b36aed72379990a05d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Thu, 23 Jan 2025 17:45:01 +0100 Subject: [PATCH 42/43] Remove no-longer-needed libcufile build patch This patch was only needed because of `TH_BINARY_BUILD`. --- recipe/meta.yaml | 21 ++++++++---------- ...-of-python-3-and-error-without-numpy.patch | 9 +++++--- recipe/patches/0002-Help-find-numpy.patch | 9 +++++--- ...03-Add-USE_SYSTEM_NVTX-option-138287.patch | 13 ++++++----- .../patches/0004-Update-sympy-version.patch | 9 +++++--- .../0005-Fix-duplicate-linker-script.patch | 9 +++++--- ...kle-error-in-serialization.py-136034.patch | 9 +++++--- ...verwrite-ld-with-environment-variabl.patch | 9 +++++--- ...008-Allow-libcufile-for-conda-builds.patch | 22 ------------------- ...Allow-overriding-CUDA-related-paths.patch} | 11 ++++++---- ...t-test_linalg.py-for-NumPy-2-136800.patch} | 9 +++++--- ...st-failures-in-test_torch.py-137740.patch} | 9 +++++--- ...S_USE_CBLAS_DOT-for-OpenBLAS-builds.patch} | 9 +++++--- ...2484.patch => 0012-fix-issue-142484.patch} | 9 +++++--- ...BLAS.patch => 0013-Fix-FindOpenBLAS.patch} | 9 +++++--- ...nable-Python-3.13-on-windows-138095.patch} | 11 ++++++---- ...ils.cpp_extension.include_paths-use.patch} | 11 ++++++---- ...int-include-paths-to-PREFIX-include.patch} | 9 +++++--- 18 files changed, 110 insertions(+), 87 deletions(-) delete mode 100644 recipe/patches/0008-Allow-libcufile-for-conda-builds.patch rename recipe/patches/{0009-Allow-overriding-CUDA-related-paths.patch => 0008-Allow-overriding-CUDA-related-paths.patch} (88%) rename recipe/patches/{0010-Fix-test-test_linalg.py-for-NumPy-2-136800.patch => 0009-Fix-test-test_linalg.py-for-NumPy-2-136800.patch} (96%) rename recipe/patches/{0011-Fixes-NumPy-2-test-failures-in-test_torch.py-137740.patch => 0010-Fixes-NumPy-2-test-failures-in-test_torch.py-137740.patch} (93%) rename recipe/patches/{0012-Use-BLAS_USE_CBLAS_DOT-for-OpenBLAS-builds.patch => 0011-Use-BLAS_USE_CBLAS_DOT-for-OpenBLAS-builds.patch} (89%) rename recipe/patches/{0013-fix-issue-142484.patch => 0012-fix-issue-142484.patch} (88%) rename recipe/patches/{0014-Fix-FindOpenBLAS.patch => 0013-Fix-FindOpenBLAS.patch} (90%) rename recipe/patches/{0015-CD-Enable-Python-3.13-on-windows-138095.patch => 0014-CD-Enable-Python-3.13-on-windows-138095.patch} (88%) rename recipe/patches/{0016-simplify-torch.utils.cpp_extension.include_paths-use.patch => 0015-simplify-torch.utils.cpp_extension.include_paths-use.patch} (91%) rename recipe/patches/{0017-point-include-paths-to-PREFIX-include.patch => 0016-point-include-paths-to-PREFIX-include.patch} (89%) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index ef8228cd3..d5fc48f5d 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -45,28 +45,25 @@ source: - patches/0006-fix-3.13-pickle-error-in-serialization.py-136034.patch # https://github.com/pytorch/pytorch/pull/137331 - patches/0007-Allow-users-to-overwrite-ld-with-environment-variabl.patch - # conda-specific patch, upstream force-disables libcufile w/ TH_BINARY_BUILD - # for their PyPI wheel builds - - patches/0008-Allow-libcufile-for-conda-builds.patch # conda-specific patch, lets us override CUDA paths - - patches/0009-Allow-overriding-CUDA-related-paths.patch + - patches/0008-Allow-overriding-CUDA-related-paths.patch # NumPy 2 fixes: # https://github.com/pytorch/pytorch/pull/136800 - - patches/0010-Fix-test-test_linalg.py-for-NumPy-2-136800.patch + - patches/0009-Fix-test-test_linalg.py-for-NumPy-2-136800.patch # https://github.com/pytorch/pytorch/pull/137740 - - patches/0011-Fixes-NumPy-2-test-failures-in-test_torch.py-137740.patch + - patches/0010-Fixes-NumPy-2-test-failures-in-test_torch.py-137740.patch # fix BLAS calling convention for openblas - - patches/0012-Use-BLAS_USE_CBLAS_DOT-for-OpenBLAS-builds.patch + - patches/0011-Use-BLAS_USE_CBLAS_DOT-for-OpenBLAS-builds.patch # fix mkl-2024 issue # https://github.com/pytorch/pytorch/pull/143894 - - patches/0013-fix-issue-142484.patch - - patches/0014-Fix-FindOpenBLAS.patch + - patches/0012-fix-issue-142484.patch + - patches/0013-Fix-FindOpenBLAS.patch # backport https://github.com/pytorch/pytorch/pull/138095 - - patches/0015-CD-Enable-Python-3.13-on-windows-138095.patch + - patches/0014-CD-Enable-Python-3.13-on-windows-138095.patch # backport https://github.com/pytorch/pytorch/pull/145480 - - patches/0016-simplify-torch.utils.cpp_extension.include_paths-use.patch + - patches/0015-simplify-torch.utils.cpp_extension.include_paths-use.patch # point to headers that are now living in $PREFIX/include instead of $SP_DIR/torch/include - - patches/0017-point-include-paths-to-PREFIX-include.patch + - patches/0016-point-include-paths-to-PREFIX-include.patch build: number: {{ build }} diff --git a/recipe/patches/0001-Force-usage-of-python-3-and-error-without-numpy.patch b/recipe/patches/0001-Force-usage-of-python-3-and-error-without-numpy.patch index 9261e825c..4ce6492a0 100644 --- a/recipe/patches/0001-Force-usage-of-python-3-and-error-without-numpy.patch +++ b/recipe/patches/0001-Force-usage-of-python-3-and-error-without-numpy.patch @@ -1,14 +1,14 @@ -From f3a0f9aab6dce56eea590b946f60256014b61bf7 Mon Sep 17 00:00:00 2001 +From 756045fca376345e48afb6a868b502dbfa0c584c Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Sun, 1 Sep 2024 17:35:40 -0400 -Subject: [PATCH 01/17] Force usage of python 3 and error without numpy +Subject: [PATCH 01/16] Force usage of python 3 and error without numpy --- cmake/Dependencies.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake -index e78305e0a8e..15c62548601 100644 +index e78305e0a..15c625486 100644 --- a/cmake/Dependencies.cmake +++ b/cmake/Dependencies.cmake @@ -861,9 +861,9 @@ if(BUILD_PYTHON) @@ -32,3 +32,6 @@ index e78305e0a8e..15c62548601 100644 caffe2_update_option(USE_NUMPY OFF) else() caffe2_update_option(USE_NUMPY ON) +-- +2.48.1 + diff --git a/recipe/patches/0002-Help-find-numpy.patch b/recipe/patches/0002-Help-find-numpy.patch index ff94df907..6f3fa2c36 100644 --- a/recipe/patches/0002-Help-find-numpy.patch +++ b/recipe/patches/0002-Help-find-numpy.patch @@ -1,14 +1,14 @@ -From 21c30036b5b86f403c0cf4426165d9a6a50edb1a Mon Sep 17 00:00:00 2001 +From 70661ad52cb2f0290de3e0758f240560e4b1e769 Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Tue, 1 Oct 2024 00:28:40 -0400 -Subject: [PATCH 02/17] Help find numpy +Subject: [PATCH 02/16] Help find numpy --- tools/setup_helpers/cmake.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tools/setup_helpers/cmake.py b/tools/setup_helpers/cmake.py -index 4b605fe5975..bde41323c76 100644 +index 4b605fe59..bde41323c 100644 --- a/tools/setup_helpers/cmake.py +++ b/tools/setup_helpers/cmake.py @@ -305,9 +305,15 @@ class CMake: @@ -27,3 +27,6 @@ index 4b605fe5975..bde41323c76 100644 TORCH_BUILD_VERSION=version, **build_options, ) +-- +2.48.1 + diff --git a/recipe/patches/0003-Add-USE_SYSTEM_NVTX-option-138287.patch b/recipe/patches/0003-Add-USE_SYSTEM_NVTX-option-138287.patch index 651017639..af8662e42 100644 --- a/recipe/patches/0003-Add-USE_SYSTEM_NVTX-option-138287.patch +++ b/recipe/patches/0003-Add-USE_SYSTEM_NVTX-option-138287.patch @@ -1,7 +1,7 @@ -From d1826af525db41eda5020a1404f5d5521d67a5dc Mon Sep 17 00:00:00 2001 +From 4ae61d17c81e9d66e091c2790ac6deae6bf31204 Mon Sep 17 00:00:00 2001 From: Jeongseok Lee Date: Sat, 19 Oct 2024 04:26:01 +0000 -Subject: [PATCH 03/17] Add USE_SYSTEM_NVTX option (#138287) +Subject: [PATCH 03/16] Add USE_SYSTEM_NVTX option (#138287) ## Summary @@ -21,7 +21,7 @@ Approved by: https://github.com/albanD 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 98593c2de97..ae3c3f2cbd5 100644 +index 98593c2de..ae3c3f2cb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -470,6 +470,7 @@ option(USE_SYSTEM_FXDIV "Use system-provided fxdiv." OFF) @@ -41,7 +41,7 @@ index 98593c2de97..ae3c3f2cbd5 100644 # /Z7 override option When generating debug symbols, CMake default to use the diff --git a/cmake/public/cuda.cmake b/cmake/public/cuda.cmake -index afc1bc12abf..152fbdbe6dd 100644 +index afc1bc12a..152fbdbe6 100644 --- a/cmake/public/cuda.cmake +++ b/cmake/public/cuda.cmake @@ -170,7 +170,11 @@ else() @@ -58,7 +58,7 @@ index afc1bc12abf..152fbdbe6dd 100644 if(nvtx3_FOUND) add_library(torch::nvtx3 INTERFACE IMPORTED) diff --git a/setup.py b/setup.py -index 2b0cfa99d71..7174777ed4e 100644 +index 2b0cfa99d..7174777ed 100644 --- a/setup.py +++ b/setup.py @@ -183,7 +183,21 @@ @@ -84,3 +84,6 @@ index 2b0cfa99d71..7174777ed4e 100644 # # USE_MIMALLOC # Static link mimalloc into C10, and use mimalloc in alloc_cpu & alloc_free. +-- +2.48.1 + diff --git a/recipe/patches/0004-Update-sympy-version.patch b/recipe/patches/0004-Update-sympy-version.patch index eda585111..5dd72f7c1 100644 --- a/recipe/patches/0004-Update-sympy-version.patch +++ b/recipe/patches/0004-Update-sympy-version.patch @@ -1,14 +1,14 @@ -From e3219c5fe8834753b0cf9e92be4d1ef1e874f370 Mon Sep 17 00:00:00 2001 +From 2c6db02c01ad080c8dc8ae0b78be2b93099c2ac8 Mon Sep 17 00:00:00 2001 From: Jeongseok Lee Date: Thu, 17 Oct 2024 15:04:05 -0700 -Subject: [PATCH 04/17] Update sympy version +Subject: [PATCH 04/16] Update sympy version --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py -index 7174777ed4e..65be34e39b1 100644 +index 7174777ed..65be34e39 100644 --- a/setup.py +++ b/setup.py @@ -1158,7 +1158,7 @@ def main(): @@ -20,3 +20,6 @@ index 7174777ed4e..65be34e39b1 100644 "networkx", "jinja2", "fsspec", +-- +2.48.1 + diff --git a/recipe/patches/0005-Fix-duplicate-linker-script.patch b/recipe/patches/0005-Fix-duplicate-linker-script.patch index 6ab800fe5..7cc824352 100644 --- a/recipe/patches/0005-Fix-duplicate-linker-script.patch +++ b/recipe/patches/0005-Fix-duplicate-linker-script.patch @@ -1,14 +1,14 @@ -From 08a1f44fbc81324aa98d720dfb7b87a261923ac2 Mon Sep 17 00:00:00 2001 +From fa5bb8f1acd0195efadc35c8fbb9199be92932d9 Mon Sep 17 00:00:00 2001 From: Jeongseok Lee Date: Sun, 3 Nov 2024 01:12:36 -0700 -Subject: [PATCH 05/17] Fix duplicate linker script +Subject: [PATCH 05/16] Fix duplicate linker script --- setup.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py -index 65be34e39b1..b0e01e0d1ee 100644 +index 65be34e39..b0e01e0d1 100644 --- a/setup.py +++ b/setup.py @@ -1184,7 +1184,9 @@ def main(): @@ -22,3 +22,6 @@ index 65be34e39b1..b0e01e0d1ee 100644 os.environ["CFLAGS"] = ( os.getenv("CFLAGS", "") + " -ffunction-sections -fdata-sections" ) +-- +2.48.1 + diff --git a/recipe/patches/0006-fix-3.13-pickle-error-in-serialization.py-136034.patch b/recipe/patches/0006-fix-3.13-pickle-error-in-serialization.py-136034.patch index ea928c2d8..cddb8b68c 100644 --- a/recipe/patches/0006-fix-3.13-pickle-error-in-serialization.py-136034.patch +++ b/recipe/patches/0006-fix-3.13-pickle-error-in-serialization.py-136034.patch @@ -1,7 +1,7 @@ -From 15df314a41c69a31c0443254d5552aa1b39d708d Mon Sep 17 00:00:00 2001 +From 6fc695312cd062e13c2482b52ae8d028bd7c043a Mon Sep 17 00:00:00 2001 From: William Wen Date: Fri, 13 Sep 2024 13:02:33 -0700 -Subject: [PATCH 06/17] fix 3.13 pickle error in serialization.py (#136034) +Subject: [PATCH 06/16] fix 3.13 pickle error in serialization.py (#136034) Error encountered when adding dynamo 3.13 support. Pull Request resolved: https://github.com/pytorch/pytorch/pull/136034 @@ -11,7 +11,7 @@ Approved by: https://github.com/albanD 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/torch/serialization.py b/torch/serialization.py -index d936d31d6f5..d937680c031 100644 +index d936d31d6..d937680c0 100644 --- a/torch/serialization.py +++ b/torch/serialization.py @@ -1005,8 +1005,12 @@ def _legacy_save(obj, f, pickle_module, pickle_protocol) -> None: @@ -44,3 +44,6 @@ index d936d31d6f5..d937680c031 100644 pickler.dump(obj) data_value = data_buf.getvalue() zip_file.write_record("data.pkl", data_value, len(data_value)) +-- +2.48.1 + diff --git a/recipe/patches/0007-Allow-users-to-overwrite-ld-with-environment-variabl.patch b/recipe/patches/0007-Allow-users-to-overwrite-ld-with-environment-variabl.patch index 046b0d60f..b847ba1ae 100644 --- a/recipe/patches/0007-Allow-users-to-overwrite-ld-with-environment-variabl.patch +++ b/recipe/patches/0007-Allow-users-to-overwrite-ld-with-environment-variabl.patch @@ -1,7 +1,7 @@ -From 655f694854c3eafdd631235b60bc6c1b279218ed Mon Sep 17 00:00:00 2001 +From d5c8df70422afa07dc212266d420f923f5887f99 Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Thu, 3 Oct 2024 22:49:56 -0400 -Subject: [PATCH 07/17] Allow users to overwrite ld with environment variables +Subject: [PATCH 07/16] Allow users to overwrite ld with environment variables This should help in the case of cross compilation. @@ -11,7 +11,7 @@ xref: https://github.com/conda-forge/pytorch-cpu-feedstock/pull/261 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/setup_helpers/generate_linker_script.py b/tools/setup_helpers/generate_linker_script.py -index 11c397a9e5f..e66fc197062 100644 +index 11c397a9e..e66fc1970 100644 --- a/tools/setup_helpers/generate_linker_script.py +++ b/tools/setup_helpers/generate_linker_script.py @@ -1,3 +1,4 @@ @@ -30,3 +30,6 @@ index 11c397a9e5f..e66fc197062 100644 "\n" ) +-- +2.48.1 + diff --git a/recipe/patches/0008-Allow-libcufile-for-conda-builds.patch b/recipe/patches/0008-Allow-libcufile-for-conda-builds.patch deleted file mode 100644 index 7e6ca54c6..000000000 --- a/recipe/patches/0008-Allow-libcufile-for-conda-builds.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 2578bf017b0453c8eb028a09b7523fb150429eca Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= -Date: Fri, 22 Nov 2024 17:50:53 +0100 -Subject: [PATCH 08/17] Allow libcufile for conda builds - ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index ae3c3f2cbd5..3a845151cf8 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -255,7 +255,7 @@ cmake_dependent_option(USE_CUDSS "Use cuDSS" ON "USE_CUDA" OFF) - # Binary builds will fail for cufile due to https://github.com/pytorch/builder/issues/1924 - # Using TH_BINARY_BUILD to check whether is binary build. - # USE_ROCM is guarded against in Dependencies.cmake because USE_ROCM is not properly defined here --if(DEFINED ENV{TH_BINARY_BUILD}) -+if(FALSE) - cmake_dependent_option(USE_CUFILE "Use cuFile" OFF - "USE_CUDA AND NOT $ENV{TH_BINARY_BUILD} AND NOT WIN32" OFF) - else() diff --git a/recipe/patches/0009-Allow-overriding-CUDA-related-paths.patch b/recipe/patches/0008-Allow-overriding-CUDA-related-paths.patch similarity index 88% rename from recipe/patches/0009-Allow-overriding-CUDA-related-paths.patch rename to recipe/patches/0008-Allow-overriding-CUDA-related-paths.patch index a164eb1ca..272d200cf 100644 --- a/recipe/patches/0009-Allow-overriding-CUDA-related-paths.patch +++ b/recipe/patches/0008-Allow-overriding-CUDA-related-paths.patch @@ -1,7 +1,7 @@ -From 52e530f222f2d30531c8da889695ac2674964245 Mon Sep 17 00:00:00 2001 +From da7b07f8e3165bf89b08b5a716e539ae9a7afb1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Wed, 27 Nov 2024 13:47:23 +0100 -Subject: [PATCH 09/17] Allow overriding CUDA-related paths +Subject: [PATCH 08/16] Allow overriding CUDA-related paths --- cmake/Modules/FindCUDAToolkit.cmake | 2 +- @@ -9,7 +9,7 @@ Subject: [PATCH 09/17] Allow overriding CUDA-related paths 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/Modules/FindCUDAToolkit.cmake b/cmake/Modules/FindCUDAToolkit.cmake -index ec9ae530aa6..b7c0bd9fc51 100644 +index ec9ae530a..b7c0bd9fc 100644 --- a/cmake/Modules/FindCUDAToolkit.cmake +++ b/cmake/Modules/FindCUDAToolkit.cmake @@ -497,7 +497,7 @@ Result variables @@ -22,7 +22,7 @@ index ec9ae530aa6..b7c0bd9fc51 100644 set(CUDAToolkit_LIBRARY_ROOT "${CMAKE_CUDA_COMPILER_LIBRARY_ROOT}") set(CUDAToolkit_VERSION "${CMAKE_CUDA_COMPILER_TOOLKIT_VERSION}") diff --git a/tools/setup_helpers/cmake.py b/tools/setup_helpers/cmake.py -index bde41323c76..b171837cd4a 100644 +index bde41323c..b171837cd 100644 --- a/tools/setup_helpers/cmake.py +++ b/tools/setup_helpers/cmake.py @@ -252,7 +252,7 @@ class CMake: @@ -34,3 +34,6 @@ index bde41323c76..b171837cd4a 100644 ("EXITCODE", "EXITCODE__TRYRUN_OUTPUT") ): build_options[var] = val +-- +2.48.1 + diff --git a/recipe/patches/0010-Fix-test-test_linalg.py-for-NumPy-2-136800.patch b/recipe/patches/0009-Fix-test-test_linalg.py-for-NumPy-2-136800.patch similarity index 96% rename from recipe/patches/0010-Fix-test-test_linalg.py-for-NumPy-2-136800.patch rename to recipe/patches/0009-Fix-test-test_linalg.py-for-NumPy-2-136800.patch index b005bfc98..e1befef6a 100644 --- a/recipe/patches/0010-Fix-test-test_linalg.py-for-NumPy-2-136800.patch +++ b/recipe/patches/0009-Fix-test-test_linalg.py-for-NumPy-2-136800.patch @@ -1,7 +1,7 @@ -From db0902077a0ef68d0a48ae42f3b60f9cff7b2248 Mon Sep 17 00:00:00 2001 +From 3429795de33cac2e508397dd2d9f5f5c96f185c3 Mon Sep 17 00:00:00 2001 From: Haifeng Jin Date: Tue, 1 Oct 2024 07:53:24 +0000 -Subject: [PATCH 10/17] Fix test/test_linalg.py for NumPy 2 (#136800) +Subject: [PATCH 09/16] Fix test/test_linalg.py for NumPy 2 (#136800) Related to #107302. @@ -36,7 +36,7 @@ Approved by: https://github.com/lezcano 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/test/test_linalg.py b/test/test_linalg.py -index e9ec874d695..060bccef2e5 100644 +index e9ec874d6..060bccef2 100644 --- a/test/test_linalg.py +++ b/test/test_linalg.py @@ -2351,7 +2351,7 @@ class TestLinalg(TestCase): @@ -75,3 +75,6 @@ index e9ec874d695..060bccef2e5 100644 reflectors_i[:] = reflectors_tmp.T reflectors = reflectors.view(*A_cpu.shape) tau = tau.view(tau_shape) +-- +2.48.1 + diff --git a/recipe/patches/0011-Fixes-NumPy-2-test-failures-in-test_torch.py-137740.patch b/recipe/patches/0010-Fixes-NumPy-2-test-failures-in-test_torch.py-137740.patch similarity index 93% rename from recipe/patches/0011-Fixes-NumPy-2-test-failures-in-test_torch.py-137740.patch rename to recipe/patches/0010-Fixes-NumPy-2-test-failures-in-test_torch.py-137740.patch index 962adf146..bd5aa553e 100644 --- a/recipe/patches/0011-Fixes-NumPy-2-test-failures-in-test_torch.py-137740.patch +++ b/recipe/patches/0010-Fixes-NumPy-2-test-failures-in-test_torch.py-137740.patch @@ -1,7 +1,7 @@ -From a1ced1daa37fdcf5345aa0c3095cab8674c1cded Mon Sep 17 00:00:00 2001 +From a8ddbe6b682347fdc86c5052b244df4f95b926ac Mon Sep 17 00:00:00 2001 From: Haifeng Jin Date: Sat, 12 Oct 2024 02:40:17 +0000 -Subject: [PATCH 11/17] Fixes NumPy 2 test failures in test_torch.py (#137740) +Subject: [PATCH 10/16] Fixes NumPy 2 test failures in test_torch.py (#137740) Related to #107302 @@ -24,7 +24,7 @@ Approved by: https://github.com/ezyang 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/test_torch.py b/test/test_torch.py -index be4d6180819..c6fd6ac9f19 100644 +index be4d61808..c6fd6ac9f 100644 --- a/test/test_torch.py +++ b/test/test_torch.py @@ -2891,7 +2891,7 @@ else: @@ -58,3 +58,6 @@ index be4d6180819..c6fd6ac9f19 100644 ) @skipIfTorchDynamo("np.float64 restored as float32 after graph break.") +-- +2.48.1 + diff --git a/recipe/patches/0012-Use-BLAS_USE_CBLAS_DOT-for-OpenBLAS-builds.patch b/recipe/patches/0011-Use-BLAS_USE_CBLAS_DOT-for-OpenBLAS-builds.patch similarity index 89% rename from recipe/patches/0012-Use-BLAS_USE_CBLAS_DOT-for-OpenBLAS-builds.patch rename to recipe/patches/0011-Use-BLAS_USE_CBLAS_DOT-for-OpenBLAS-builds.patch index 7e7ccfdd4..2d9b19958 100644 --- a/recipe/patches/0012-Use-BLAS_USE_CBLAS_DOT-for-OpenBLAS-builds.patch +++ b/recipe/patches/0011-Use-BLAS_USE_CBLAS_DOT-for-OpenBLAS-builds.patch @@ -1,7 +1,7 @@ -From e74a39d09953d4c4dd293e167121cfe83fb172ec Mon Sep 17 00:00:00 2001 +From 113c9ebec11cba2f1d43bfd4ac03eb02c5c921a8 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Wed, 18 Dec 2024 03:59:00 +0000 -Subject: [PATCH 12/17] Use BLAS_USE_CBLAS_DOT for OpenBLAS builds +Subject: [PATCH 11/16] Use BLAS_USE_CBLAS_DOT for OpenBLAS builds There are two calling conventions for *dotu functions @@ -31,7 +31,7 @@ functional calls. 1 file changed, 1 insertion(+) diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake -index 15c62548601..3965416eb29 100644 +index 15c625486..3965416eb 100644 --- a/cmake/Dependencies.cmake +++ b/cmake/Dependencies.cmake @@ -182,6 +182,7 @@ elseif(BLAS STREQUAL "OpenBLAS") @@ -42,3 +42,6 @@ index 15c62548601..3965416eb29 100644 elseif(BLAS STREQUAL "BLIS") find_package(BLIS REQUIRED) include_directories(SYSTEM ${BLIS_INCLUDE_DIR}) +-- +2.48.1 + diff --git a/recipe/patches/0013-fix-issue-142484.patch b/recipe/patches/0012-fix-issue-142484.patch similarity index 88% rename from recipe/patches/0013-fix-issue-142484.patch rename to recipe/patches/0012-fix-issue-142484.patch index 4fdb5d7a7..bb4a2e6e5 100644 --- a/recipe/patches/0013-fix-issue-142484.patch +++ b/recipe/patches/0012-fix-issue-142484.patch @@ -1,7 +1,7 @@ -From 67b122f715e93592f1d7913ab970619f7b571b96 Mon Sep 17 00:00:00 2001 +From 323bb15a6b1f601d79211bd292c26cb886a5d60e Mon Sep 17 00:00:00 2001 From: "Zheng, Zhaoqiong" Date: Fri, 27 Dec 2024 13:49:36 +0800 -Subject: [PATCH 13/17] fix issue 142484 +Subject: [PATCH 12/16] fix issue 142484 From https://github.com/pytorch/pytorch/pull/143894 --- @@ -9,7 +9,7 @@ From https://github.com/pytorch/pytorch/pull/143894 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/aten/src/ATen/native/mkl/SpectralOps.cpp b/aten/src/ATen/native/mkl/SpectralOps.cpp -index e26cfbf6d8e..c61b76d3205 100644 +index e26cfbf6d..c61b76d32 100644 --- a/aten/src/ATen/native/mkl/SpectralOps.cpp +++ b/aten/src/ATen/native/mkl/SpectralOps.cpp @@ -477,7 +477,17 @@ static Tensor& _exec_fft(Tensor& out, const Tensor& self, IntArrayRef out_sizes, @@ -31,3 +31,6 @@ index e26cfbf6d8e..c61b76d3205 100644 auto descriptor = _plan_mkl_fft( input.strides(), out.strides(), signal_size, input.is_complex(), out.is_complex(), normalization, forward, value_type); +-- +2.48.1 + diff --git a/recipe/patches/0014-Fix-FindOpenBLAS.patch b/recipe/patches/0013-Fix-FindOpenBLAS.patch similarity index 90% rename from recipe/patches/0014-Fix-FindOpenBLAS.patch rename to recipe/patches/0013-Fix-FindOpenBLAS.patch index e27613b3c..47e348855 100644 --- a/recipe/patches/0014-Fix-FindOpenBLAS.patch +++ b/recipe/patches/0013-Fix-FindOpenBLAS.patch @@ -1,14 +1,14 @@ -From a6924f47769d3d068b6d8e40686733b7ff32544e Mon Sep 17 00:00:00 2001 +From 4ca7ade3211380629ab56f3c965edd1b6387d1e0 Mon Sep 17 00:00:00 2001 From: Bas Zalmstra Date: Thu, 16 May 2024 10:46:49 +0200 -Subject: [PATCH 14/17] Fix FindOpenBLAS +Subject: [PATCH 13/16] Fix FindOpenBLAS --- cmake/Modules/FindOpenBLAS.cmake | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/cmake/Modules/FindOpenBLAS.cmake b/cmake/Modules/FindOpenBLAS.cmake -index 69d8227aea5..0d12185c799 100644 +index 69d8227ae..0d12185c7 100644 --- a/cmake/Modules/FindOpenBLAS.cmake +++ b/cmake/Modules/FindOpenBLAS.cmake @@ -31,22 +31,25 @@ SET(Open_BLAS_LIB_SEARCH_PATHS @@ -43,3 +43,6 @@ index 69d8227aea5..0d12185c799 100644 IF (OpenBLAS_FOUND) IF (NOT OpenBLAS_FIND_QUIETLY) +-- +2.48.1 + diff --git a/recipe/patches/0015-CD-Enable-Python-3.13-on-windows-138095.patch b/recipe/patches/0014-CD-Enable-Python-3.13-on-windows-138095.patch similarity index 88% rename from recipe/patches/0015-CD-Enable-Python-3.13-on-windows-138095.patch rename to recipe/patches/0014-CD-Enable-Python-3.13-on-windows-138095.patch index 391496b0a..031fce6d8 100644 --- a/recipe/patches/0015-CD-Enable-Python-3.13-on-windows-138095.patch +++ b/recipe/patches/0014-CD-Enable-Python-3.13-on-windows-138095.patch @@ -1,7 +1,7 @@ -From 66fa234eccfe98339bfa2bba6eae425ce27a037d Mon Sep 17 00:00:00 2001 +From 3b32a078793f06e80d88c356871953f254d4d6c3 Mon Sep 17 00:00:00 2001 From: atalman Date: Tue, 12 Nov 2024 12:28:10 +0000 -Subject: [PATCH 15/17] CD Enable Python 3.13 on windows (#138095) +Subject: [PATCH 14/16] CD Enable Python 3.13 on windows (#138095) Adding CD windows. Part of: https://github.com/pytorch/pytorch/issues/130249 Builder PR landed with smoke test: https://github.com/pytorch/builder/pull/2035 @@ -16,7 +16,7 @@ Cherry-pick-note: minus changes in `.github/*` 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/functorch/csrc/dim/dim.cpp b/functorch/csrc/dim/dim.cpp -index 722618efbb0..f98818bfdcc 100644 +index 722618efb..f98818bfd 100644 --- a/functorch/csrc/dim/dim.cpp +++ b/functorch/csrc/dim/dim.cpp @@ -38,6 +38,7 @@ PyObject* Dim_init() { @@ -28,7 +28,7 @@ index 722618efbb0..f98818bfdcc 100644 #include "internal/pycore_opcode.h" #undef Py_BUILD_CORE diff --git a/functorch/csrc/dim/dim_opcode.c b/functorch/csrc/dim/dim_opcode.c -index 81ba62a3781..1b5d0677344 100644 +index 81ba62a37..1b5d06773 100644 --- a/functorch/csrc/dim/dim_opcode.c +++ b/functorch/csrc/dim/dim_opcode.c @@ -1,6 +1,17 @@ @@ -50,3 +50,6 @@ index 81ba62a3781..1b5d0677344 100644 +#undef NEED_OPCODE_TABLES +#undef Py_BUILD_CORE +#endif +-- +2.48.1 + diff --git a/recipe/patches/0016-simplify-torch.utils.cpp_extension.include_paths-use.patch b/recipe/patches/0015-simplify-torch.utils.cpp_extension.include_paths-use.patch similarity index 91% rename from recipe/patches/0016-simplify-torch.utils.cpp_extension.include_paths-use.patch rename to recipe/patches/0015-simplify-torch.utils.cpp_extension.include_paths-use.patch index 99eb183cb..e8ff9e592 100644 --- a/recipe/patches/0016-simplify-torch.utils.cpp_extension.include_paths-use.patch +++ b/recipe/patches/0015-simplify-torch.utils.cpp_extension.include_paths-use.patch @@ -1,7 +1,7 @@ -From d28eeca9a0692c0783bcbb9626917e87396128cd Mon Sep 17 00:00:00 2001 +From 4465b713563855e7eb5475758226f3a90f675f55 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Thu, 23 Jan 2025 22:46:58 +1100 -Subject: [PATCH 16/17] simplify torch.utils.cpp_extension.include_paths; use +Subject: [PATCH 15/16] simplify torch.utils.cpp_extension.include_paths; use it in cpp_builder The /TH headers have not existed since pytorch 1.11 @@ -11,7 +11,7 @@ The /TH headers have not existed since pytorch 1.11 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/torch/_inductor/cpp_builder.py b/torch/_inductor/cpp_builder.py -index 95a0bff86fd..860e7fb062f 100644 +index 95a0bff86..860e7fb06 100644 --- a/torch/_inductor/cpp_builder.py +++ b/torch/_inductor/cpp_builder.py @@ -743,16 +743,9 @@ def _get_build_args_of_chosen_isa(vec_isa: VecISA) -> Tuple[List[str], List[str] @@ -35,7 +35,7 @@ index 95a0bff86fd..860e7fb062f 100644 libraries = [] if sys.platform != "darwin" and not config.is_fbcode(): diff --git a/torch/utils/cpp_extension.py b/torch/utils/cpp_extension.py -index aaa45ea4c90..3f584ef5598 100644 +index aaa45ea4c..3f584ef55 100644 --- a/torch/utils/cpp_extension.py +++ b/torch/utils/cpp_extension.py @@ -1159,10 +1159,6 @@ def include_paths(cuda: bool = False) -> List[str]: @@ -49,3 +49,6 @@ index aaa45ea4c90..3f584ef5598 100644 ] if cuda and IS_HIP_EXTENSION: paths.append(os.path.join(lib_include, 'THH')) +-- +2.48.1 + diff --git a/recipe/patches/0017-point-include-paths-to-PREFIX-include.patch b/recipe/patches/0016-point-include-paths-to-PREFIX-include.patch similarity index 89% rename from recipe/patches/0017-point-include-paths-to-PREFIX-include.patch rename to recipe/patches/0016-point-include-paths-to-PREFIX-include.patch index 2e89787bf..fecf4d0fc 100644 --- a/recipe/patches/0017-point-include-paths-to-PREFIX-include.patch +++ b/recipe/patches/0016-point-include-paths-to-PREFIX-include.patch @@ -1,14 +1,14 @@ -From 7c4094fe8edfd01d72b664c91a60cc14bb5a4dbe Mon Sep 17 00:00:00 2001 +From 4d485fc0a5e3226e528e9dab17b184ff9835a045 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Thu, 23 Jan 2025 22:58:14 +1100 -Subject: [PATCH 17/17] point include paths to $PREFIX/include +Subject: [PATCH 16/16] point include paths to $PREFIX/include --- torch/utils/cpp_extension.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/torch/utils/cpp_extension.py b/torch/utils/cpp_extension.py -index 3f584ef5598..4210f62b6db 100644 +index 3f584ef55..4210f62b6 100644 --- a/torch/utils/cpp_extension.py +++ b/torch/utils/cpp_extension.py @@ -1155,10 +1155,19 @@ def include_paths(cuda: bool = False) -> List[str]: @@ -31,3 +31,6 @@ index 3f584ef5598..4210f62b6db 100644 ] if cuda and IS_HIP_EXTENSION: paths.append(os.path.join(lib_include, 'THH')) +-- +2.48.1 + From b3b972ffda24c4bb83fdfdd374d8c3011937b7f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Sat, 25 Jan 2025 06:34:59 +0100 Subject: [PATCH 43/43] MNT: Re-rendered with conda-build 25.1.1, conda-smithy 3.45.4, and conda-forge-pinning 2025.01.24.17.08.54 --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 179afe55e..bb3853666 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,6 @@ /build_artifacts *.pyc + +# Rattler-build's artifacts are in `output` when not specifying anything. +/output