Skip to content
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.

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

Switch to FindCUDAToolKit #83

Merged
merged 59 commits into from
Jan 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
327b2e9
Switch to FindCUDAToolKit
Tobias-Fischer Jan 6, 2024
bb93a79
MNT: Re-rendered with conda-build 3.28.2, conda-smithy 3.30.2, and co…
Jan 6, 2024
b464388
Fixes
Tobias-Fischer Jan 6, 2024
dafa5f1
MNT: Re-rendered with conda-build 3.28.2, conda-smithy 3.30.2, and co…
Jan 6, 2024
cd1beb0
Only use patch when needed
Tobias-Fischer Jan 6, 2024
61e28c9
Create cuda120.yaml
Tobias-Fischer Jan 6, 2024
67afe7a
MNT: Re-rendered with conda-build 3.28.2, conda-smithy 3.30.2, and co…
Jan 6, 2024
064c897
Skip tests on aarch64+cuda because of https://github.com/conda-forge/…
Tobias-Fischer Jan 6, 2024
4ecf709
Fixup aarch64 tests
Tobias-Fischer Jan 7, 2024
59c3386
Align cuda-version in host and build
Tobias-Fischer Jan 7, 2024
ea4ae87
Use script to set CC
Tobias-Fischer Jan 7, 2024
1bdec94
Add missing cuda libs
Tobias-Fischer Jan 7, 2024
97f0095
Drop unneeded packages
Tobias-Fischer Jan 7, 2024
6b07b1c
Delete recipe/add_global_cxx_release.patch
Tobias-Fischer Jan 7, 2024
a5f965d
Try -A x64
Tobias-Fischer Jan 7, 2024
23b65c0
-A x64 not working
Tobias-Fischer Jan 7, 2024
95b08bf
Try set VS170COMNTOOLS
Tobias-Fischer Jan 7, 2024
fc21a51
Debug
Tobias-Fischer Jan 7, 2024
8ab0bc7
Cleanup
Tobias-Fischer Jan 7, 2024
312f6df
Try VS2019 Generator
Tobias-Fischer Jan 7, 2024
6f7a567
Update builder.py
Tobias-Fischer Jan 8, 2024
00354e6
Try vs2022
Tobias-Fischer Jan 8, 2024
734ac4b
Update builder.py
Tobias-Fischer Jan 8, 2024
9c63a28
MNT: Re-rendered with conda-build 3.28.2, conda-smithy 3.30.2, and co…
Jan 8, 2024
bf8fd34
Delete recipe/conda_build_config.yaml
Tobias-Fischer Jan 8, 2024
62dc448
Try windows-2019 image
Tobias-Fischer Jan 8, 2024
7b08be8
MNT: Re-rendered with conda-build 3.28.2, conda-smithy 3.30.2, and co…
Jan 8, 2024
58427ea
Set CUDNN_ROOT and CUDNN_INCLUDE_DIR
Tobias-Fischer Jan 9, 2024
0696438
Add CUDNN_INCLUDE_PATH
Tobias-Fischer Jan 9, 2024
452a502
Fixup silly formatting mistake, thanks @jakirkham
Tobias-Fischer Jan 9, 2024
4bd363e
Set -DCMAKE_FIND_DEBUG_MODE=1
Tobias-Fischer Jan 9, 2024
e443345
Try C++17 on Win
Tobias-Fischer Jan 9, 2024
769b156
Fixup format for WIN
Tobias-Fischer Jan 9, 2024
1bb96dd
Update recipe/builder.py
Tobias-Fischer Jan 9, 2024
db5c11b
Fixup str with float comparison
Tobias-Fischer Jan 9, 2024
474c1d0
Typo
Tobias-Fischer Jan 9, 2024
5323adc
Fix syntax issues, only care about CUDA12 for now as 11.8 already wor…
Tobias-Fischer Jan 9, 2024
79bc4fc
Update bld-pkg.bat
Tobias-Fischer Jan 9, 2024
9cbdd82
Try more packages
Tobias-Fischer Jan 10, 2024
8cf015d
Update bld-pkg.bat
Tobias-Fischer Jan 10, 2024
50ec185
Try CMAKE_CUDA_FLAGS
Tobias-Fischer Jan 10, 2024
d6311a9
Add ninja req
Tobias-Fischer Jan 10, 2024
bfa9b93
Set ninja as generator
Tobias-Fischer Jan 10, 2024
410203f
Error?
Tobias-Fischer Jan 10, 2024
f5678d8
Create allow_any_generator.patch
Tobias-Fischer Jan 10, 2024
da9e1d3
Use allow_any_generator.patch
Tobias-Fischer Jan 10, 2024
407d6dc
Update setup_cmake_args.patch
Tobias-Fischer Jan 10, 2024
fcaef57
Less verbose
Tobias-Fischer Jan 10, 2024
14105c8
Remove potentially unneeded flags
Tobias-Fischer Jan 10, 2024
0da22cb
Cleanup
Tobias-Fischer Jan 10, 2024
d8edf2a
Use ninja on unix
Tobias-Fischer Jan 10, 2024
1dfcc3b
Use ninja on Unix
Tobias-Fischer Jan 10, 2024
7e296a5
No need for windows 2019 image
Tobias-Fischer Jan 10, 2024
583a37d
skip: true # [aarch64 and cuda_compiler_version == "12.0"]
Tobias-Fischer Jan 10, 2024
7d6569f
cuda-toolkit should not be needed
Tobias-Fischer Jan 10, 2024
b83ae36
Skip win+cuda11.2
Tobias-Fischer Jan 10, 2024
aa0238d
MNT: Re-rendered with conda-build 3.28.3, conda-smithy 3.30.2, and co…
Jan 10, 2024
1477954
Add reference to tracking issue
Tobias-Fischer Jan 10, 2024
cf91483
Add xref to https://github.com/conda-forge/conda-forge.github.io/issu…
Tobias-Fischer Jan 10, 2024
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
119 changes: 106 additions & 13 deletions .azure-pipelines/azure-pipelines-linux.yml

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

