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

RFC: Use compiler('cuda') #121

Merged
merged 38 commits into from
Jan 10, 2024
Merged
Show file tree
Hide file tree
Changes from 35 commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
6145879
dummy commit for rerendering
conda-forge-webservices[bot] Mar 28, 2023
a77e1ba
MNT: Re-rendered with conda-build 3.24.0, conda-smithy 3.23.1, and co…
Mar 28, 2023
abf743b
Always use `ucx`
jakirkham Mar 28, 2023
c8694e2
Drop `enable_cuda` from `conda_build_config.yaml`
jakirkham Mar 28, 2023
283c764
MNT: Re-rendered with conda-build 3.24.0, conda-smithy 3.23.1, and co…
Mar 28, 2023
da85c82
Require `ucx` on `linux` only
jakirkham Mar 28, 2023
5d92942
Require `cuda` compiler on `linux`
jakirkham Mar 28, 2023
8c4a830
MNT: Re-rendered with conda-build 3.24.0, conda-smithy 3.23.1, and co…
Mar 28, 2023
efaa5cd
Constraint `cuda` compiler version
jakirkham Mar 28, 2023
b175e33
Skip non-`cuda` builds on `linux`
jakirkham Mar 28, 2023
497f255
MNT: Re-rendered with conda-build 3.24.0, conda-smithy 3.23.1, and co…
Mar 28, 2023
930c16e
Make `cudatoolkit` optional (again)
jakirkham Mar 28, 2023
1566c0b
Drop extra `<space>`
jakirkham Mar 28, 2023
0092d50
Bump `build/number` to `2`
jakirkham Mar 28, 2023
a1663f3
Align on GCC 9 (w/CUDA 11.0) on Linux
jakirkham Mar 28, 2023
eac1137
MNT: Re-rendered with conda-build 3.24.0, conda-smithy 3.23.1, and co…
Mar 28, 2023
5d52d97
Drop `cos7` from Linux `x86_64` image name
jakirkham Mar 28, 2023
b1c2e7f
MNT: Re-rendered with conda-build 3.24.0, conda-smithy 3.23.1, and co…
Mar 28, 2023
6005eb0
Update to GCC 10
jakirkham Mar 29, 2023
a0bc3d3
MNT: Re-rendered with conda-build 3.24.0, conda-smithy 3.23.1, and co…
Mar 29, 2023
4b9534b
Add `cuda_compiler` for `zip_keys`
jakirkham Jan 6, 2024
aa316f7
MNT: Re-rendered with conda-build 3.28.2, conda-smithy 3.30.2, and co…
Jan 6, 2024
f469c86
Merge conda-forge/main into conda-forge-admin/conda_forge_admin_120
jakirkham Jan 6, 2024
9a95fe2
Add CUDA 11.8 migrator
jakirkham Jan 6, 2024
7352c1d
Bump to CUDA 11.8
jakirkham Jan 6, 2024
3e2b3dd
MNT: Re-rendered with conda-build 3.28.2, conda-smithy 3.30.2, and co…
Jan 6, 2024
d4a7bf8
Use CUDA major version to set lower bound
jakirkham Jan 6, 2024
c4c6b39
Add CUDA 12.0 migrator to mark complete
jakirkham Jan 6, 2024
6589644
Drop redundant `skip`
jakirkham Jan 6, 2024
42d9a80
Inline `enable_ucx`
jakirkham Jan 6, 2024
5668b7d
MNT: Re-rendered with conda-build 3.28.2, conda-smithy 3.30.2, and co…
Jan 6, 2024
8085258
Obviate `enable_cuda`
jakirkham Jan 6, 2024
9a2268c
MNT: Re-rendered with conda-build 3.28.2, conda-smithy 3.30.2, and co…
Jan 6, 2024
f9d9512
Readd `cuda-version`
jakirkham Jan 6, 2024
7d4671a
Drop unneeded `skip`
jakirkham Jan 6, 2024
2abb406
avoid cross compiling for linux
leofang Jan 8, 2024
605490c
MNT: Re-rendered with conda-build 3.28.2, conda-smithy 3.30.2, and co…
Jan 8, 2024
67ca1a7
remove erroneous addition of cudatoolkit
leofang Jan 8, 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
36 changes: 18 additions & 18 deletions .azure-pipelines/azure-pipelines-linux.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
@@ -1,29 +1,27 @@
c_compiler:
- gcc
c_compiler_version:
- '12'
- '11'
Comment on lines 1 to +4
Copy link
Member

