Skip to content

NEW: Export CF_TORCH_CUDA_ARCH_LIST to environment #464

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Closed
carterbox wants to merge 11 commits into from
Closed

NEW: Export CF_TORCH_CUDA_ARCH_LIST to environment #464

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
33b2933
NEW: Export CF_TORCH_CUDA_ARCH_LIST to environment
carterbox Oct 3, 2025
8ebd49f
MNT: Re-rendered with conda-smithy 3.53.3 and conda-forge-pinning 202…
carterbox Dec 9, 2025
721ceff
BLD: Bump the build
carterbox Dec 9, 2025
49fb407
trigger CI
h-vetinari Dec 14, 2025
4d6a51b
REF: Use NOT_SET instead of unset to track CF_TORCH_CUDA_ARCH_LIST
carterbox Dec 15, 2025
cbb6c2a
REF: Turn off echo in activation scripts
carterbox Dec 15, 2025
96fa997
REF: Remove ~ from activation script names
carterbox Dec 15, 2025
e4b5b38
DOC: Add explanatory comment to activation script
carterbox Dec 16, 2025
6f5c94b
BLD: Only install activation scripts for CUDA variant
carterbox Jan 14, 2026
99c202e
Merge remote-tracking branch 'upstream/main' into default-arch-list
carterbox Jan 14, 2026
47fe3e7
MNT: Re-rendered with conda-smithy 3.54.1 and conda-forge-pinning 202…
carterbox Jan 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions .scripts/run_osx_build.sh
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions recipe/activate.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
@echo on

if not defined CF_TORCH_CUDA_ARCH_LIST (
set "CF_TORCH_CUDA_ARCH_LIST=@cf_torch_cuda_arch_list@"
set "CF_TORCH_CUDA_ARCH_LIST_BACKUP=UNSET"
)

7 changes: 7 additions & 0 deletions recipe/activate.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#!/bin/bash

if [[ ! -v CF_TORCH_CUDA_ARCH_LIST ]]
then
export CF_TORCH_CUDA_ARCH_LIST="@cf_torch_cuda_arch_list@"
export CF_TORCH_CUDA_ARCH_LIST_BACKUP="UNSET"
Copy link
Member

@h-vetinari h-vetinari Dec 14, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

UNSET is not the greatest name already, but using it on unix is even worse, because there unset is actually a valid command, and we can detect the difference between an unset and an empty environment variable. No such luck on windows, so it makes sense there.

I can imagine keeping the current setup for uniformity if you want to declare this all internal to the package, but then both activate.sh and activate.bat need an explanatory comment.

Copy link
Member Author

@carterbox carterbox Dec 15, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

4d6a51b

Copy link
Member

@h-vetinari h-vetinari Dec 16, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can imagine keeping the current setup for uniformity if you want to declare this all internal to the package, but then both activate.sh and activate.bat need an explanatory comment.

This still applies. Windows should have a comment that we cannot distinguish unset from empty, so we use a placeholder. And using a placeholder on unix rather than (more properly) determing whether a variable is set/unset in bash needs a comment that this is for uniformity with windows.

Copy link
Member Author

@carterbox carterbox Dec 16, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

e4b5b38

fi
14 changes: 14 additions & 0 deletions recipe/bld.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ if not "%cuda_compiler_version%" == "None" (
@REM MKLDNN is an Apache-2.0 licensed library for DNNs and is used
@REM for CPU builds. Not to be confused with MKL.
set "USE_MKLDNN=1"
set "TORCH_CUDA_ARCH_LIST="

@REM On windows, env vars are case-insensitive and setup.py
@REM passes all env vars starting with CUDA_*, CMAKE_* to
Expand Down Expand Up @@ -221,6 +222,19 @@ if "%PKG_NAME%" == "libtorch" (
@REM Keep the original backed up to sed later
copy build\CMakeCache.txt build\CMakeCache.txt.orig
if %ERRORLEVEL% neq 0 exit 1

sed -e "s/@cf_torch_cuda_arch_list@/%TORCH_CUDA_ARCH_LIST%/g" ^
%RECIPE_DIR%\activate.bat > %RECIPE_DIR%\activate-replaced.bat
if %ERRORLEVEL% neq 0 exit 1

mkdir %PREFIX%\etc\conda\activate.d
copy %RECIPE_DIR%\activate-replaced.bat %PREFIX%\etc\conda\activate.d\~libtorch_activate.bat
if %ERRORLEVEL% neq 0 exit 1

mkdir %PREFIX%\etc\conda\deactivate.d
copy %RECIPE_DIR%\deactivate.bat %PREFIX%\etc\conda\deactivate.d\~libtorch_deactivate.bat
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\bin\ %LIBRARY_BIN%\ torch_python.dll
Expand Down
9 changes: 9 additions & 0 deletions recipe/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,7 @@ else
# for CPU builds. Not to be confused with MKL.
export USE_MKLDNN=1
export USE_CUDA=0
export TORCH_CUDA_ARCH_LIST=""
fi

echo '${CXX}'=${CXX}
Expand All @@ -279,6 +280,14 @@ case ${PKG_NAME} in

# Keep the original backed up to sed later
cp build/CMakeCache.txt build/CMakeCache.txt.orig

for CHANGE in "activate" "deactivate"
do
mkdir -p "${PREFIX}/etc/conda/${CHANGE}.d"
sed -e "s/@cf_torch_cuda_arch_list@/${TORCH_CUDA_ARCH_LIST}/g" \
"${RECIPE_DIR}/${CHANGE}.sh" > "${PREFIX}/etc/conda/${CHANGE}.d/~libtorch_${CHANGE}.sh"
done

;;
pytorch)
$PREFIX/bin/python -m pip install . --no-deps --no-build-isolation -v --no-clean --config-settings=--global-option=-q \
Expand Down
6 changes: 6 additions & 0 deletions recipe/deactivate.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
@echo on
Copy link
Member

@h-vetinari h-vetinari Dec 14, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no echo

Copy link
Member Author

@carterbox carterbox Dec 15, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cbb6c2a


if "%CF_TORCH_CUDA_ARCH_LIST_BACKUP%" == "UNSET" (
set "CF_TORCH_CUDA_ARCH_LIST="
set "CF_TORCH_CUDA_ARCH_LIST_BACKUP="
)
7 changes: 7 additions & 0 deletions recipe/deactivate.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#!/bin/bash

if [[ "${CF_TORCH_CUDA_ARCH_LIST_BACKUP}" == "UNSET" ]]
then
unset CF_TORCH_CUDA_ARCH_LIST
unset CF_TORCH_CUDA_ARCH_LIST_BACKUP
fi
2 changes: 1 addition & 1 deletion recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# if you wish to build release candidate number X, append the version string with ".rcX"
{% set version = "2.9.1" %}
{% set build = 1 %}
{% set build = 2 %}

# Use a higher build number for the CUDA variant, to ensure that it's
# preferred by conda's solver, and it's preferentially
Expand Down
Loading