2 changes: 1 addition & 1 deletion .azure-pipelines/azure-pipelines-osx.yml

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

38 changes: 19 additions & 19 deletions .azure-pipelines/azure-pipelines-win.yml

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

Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
c_compiler:
- gcc
c_compiler_version:
- '12'
cdt_name:
- cos7
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cuda_compiler:
- cuda-nvcc
cuda_compiler_version:
- '12.0'
cudnn:
- '8'
cxx_compiler:
- gxx
cxx_compiler_version:
- '12'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
libcblas:
- 3.9 *netlib
libjpeg_turbo:
- '3'
liblapack:
- 3.9 *netlib
libpng:
- '1.6'
nccl:
- '2'
numpy:
- '1.22'
pin_run_as_build:
python:
min_pin: x.x
max_pin: x.x
python:
- 3.10.* *_cpython
sqlite:
- '3'
target_platform:
- linux-64
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- cuda_compiler
- cuda_compiler_version
- cdt_name
- docker_image
- - python
- numpy
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
c_compiler:
- gcc
c_compiler_version:
- '12'
cdt_name:
- cos7
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cuda_compiler:
- cuda-nvcc
cuda_compiler_version:
- '12.0'
cudnn:
- '8'
cxx_compiler:
- gxx
cxx_compiler_version:
- '12'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
libcblas:
- 3.9 *netlib
libjpeg_turbo:
- '3'
liblapack:
- 3.9 *netlib
libpng:
- '1.6'
nccl:
- '2'
numpy:
- '1.22'
pin_run_as_build:
python:
min_pin: x.x
max_pin: x.x
python:
- 3.8.* *_cpython
sqlite:
- '3'
target_platform:
- linux-64
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- cuda_compiler
- cuda_compiler_version
- cdt_name
- docker_image
- - python
- numpy
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
c_compiler:
- gcc
c_compiler_version:
- '12'
cdt_name:
- cos7
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cuda_compiler:
- cuda-nvcc
cuda_compiler_version:
- '12.0'
cudnn:
- '8'
cxx_compiler:
- gxx
cxx_compiler_version:
- '12'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
libcblas:
- 3.9 *netlib
libjpeg_turbo:
- '3'
liblapack:
- 3.9 *netlib
libpng:
- '1.6'
nccl:
- '2'
numpy:
- '1.22'
pin_run_as_build:
python:
min_pin: x.x
max_pin: x.x
python:
- 3.9.* *_73_pypy
sqlite:
- '3'
target_platform:
- linux-64
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- cuda_compiler
- cuda_compiler_version
- cdt_name
- docker_image
- - python
- numpy
Loading