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

Update for CUDA12.6.0 #24

Merged
merged 8 commits into from
Aug 2, 2024
Merged

Update for CUDA12.6.0 #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
939cf2e
Update for CUDA 12.6.0
adibbley Aug 2, 2024
f35f4a2
MNT: Re-rendered with conda-build 24.5.0, conda-smithy 3.37.2, and co…
adibbley Aug 2, 2024
06ce6ae
Fix patch
adibbley Aug 2, 2024
3890d78
Migrate to stdlib
adibbley Aug 2, 2024
7588aa6
MNT: Re-rendered with conda-build 24.5.0, conda-smithy 3.37.2, and co…
adibbley Aug 2, 2024
a28e123
Migrate to stdlib
adibbley Aug 2, 2024
16d11fa
Set `os_version` for `linux*` to `cos7`
jakirkham Aug 2, 2024
7e388f8
Move `cuda-nvcc-impl`'s `stdlib("c")` to `test`
jakirkham Aug 2, 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
2 changes: 1 addition & 1 deletion .azure-pipelines/azure-pipelines-win.yml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .ci_support/linux_64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@ c_compiler:
- gcc
c_compiler_version:
- '12'
c_stdlib:
- sysroot
c_stdlib_version:
- '2.17'
cdt_name:
- cos7
channel_sources:
Expand All @@ -19,3 +23,5 @@ target_platform:
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- - c_stdlib_version
- cdt_name
6 changes: 6 additions & 0 deletions .ci_support/linux_aarch64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ c_compiler:
- gcc
c_compiler_version:
- '12'
c_stdlib:
- sysroot
c_stdlib_version:
- '2.17'
cdt_arch:
- aarch64
cdt_name:
Expand All @@ -25,3 +29,5 @@ target_platform:
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- - c_stdlib_version
- cdt_name
2 changes: 2 additions & 0 deletions .ci_support/win_64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ VSYEAR:
- '2019'
c_compiler:
- vs2019
c_stdlib:
- vs
channel_sources:
- conda-forge
channel_targets:
Expand Down
1 change: 0 additions & 1 deletion .scripts/build_steps.sh
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions build-locally.py
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions conda-forge.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,7 @@ github:
provider:
linux_aarch64: default
linux_ppc64le: default
os_version:
linux_64: cos7
linux_aarch64: cos7
linux_ppc64le: cos7
19 changes: 10 additions & 9 deletions recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{% set name = "cuda-nvcc-impl" %}
{% set version = "12.5.82" %}
{% set cuda_version = "12.5" %}
{% set version = "12.6.20" %}
{% set cuda_version = "12.6" %}
{% set cuda_version_next_major = (cuda_version.split(".")[0]|int + 1)|string + ".0a0" %}
{% set gcc_min_constraint = ">=6" %}
{% set gcc_constraint = ">=6,<14.0a0" %}
Expand All @@ -23,9 +23,9 @@ package:

source:
url: https://developer.download.nvidia.com/compute/cuda/redist/cuda_nvcc/{{ platform }}/cuda_nvcc-{{ platform }}-{{ version }}-archive.{{ extension }}
sha256: ded05fe3c8d075c6c1bf892005d3c50bde3eceaa049b879fcdff6158e068e3be # [linux64]
sha256: 345a80c87627a414516e1bfdd99ec97f6a02039c9b82b2610bc5a93e035ca954 # [aarch64]
sha256: 51cec40087b524478c4d204a102ad5de86cd30d0bd2f9e87339032b55296448b # [win]
sha256: 4336a230269db14336ca1f727a0502631390a52d37c17d3bde05ccda5d534406 # [linux64]
sha256: 06112bf1cc0cfb6b881a2e0420cb4611b6d701decbb195fbfb4f0e9966a42006 # [aarch64]
sha256: 03282a36fb98c2f227877a62efd04c36b1ab01fb1b676d9edbd0b10179e0a40a # [win]
patches:
- nvcc.profile.patch # [linux]
- nvcc.profile.patch.win # [win]
Expand All @@ -42,7 +42,7 @@ outputs:
build:
- {{ compiler("c") }}
- {{ compiler("cxx") }}
- sysroot_{{ target_platform }} 2.17 # [linux]
- {{ stdlib("c") }}
host:
- arm-variant * {{ arm_variant_type }} # [aarch64]
- cuda-version {{ cuda_version }}
Expand Down Expand Up @@ -89,7 +89,7 @@ outputs:
- Library\lib\nvptxcompiler_static.lib # [win]
requirements:
build:
- sysroot_{{ target_platform }} 2.17 # [linux]
- {{ stdlib("c") }}
host:
- arm-variant * {{ arm_variant_type }} # [aarch64]
- cuda-version {{ cuda_version }}
Expand Down Expand Up @@ -135,8 +135,6 @@ outputs:
files: # [linux]
- lib/libnvptxcompiler_static.a # [linux]
requirements:
build:
- sysroot_{{ target_platform }} 2.17 # [linux]
host:
- arm-variant * {{ arm_variant_type }} # [aarch64]
- cuda-version {{ cuda_version }}
Expand All @@ -156,6 +154,7 @@ outputs:
requires:
- {{ compiler("c") }}
- {{ compiler("cxx") }}
- {{ stdlib("c") }}
- gxx # [linux]
- gcc # [linux]
- vs{{ VSYEAR }}_win-64 =={{ CL_VERSION }} # [win]
Expand Down Expand Up @@ -251,6 +250,7 @@ outputs:
build:
- {{ compiler("c") }}
- {{ compiler("cxx") }}
- {{ stdlib("c") }}
host:
- arm-variant * {{ arm_variant_type }} # [aarch64]
- cuda-version {{ cuda_version }}
Expand Down Expand Up @@ -313,6 +313,7 @@ outputs:
build:
- {{ compiler("c") }}
- {{ compiler("cxx") }}
- {{ stdlib("c") }}
host:
- arm-variant * {{ arm_variant_type }} # [aarch64]
- cuda-version {{ cuda_version }}
Expand Down
3 changes: 1 addition & 2 deletions recipe/nvcc.profile.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
--- bin/nvcc.profile.bak 2024-03-12 15:52:23.511145665 +0000
+++ bin/nvcc.profile 2024-03-12 16:27:28.806624738 +0000
@@ -1,16 +1,16 @@
@@ -1,15 +1,15 @@

-TOP = $(_HERE_)/..
+TOP = $(_HERE_)/../$(_TARGET_DIR_)

CICC_PATH = $(TOP)/nvvm/bin
CICC_NEXT_PATH = $(TOP)/nvvm-next/bin
Copy link
Member

Choose a reason for hiding this comment

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

@robertmaynard am assuming this is ok since this is dropped from the source file. We were not patching this line. Though please let us know if we need to change anything here

Copy link
Member

Choose a reason for hiding this comment

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

Ah missed Rob is out today. Think we should be ok here. So let's go ahead and merge

We can follow up with Rob when he get back

NVVMIR_LIBRARY_DIR = $(TOP)/nvvm/libdevice

LD_LIBRARY_PATH += $(TOP)/lib:
Expand Down