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.

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

Jump to bottom

Close CUDA 12 migration (redux) #6263

Merged
merged 1 commit into from
Sep 1, 2024
Merged

Close CUDA 12 migration (redux) #6263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 16 additions & 0 deletions recipe/conda_build_config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ c_compiler_version: # [unix]
- 12 # [linux]
- 16 # [osx]
- 11 # [os.environ.get("CF_CUDA_ENABLED", "False") == "True" and linux]
- 12 # [os.environ.get("CF_CUDA_ENABLED", "false") == "true" and linux]
Copy link
Member Author

Choose a reason for hiding this comment

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

I overlooked one of the places when taking over 1cf8857 where you had put in lower-case booleans, sorry.

Fixed in 23be5a0

Copy link
Member

Choose a reason for hiding this comment

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

No worries. Thanks Axel! 🙏

c_stdlib:
- sysroot # [linux]
- macosx_deployment_target # [osx]
Expand All @@ -16,6 +17,7 @@ m2w64_c_stdlib: # [win]
c_stdlib_version: # [unix]
- 2.17 # [linux]
- 2.17 # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
- 2.17 # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
- 10.13 # [osx and x86_64]
- 11.0 # [osx and arm64]
cxx_compiler:
Expand All @@ -27,6 +29,7 @@ cxx_compiler_version: # [unix]
- 12 # [linux]
- 16 # [osx]
- 11 # [os.environ.get("CF_CUDA_ENABLED", "False") == "True" and linux]
- 12 # [os.environ.get("CF_CUDA_ENABLED", "False") == "True" and linux]
llvm_openmp: # [osx]
- 16 # [osx]
fortran_compiler: # [unix or win64]
Expand All @@ -38,6 +41,7 @@ fortran_compiler_version: # [unix or win64]
- 12 # [osx]
- 5 # [win64]
- 11 # [os.environ.get("CF_CUDA_ENABLED", "False") == "True" and linux]
- 12 # [os.environ.get("CF_CUDA_ENABLED", "False") == "True" and linux]
m2w64_c_compiler: # [win]
- m2w64-toolchain # [win]
m2w64_cxx_compiler: # [win]
Expand All @@ -48,9 +52,11 @@ m2w64_fortran_compiler: # [win]
cuda_compiler:
- None
- nvcc # [(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:
- None
- 11.8 # [(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"]
cuda_compiler_version_min:
- None # [osx]
- 11.8 # [linux or win64]
Expand Down Expand Up @@ -123,6 +129,7 @@ cdt_name: # [linux]
- cos7 # [linux]

- cos7 # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
- cos7 # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]

docker_image: # [os.environ.get("BUILD_PLATFORM", "").startswith("linux-")]
# Native builds
Expand All @@ -140,6 +147,15 @@ docker_image: # [os.environ.get("BUILD_PLATFOR
- quay.io/condaforge/linux-anvil-cuda:11.8 # [ppc64le and os.environ.get("CF_CUDA_ENABLED", "False") == "True" and os.environ.get("BUILD_PLATFORM") == "linux-64"]
- quay.io/condaforge/linux-anvil-cuda:11.8 # [aarch64 and os.environ.get("CF_CUDA_ENABLED", "False") == "True" and os.environ.get("BUILD_PLATFORM") == "linux-64"]

# CUDA 12
- quay.io/condaforge/linux-anvil-cos7-x86_64 # [linux64 and os.environ.get("CF_CUDA_ENABLED", "False") == "True" and os.environ.get("BUILD_PLATFORM") == "linux-64"]
# case: native compilation (build == target)
- quay.io/condaforge/linux-anvil-ppc64le # [ppc64le and os.environ.get("CF_CUDA_ENABLED", "False") == "True" and os.environ.get("BUILD_PLATFORM") == "linux-ppc64le"]
- quay.io/condaforge/linux-anvil-aarch64 # [aarch64 and os.environ.get("CF_CUDA_ENABLED", "False") == "True" and os.environ.get("BUILD_PLATFORM") == "linux-aarch64"]
# case: cross-compilation (build != target)
- quay.io/condaforge/linux-anvil-cos7-x86_64 # [ppc64le and os.environ.get("CF_CUDA_ENABLED", "False") == "True" and os.environ.get("BUILD_PLATFORM") == "linux-64"]
- quay.io/condaforge/linux-anvil-cos7-x86_64 # [aarch64 and os.environ.get("CF_CUDA_ENABLED", "False") == "True" and os.environ.get("BUILD_PLATFORM") == "linux-64"]

zip_keys:
# For CUDA, c_stdlib_version/cdt_name is zipped below with the compilers.
- # [linux and os.environ.get("CF_CUDA_ENABLED", "False") != "True"]
Expand Down
106 changes: 0 additions & 106 deletions recipe/migrations/cuda120.yaml
View file
Open in desktop

This file was deleted.