-
Notifications
You must be signed in to change notification settings - Fork 92
Set compiler versions in context #755
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
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -26,33 +26,13 @@ export RAPIDS_ARTIFACTS_DIR | |
| source rapids-rattler-channel-string | ||
|
|
||
| # Construct the extra variants according to the architecture | ||
| if [[ "$(arch)" == "x86_64" ]]; then | ||
| cat > variants.yaml << EOF | ||
| c_compiler_version: | ||
| - 13 | ||
|
|
||
| cxx_compiler_version: | ||
| - 13 | ||
|
|
||
| cuda_version: | ||
| - ${RAPIDS_CUDA_VERSION} | ||
| cat > variants.yaml << EOF | ||
| cuda_version: | ||
| - ${RAPIDS_CUDA_VERSION} | ||
| EOF | ||
| else | ||
| cat > variants.yaml << EOF | ||
| zip_keys: | ||
| - [c_compiler_version, cxx_compiler_version, cuda_version] | ||
|
|
||
| c_compiler_version: | ||
| - 12 | ||
| - 13 | ||
|
|
||
| cxx_compiler_version: | ||
| - 12 | ||
| - 13 | ||
|
|
||
| cuda_version: | ||
| - 12.1 # The last version to not support cufile | ||
| - ${RAPIDS_CUDA_VERSION} | ||
| if [[ "$(arch)" == "aarch64" ]]; then | ||
| cat >> variants.yaml << EOF | ||
| - 12.1 # The last version to not support cufile | ||
|
Comment on lines
+33
to
+35
Member
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Then the legacy CUDA ARM builds are appended to the file This also makes it easier to drop this section of code when it no longer applies |
||
| EOF | ||
| fi | ||
|
|
||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -10,6 +10,8 @@ context: | |
| # 3. Linux aarch64 with CUDA < 12.2, which does not use libcufile | ||
| # Each case has different cuda-version constraints as expressed below | ||
| should_use_cufile: ${{ x86_64 or (aarch64 and cuda_version >= "12.2") }} | ||
| c_compiler_version: ${{ 13 if should_use_cufile else 12 }} | ||
| cxx_compiler_version: ${{ c_compiler_version }} | ||
|
Comment on lines
12
to
+14
Member
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Instead of setting different compiler versions in the CUDA variant file, we just set them here in the context. Also this ties them to the relevant thing. Namely whether we can build with cuFile or not We can see this works as intended with the CUDA 12.1 ARM build |
||
| # When reverting, instances of cuda_key_string can be replaced with cuda_major | ||
| cuda_key_string: ${{ cuda_version | replace(".", "_") }} | ||
| #cuda_version: ${{ (env.get("RAPIDS_CUDA_VERSION") | split("."))[:2] | join(".") }} | ||
|
|
||
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.
This writes out the common variant file content for all cases