Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
32 changes: 32 additions & 0 deletions recipe/conda_build_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ c_compiler_version: # [unix]
- 16 # [osx]
- 10 # [os.environ.get("CF_CUDA_ENABLED", "False") == "True" and linux]
- 11 # [os.environ.get("CF_CUDA_ENABLED", "False") == "True" and linux]
- 12 # [os.environ.get("cf_cuda_enabled", "false") == "true" and linux]
- 12 # [os.environ.get("cf_cuda_enabled", "false") == "true" and linux]
Comment on lines +11 to +12

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

This is incorrectly lower-cased here (that environment variable is not set by smithy)

c_stdlib:
- sysroot # [linux]
- macosx_deployment_target # [osx]
Expand All @@ -18,6 +20,8 @@ c_stdlib_version: # [unix]
- 2.17 # [linux and not x86_64]
- 2.17 # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
- 2.17 # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
- 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.9 # [osx and x86_64]
- 11.0 # [osx and arm64]
cxx_compiler:
Expand All @@ -30,6 +34,8 @@ cxx_compiler_version: # [unix]
- 16 # [osx]
- 10 # [os.environ.get("CF_CUDA_ENABLED", "False") == "True" and linux]
- 11 # [os.environ.get("CF_CUDA_ENABLED", "False") == "True" and linux]
- 12 # [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 @@ -42,6 +48,8 @@ fortran_compiler_version: # [unix or win64]
- 5 # [win64]
- 10 # [os.environ.get("CF_CUDA_ENABLED", "False") == "True" and linux]
- 11 # [os.environ.get("CF_CUDA_ENABLED", "False") == "True" and linux]
- 12 # [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 @@ -53,10 +61,14 @@ cuda_compiler:
- None
- nvcc # [(linux or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
- 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-nvcc # [(linux or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
cuda_compiler_version:
- None
- 11.2 # [(linux or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
- 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"]
- 12.4 # [(linux or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Are packages built for 12.0 expected to always successfully build with 12.4? Shouldn't we separate the closing of the 12.0 migration from adding 12.4...?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I remember that in some feedstocks I had to add some code to explicitly use 12.0 to compile. This code should work with 12.4 but as it is not tested, I would feel better if we had a migrator first.

cuda_compiler_version_min:
- None # [osx]
- 11.2 # [linux or win64]

@h-vetinari h-vetinari Apr 23, 2024

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

This also needs to be bumped (assuming we drop CUDA 11.2 here).

Expand Down Expand Up @@ -133,6 +145,8 @@ cdt_name: # [linux]

- cos7 # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
- cos7 # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
- 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 @@ -159,6 +173,24 @@ 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.0
- quay.io/condaforge/linux-anvil-cos7-x86_64 # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64" and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
# case: native compilation (build == target)
- quay.io/condaforge/linux-anvil-ppc64le # [ppc64le and os.environ.get("BUILD_PLATFORM") == "linux-ppc64le"]
- quay.io/condaforge/linux-anvil-aarch64 # [aarch64 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("BUILD_PLATFORM") == "linux-64"]
- quay.io/condaforge/linux-anvil-cos7-x86_64 # [aarch64 and os.environ.get("BUILD_PLATFORM") == "linux-64"]
Comment on lines +178 to +183

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I'm also pretty sure that the selectors here need os.environ.get("CF_CUDA_ENABLED", "False") == "True" (which was active in the migrator through the selector on docker_images).


# CUDA 12.4
- quay.io/condaforge/linux-anvil-cos7-x86_64 # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64" and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
# case: native compilation (build == target)
- quay.io/condaforge/linux-anvil-ppc64le # [ppc64le and os.environ.get("BUILD_PLATFORM") == "linux-ppc64le"]
- quay.io/condaforge/linux-anvil-aarch64 # [aarch64 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("BUILD_PLATFORM") == "linux-64"]
- quay.io/condaforge/linux-anvil-cos7-x86_64 # [aarch64 and os.environ.get("BUILD_PLATFORM") == "linux-64"]

zip_keys:
- # [unix]
- c_compiler_version # [unix]
Expand Down
106 changes: 0 additions & 106 deletions recipe/migrations/cuda120.yaml

This file was deleted.