Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
69 commits
Select commit Hold shift + click to select a range
cd5cbb5
dummy commit for rerendering
conda-forge-webservices[bot] Nov 2, 2023
7fa25c5
MNT: Re-rendered with conda-build 3.27.0, conda-smithy 3.27.1, and co…
Nov 2, 2023
26dd704
try enabling win + cuda 12 builds and see what would happen
leofang Nov 2, 2023
3763999
tweak the migrator to enable windows
leofang Nov 2, 2023
15bacd2
MNT: Re-rendered with conda-build 3.27.0, conda-smithy 3.27.1, and co…
Nov 2, 2023
ad369ce
try: add back migrator, and only tweak the selectors
leofang Nov 2, 2023
9831f5b
MNT: Re-rendered with conda-build 3.27.0, conda-smithy 3.27.1, and co…
Nov 2, 2023
9d534d4
Add cuda120_win.yaml
leofang Nov 2, 2023
e8b2b8a
add back cuda120.yaml
leofang Nov 2, 2023
bca7328
MNT: Re-rendered with conda-build 3.27.0, conda-smithy 3.27.1, and co…
Nov 2, 2023
3e399a4
retry...
leofang Nov 2, 2023
63e4b9e
MNT: Re-rendered with conda-build 3.27.0, conda-smithy 3.27.1, and co…
Nov 2, 2023
de48693
add back cuda120, again...
leofang Nov 2, 2023
799e9ff
Create cuda120_win.yaml
leofang Nov 2, 2023
f1ddac4
MNT: Re-rendered with conda-build 3.27.0, conda-smithy 3.27.1, and co…
Nov 2, 2023
ba182b2
try win64 -> win
leofang Nov 2, 2023
cebe42c
try use_local
leofang Nov 2, 2023
7b2157c
MNT: Re-rendered with conda-build 3.27.0, conda-smithy 3.27.1, and co…
Nov 2, 2023
d4656e7
check in run_conda_forge_build_win.bat
leofang Nov 2, 2023
e6f514d
hack run_conda_forge_build_win.bat
leofang Nov 2, 2023
ac76bf9
move hack around
leofang Nov 2, 2023
948a6db
move back, and remove file ext
leofang Nov 2, 2023
a408ee4
Rename cfbs script name
jakirkham Nov 2, 2023
adb78d4
MNT: Re-rendered with conda-build 3.27.0, conda-smithy 3.27.1, and co…
Nov 2, 2023
4e33627
fix: windows does not have wildcard...
leofang Nov 2, 2023
51e47c5
use cuda-driver-dev only on linux
leofang Nov 2, 2023
df05885
fix Leo's fat finger
leofang Nov 2, 2023
58a729f
skip cudnn on win for now
leofang Nov 2, 2023
ca67d2c
set cuda path for cuda 12 + win
leofang Nov 2, 2023
e9e9218
I hate windows
leofang Nov 2, 2023
8d19704
Update recipe/meta.yaml
leofang Nov 3, 2023
94bb009
try to fix CONDA_OVERRIDE_CUDA
leofang Nov 3, 2023
c803492
use different include dir on win
leofang Nov 3, 2023
1d544d6
try to not set CUDA_PATH on win, and let CuPy find CUDA via nvcc
leofang Nov 3, 2023
89fdb24
search build prefix include first
leofang Nov 3, 2023
2430bbf
fix typo
leofang Nov 3, 2023
5c05843
turns out windows also has target
leofang Nov 3, 2023
12dd73a
fix include path
leofang Nov 3, 2023
95c6d3d
debug
leofang Nov 3, 2023
edb27ce
debug
leofang Nov 3, 2023
cff5a54
debug
leofang Nov 3, 2023
36e5c22
debug
leofang Nov 3, 2023
001c295
debug
leofang Nov 3, 2023
d1b838e
fix include path, again
leofang Nov 3, 2023
7181f11
debug
leofang Nov 3, 2023
8cb65b4
debug
leofang Nov 3, 2023
12295ad
forget to apply the patch...
leofang Nov 3, 2023
e5c2cfe
fix patch
leofang Nov 3, 2023
f73550f
fix patch
leofang Nov 3, 2023
9018e75
patch cub path logic
leofang Nov 3, 2023
47d3914
fix
leofang Nov 3, 2023
bdc018f
debug
leofang Nov 3, 2023
5fb8fe0
avoid using backslash in win path
leofang Nov 3, 2023
55f7c29
wtf is going on
leofang Nov 3, 2023
121871c
i am desparate
leofang Nov 3, 2023
3dfb80a
fix & clean up
leofang Nov 3, 2023
806b7bf
test if cl needs an activation script
leofang Nov 4, 2023
d819137
Update run_conda_forge_build_setup_win.bat
leofang Nov 6, 2023
5fef9b4
Update run_conda_forge_build_setup_win.bat
leofang Nov 6, 2023
4866c38
Update run_conda_forge_build_setup_win.bat
leofang Nov 6, 2023
2f706b2
Update run_conda_forge_build_setup_win.bat
leofang Nov 6, 2023
e33ad6f
MNT: Re-rendered with conda-build 3.27.0, conda-smithy 3.28.0, and co…
Nov 8, 2023
cb6c6f0
revert win script change for now
leofang Nov 8, 2023
1da09f4
Unvendor `run_conda_forge_build_setup_win.bat`
jakirkham Nov 10, 2023
77d47d2
MNT: Re-rendered with conda-build 3.27.0, conda-smithy 3.28.0, and co…
Nov 10, 2023
44c9f69
Cleanup
jakirkham Nov 10, 2023
77698e3
copy migrator from global pinning; clean up patch
leofang Nov 16, 2023
a1e9d7d
MNT: Re-rendered with conda-build 3.27.0, conda-smithy 3.29.0, and co…
Nov 16, 2023
e979b1d
restore optional cudnn support on win + cuda12
leofang Nov 16, 2023
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
4 changes: 3 additions & 1 deletion .azure-pipelines/azure-pipelines-linux.yml

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

