[RFC]: Add os_version option to use alma8
#6548
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -15,9 +15,11 @@ c_stdlib: | |
| m2w64_c_stdlib: # [win] | ||
| - m2w64-toolchain # [win] | ||
| c_stdlib_version: # [unix] | ||
| - 2.17 # [linux and os.environ.get("DEFAULT_LINUX_VERSION", "cos7") == "cos7"] | ||
| - 2.28 # [linux and os.environ.get("DEFAULT_LINUX_VERSION", "cos7") == "alma8"] | ||
| - 2.17 # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] | ||
| - 2.17 # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True" and os.environ.get("DEFAULT_LINUX_VERSION", "cos7") == "cos7"] | ||
| - 2.28 # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True" and os.environ.get("DEFAULT_LINUX_VERSION", "cos7") == "alma8"] | ||
| - 10.13 # [osx and x86_64] | ||
| - 11.0 # [osx and arm64] | ||
| cxx_compiler: | ||
|
|
@@ -125,17 +127,24 @@ channel_sources: | |
| channel_targets: | ||
| - conda-forge main | ||
|
|
||
| cdt_name: # [linux] | ||
| - cos7 # [linux and os.environ.get("DEFAULT_LINUX_VERSION", "cos7") == "cos7"] | ||
| - conda # [linux and os.environ.get("DEFAULT_LINUX_VERSION", "cos7") == "alma8"] | ||
|
Comment on lines
+130
to
+132
There was a problem hiding this comment. you can just use cdt_name: # [linux]
- conda # [linux]without any further lines/selectors (and remove it from the zips). This is what we discussed today in the core-call; those CDTs will be available after conda-forge/cdt-builds#71 is merged. |
||
|
|
||
| - cos7 # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] | ||
| - cos7 # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True" and os.environ.get("DEFAULT_LINUX_VERSION", "cos7") == "cos7"] | ||
| - conda # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True" and os.environ.get("DEFAULT_LINUX_VERSION", "cos7") == "alma8"] | ||
|
|
||
| docker_image: # [os.environ.get("BUILD_PLATFORM", "").startswith("linux-")] | ||
| # Native builds on CentOS 7 | ||
| - quay.io/condaforge/linux-anvil-cos7-x86_64 # [os.environ.get("BUILD_PLATFORM") == "linux-64" and os.environ.get("DEFAULT_LINUX_VERSION", "cos7") == "cos7"] | ||
| - quay.io/condaforge/linux-anvil-aarch64 # [os.environ.get("BUILD_PLATFORM") == "linux-aarch64" and os.environ.get("DEFAULT_LINUX_VERSION", "cos7") == "cos7"] | ||
| - quay.io/condaforge/linux-anvil-ppc64le # [os.environ.get("BUILD_PLATFORM") == "linux-ppc64le" and os.environ.get("DEFAULT_LINUX_VERSION", "cos7") == "cos7"] | ||
|
|
||
| # Native builds on AlmaLinux 8 | ||
| - quay.io/condaforge/linux-anvil-alma-x86_64:8 # [os.environ.get("BUILD_PLATFORM") == "linux-64" and os.environ.get("DEFAULT_LINUX_VERSION", "cos7") == "alma8"] | ||
| - quay.io/condaforge/linux-anvil-alma-aarch64:8 # [os.environ.get("BUILD_PLATFORM") == "linux-aarch64" and os.environ.get("DEFAULT_LINUX_VERSION", "cos7") == "alma8"] | ||
| - quay.io/condaforge/linux-anvil-alma-ppc64le:8 # [os.environ.get("BUILD_PLATFORM") == "linux-ppc64le" and os.environ.get("DEFAULT_LINUX_VERSION", "cos7") == "alma8"] | ||
|
|
||
| # CUDA 11.8 | ||
| - quay.io/condaforge/linux-anvil-cuda:11.8 # [linux64 and os.environ.get("CF_CUDA_ENABLED", "False") == "True" and os.environ.get("BUILD_PLATFORM") == "linux-64"] | ||
|
|
@@ -146,14 +155,23 @@ 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 on CentOS 7 | ||
| - 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" and os.environ.get("DEFAULT_LINUX_VERSION", "cos7") == "cos7"] | ||
| # 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" and os.environ.get("DEFAULT_LINUX_VERSION", "cos7") == "cos7"] | ||
| - quay.io/condaforge/linux-anvil-aarch64 # [aarch64 and os.environ.get("CF_CUDA_ENABLED", "False") == "True" and os.environ.get("BUILD_PLATFORM") == "linux-aarch64" and os.environ.get("DEFAULT_LINUX_VERSION", "cos7") == "cos7"] | ||
h-vetinari marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| # 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" and os.environ.get("DEFAULT_LINUX_VERSION", "cos7") == "cos7"] | ||
| - 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" and os.environ.get("DEFAULT_LINUX_VERSION", "cos7") == "cos7"] | ||
|
|
||
| # CUDA 12 on AlmaLinux8 | ||
| - quay.io/condaforge/linux-anvil-alma-x86_64:8 # [linux64 and os.environ.get("CF_CUDA_ENABLED", "False") == "True" and os.environ.get("BUILD_PLATFORM") == "linux-64" and os.environ.get("DEFAULT_LINUX_VERSION", "cos7") == "alma8"] | ||
| # case: native compilation (build == target) | ||
| - quay.io/condaforge/linux-anvil-alma-ppc64le:8 # [ppc64le and os.environ.get("CF_CUDA_ENABLED", "False") == "True" and os.environ.get("BUILD_PLATFORM") == "linux-ppc64le" and os.environ.get("DEFAULT_LINUX_VERSION", "cos7") == "alma8"] | ||
| - quay.io/condaforge/linux-anvil-alma-aarch64:8 # [aarch64 and os.environ.get("CF_CUDA_ENABLED", "False") == "True" and os.environ.get("BUILD_PLATFORM") == "linux-aarch64" and os.environ.get("DEFAULT_LINUX_VERSION", "cos7") == "alma8"] | ||
| # case: cross-compilation (build != target) | ||
| - quay.io/condaforge/linux-anvil-alma-x86_64:8 # [ppc64le and os.environ.get("CF_CUDA_ENABLED", "False") == "True" and os.environ.get("BUILD_PLATFORM") == "linux-64" and os.environ.get("DEFAULT_LINUX_VERSION", "cos7") == "alma8"] | ||
| - quay.io/condaforge/linux-anvil-alma-x86_64:8 # [aarch64 and os.environ.get("CF_CUDA_ENABLED", "False") == "True" and os.environ.get("BUILD_PLATFORM") == "linux-64" and os.environ.get("DEFAULT_LINUX_VERSION", "cos7") == "alma8"] | ||
|
|
||
| zip_keys: | ||
| # For CUDA, c_stdlib_version/cdt_name is zipped below with the compilers. | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm pretty sure we don't want to touch the stdlib version here; for example, the newer image might just be required to satisfy the
__glibcconstraint of a build or test dependency, but doesn't necessarily mean that the package itself needs a newer glibc and run-constraint.Despite the monster-zip it remains possible to override one component locally - e.g.
c_stdlib_version, and then setos_versionfor the image. I'd also prefer the choice ofc_stdlib_versionto be more visible than something implicitly implied by a knob tucked away inconda-forge.yml.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
OK, I've tested this hypothesis (already before commenting but) now also using a local checkout of #6626 - here's the resulting branch.
Basically, this works as intended if we also take the
c_stdlib_versionout of the CUDA zip, which I think is possible now. That would be the ideal scenario for me - thec_stdlib_versioncan be independently set (in CBC), from the image (inconda-forge.yml, or in CBC if the full zip is overridden).