Choose a reason for hiding this comment

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

This was using GCC 12 before. Am guessing that is just because 12 is the default GCC version used if not otherwise overridden

Whereas CUDA 11.8, is configured with GCC 11

Not sure whether this matters for OpenMPI in practice. So just mentioning for clarity

cdt_name:
- cos6
- cos7
Comment on lines 5 to +6
Copy link
Member

Choose a reason for hiding this comment

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

The CUDA 11.8 Docker image is on CentOS 7. So this got bumped from CentOS 6 to 7

Also note that linux_aarch64 and linux_ppc64le already are using CentOS 7. So this really only affects linux_64 (bringing it inline with the others)

Am guessing the long tail of CentOS 6 is diminishing. Though wouldn't be surprised if there are still some CentOS 6 users out there

Anyways just mentioning it for awareness

channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cuda_version:
- '11.2'
cuda_compiler:
- nvcc
cuda_compiler_version:
- '11.8'
Comment on lines -11 to +14
Copy link
Member

Choose a reason for hiding this comment

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

Instead of cuda_version, we now have cuda_compiler_version. Also moved to CUDA 11.8 as requested

Though could do 11.2 or another version just as easily. Just need to update the skip in the recipe

cxx_compiler:
- gxx
cxx_compiler_version:
- '12'
- '11'
docker_image:
- quay.io/condaforge/linux-anvil-cuda:11.2
enable_cuda:
- 'True'
enable_ucx:
- 'True'
- quay.io/condaforge/linux-anvil-cuda:11.8
fortran_compiler:
- gfortran
fortran_compiler_version:
- '12'
- '11'
libevent:
- 2.1.12
mpi_type:
Expand All @@ -36,5 +34,9 @@ zip_keys:
- - c_compiler_version
- cxx_compiler_version
- fortran_compiler_version
- cuda_compiler
- cuda_compiler_version
- cdt_name
- docker_image
zlib:
- '1.2'
Original file line number Diff line number Diff line change
@@ -1,29 +1,27 @@
c_compiler:
- gcc
c_compiler_version:
- '12'
- '11'
cdt_name:
- cos6
- cos7
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cuda_version:
- '11.2'
cuda_compiler:
- nvcc
cuda_compiler_version:
- '11.8'
cxx_compiler:
- gxx
cxx_compiler_version:
- '12'
- '11'
docker_image:
- quay.io/condaforge/linux-anvil-cuda:11.2
enable_cuda:
- 'True'
enable_ucx:
- 'True'
- quay.io/condaforge/linux-anvil-cuda:11.8
fortran_compiler:
- gfortran
fortran_compiler_version:
- '12'
- '11'
libevent:
- 2.1.12
mpi_type:
Expand All @@ -36,5 +34,9 @@ zip_keys:
- - c_compiler_version
- cxx_compiler_version
- fortran_compiler_version
- cuda_compiler
- cuda_compiler_version
- cdt_name
- docker_image
zlib:
- '1.2'
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ BUILD:
c_compiler:
- gcc
c_compiler_version:
- '12'
- '11'
cdt_arch:
- aarch64
cdt_name:
Expand All @@ -12,22 +12,20 @@ channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cuda_version:
- '11.2'
cuda_compiler:
- nvcc
cuda_compiler_version:
- '11.8'
cxx_compiler:
- gxx
cxx_compiler_version:
- '12'
- '11'
docker_image:
- quay.io/condaforge/linux-anvil-aarch64-cuda:11.2
enable_cuda:
- 'True'
enable_ucx:
- 'True'
- quay.io/condaforge/linux-anvil-cuda:11.8
fortran_compiler:
- gfortran
fortran_compiler_version:
- '12'
- '11'
libevent:
- 2.1.12
mpi_type:
Expand All @@ -40,5 +38,9 @@ zip_keys:
- - c_compiler_version
- cxx_compiler_version
- fortran_compiler_version
- cuda_compiler
- cuda_compiler_version
- cdt_name
- docker_image
zlib:
- '1.2'
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ BUILD:
c_compiler:
- gcc
c_compiler_version:
- '12'
- '11'
cdt_arch:
- aarch64
cdt_name:
Expand All @@ -12,22 +12,20 @@ channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cuda_version:
- '11.2'
cuda_compiler:
- nvcc
cuda_compiler_version:
- '11.8'
cxx_compiler:
- gxx
cxx_compiler_version:
- '12'
- '11'
docker_image:
- quay.io/condaforge/linux-anvil-aarch64-cuda:11.2
enable_cuda:
- 'True'
enable_ucx:
- 'True'
- quay.io/condaforge/linux-anvil-cuda:11.8
fortran_compiler:
- gfortran
fortran_compiler_version:
- '12'
- '11'
libevent:
- 2.1.12
mpi_type:
Expand All @@ -40,5 +38,9 @@ zip_keys:
- - c_compiler_version
- cxx_compiler_version
- fortran_compiler_version
- cuda_compiler
- cuda_compiler_version
- cdt_name
- docker_image
zlib:
- '1.2'
Original file line number Diff line number Diff line change
@@ -1,29 +1,27 @@
c_compiler:
- gcc
c_compiler_version:
- '12'
- '11'
cdt_name:
- cos7
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cuda_version:
- '11.2'
cuda_compiler:
- nvcc
cuda_compiler_version:
- '11.8'
cxx_compiler:
- gxx
cxx_compiler_version:
- '12'
- '11'
docker_image:
- quay.io/condaforge/linux-anvil-ppc64le-cuda:11.2
enable_cuda:
- 'True'
enable_ucx:
- 'True'
- quay.io/condaforge/linux-anvil-ppc64le-cuda:11.8
fortran_compiler:
- gfortran
fortran_compiler_version:
- '12'
- '11'
libevent:
- 2.1.12
mpi_type:
Expand All @@ -36,5 +34,9 @@ zip_keys:
- - c_compiler_version
- cxx_compiler_version
- fortran_compiler_version
- cuda_compiler
- cuda_compiler_version
- cdt_name
- docker_image
zlib:
- '1.2'
Original file line number Diff line number Diff line change
@@ -1,29 +1,27 @@
c_compiler:
- gcc
c_compiler_version:
- '12'
- '11'
cdt_name:
- cos7
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cuda_version:
- '11.2'
cuda_compiler:
- nvcc
cuda_compiler_version:
- '11.8'
cxx_compiler:
- gxx
cxx_compiler_version:
- '12'
- '11'
docker_image:
- quay.io/condaforge/linux-anvil-ppc64le-cuda:11.2
enable_cuda:
- 'True'
enable_ucx:
- 'True'
- quay.io/condaforge/linux-anvil-ppc64le-cuda:11.8
fortran_compiler:
- gfortran
fortran_compiler_version:
- '12'
- '11'
libevent:
- 2.1.12
mpi_type:
Expand All @@ -36,5 +34,9 @@ zip_keys:
- - c_compiler_version
- cxx_compiler_version
- fortran_compiler_version
- cuda_compiler
- cuda_compiler_version
- cdt_name
- docker_image
zlib:
- '1.2'
Loading
Loading