15 changes: 15 additions & 0 deletions .azure-pipelines/azure-pipelines-win.yml

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

22 changes: 11 additions & 11 deletions .ci_support/migrations/cuda120.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ __migrator:
kind:
version
migration_number:
2
3
build_number:
1
paused: false
Expand Down Expand Up @@ -47,13 +47,13 @@ __migrator:
- quay.io/condaforge/linux-anvil-cos7-x86_64 # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64"]
cuda_compiler_version:
- None
- 10.2 # [(linux64 or win) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
- 11.0 # [(linux64 or win) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
- 11.1 # [(linux64 or win) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
- 11.2 # [(linux or win) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
- 12.0 # [(linux or win) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
- 10.2 # [(linux64 or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
- 11.0 # [(linux64 or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
- 11.1 # [(linux64 or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
- 11.2 # [(linux or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
- 12.0 # [(linux or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
commit_message: |
Rebuild for CUDA 12 w/arch support
Rebuild for CUDA 12 w/arch + Windows support

The transition to CUDA 12 SDK includes new packages for all CUDA libraries and
build tools. Notably, the cudatoolkit package no longer exists, and packages
Expand All @@ -62,11 +62,11 @@ __migrator:
[see this issue]( https://github.com/conda-forge/conda-forge.github.io/issues/1963 ).
Please feel free to raise any issues encountered there. Thank you! :pray:

cuda_compiler: # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
- cuda-nvcc # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
cuda_compiler: # [(linux or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
- cuda-nvcc # [(linux or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]

cuda_compiler_version: # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
- 12.0 # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
cuda_compiler_version: # [(linux or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
- 12.0 # [(linux or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]

c_compiler_version: # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
- 12 # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
c_compiler:
- vs2017
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cuda_compiler:
- cuda-nvcc
cuda_compiler_version:
- '12.0'
cudnn:
- '8'
cutensor:
- '1'
cxx_compiler:
- vs2017
pin_run_as_build:
python:
min_pin: x.x
max_pin: x.x
python:
- 3.10.* *_cpython
target_platform:
- win-64
zip_keys:
- - cuda_compiler
- cuda_compiler_version
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
c_compiler:
- vs2017
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cuda_compiler:
- cuda-nvcc
cuda_compiler_version:
- '12.0'
cudnn:
- '8'
cutensor:
- '1'
cxx_compiler:
- vs2017
pin_run_as_build:
python:
min_pin: x.x
max_pin: x.x
python:
- 3.11.* *_cpython
target_platform:
- win-64
zip_keys:
- - cuda_compiler
- cuda_compiler_version
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
c_compiler:
- vs2017
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cuda_compiler:
- cuda-nvcc
cuda_compiler_version:
- '12.0'
cudnn:
- '8'
cutensor:
- '1'
cxx_compiler:
- vs2017
pin_run_as_build:
python:
min_pin: x.x
max_pin: x.x
python:
- 3.8.* *_cpython
target_platform:
- win-64
zip_keys:
- - cuda_compiler
- cuda_compiler_version
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
c_compiler:
- vs2017
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cuda_compiler:
- cuda-nvcc
cuda_compiler_version:
- '12.0'
cudnn:
- '8'
cutensor:
- '1'
cxx_compiler:
- vs2017
pin_run_as_build:
python:
min_pin: x.x
max_pin: x.x
python:
- 3.9.* *_cpython
target_platform:
- win-64
zip_keys:
- - cuda_compiler
- cuda_compiler_version
17 changes: 13 additions & 4 deletions .scripts/build_steps.sh

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

3 changes: 3 additions & 0 deletions .scripts/run_docker_build.sh

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

12 changes: 10 additions & 2 deletions .scripts/run_win_build.bat

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

30 changes: 29 additions & 1 deletion README.md

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

13 changes: 6 additions & 7 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,12 @@ source:
- url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/{{ name }}-{{ version }}.tar.gz
sha256: {{ sha256 }}
patches:
- support_new_cuda_layout.diff # [(linux and (cuda_compiler_version or "").startswith("12")) or (build_platform != target_platform)]
- support_new_cuda_layout.diff # [((linux or win64) and (cuda_compiler_version or "").startswith("12")) or (build_platform != target_platform)]
- support_nvtx3_win.diff # [win64]

build:
number: 3
# TODO: turn on win64 + CUDA 12 once it's ready
skip: true # [cuda_compiler_version not in ("11.8", "12.0") or (cuda_compiler_version == "12.0" and win64)]
number: 4
skip: true # [cuda_compiler_version not in ("11.8", "12.0")]
script:
# CuPy default detects CUDA from nvcc, but on Conda-Forge's dockers nvcc lives in a different place...
# With conda-forge/nvcc-feedstock#58, CUDA_PATH is set correctly
Expand Down Expand Up @@ -90,7 +89,7 @@ requirements:
- cython >=0.29.22,<3 # [build_platform != target_platform]
# TODO: clean up
{% if cuda_major >= 12 %}
- cuda-driver-dev # [build_platform != target_platform]
- cuda-driver-dev # [linux and build_platform != target_platform]
- cuda-cudart-dev # [build_platform != target_platform]
- cuda-nvrtc-dev # [build_platform != target_platform]
- cuda-nvtx-dev # [build_platform != target_platform]
Expand Down Expand Up @@ -118,7 +117,7 @@ requirements:
- nvtx-c # [win64]
# TODO: clean up
{% if cuda_major >= 12 %}
- cuda-driver-dev
- cuda-driver-dev # [linux]
- cuda-cudart-dev
- cuda-nvrtc-dev
- cuda-nvtx-dev
Expand Down Expand Up @@ -161,7 +160,7 @@ requirements:
test:
requires:
# need the libcuda stub for import test
- cuda-driver-dev # [(cuda_compiler_version or "").startswith("12")]
- cuda-driver-dev # [linux and (cuda_compiler_version or "").startswith("12")]

source_files:
- tests
Expand Down
Loading