Update for CUDA12.6.0 (#24)

automerged PR by conda-forge/automerge-action
conda-forge · Aug 2, 2024 · 00a6db0 · 00a6db0
2 parents 938b371 + 7e388f8
commit 00a6db0
Show file tree

Hide file tree

Showing 10 changed files with 33 additions and 16 deletions.
diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml
diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml
@@ -2,6 +2,10 @@ c_compiler:
 - gcc
 c_compiler_version:
 - '12'
+c_stdlib:
+- sysroot
+c_stdlib_version:
+- '2.17'
 cdt_name:
 - cos7
 channel_sources:
@@ -19,3 +23,5 @@ target_platform:
 zip_keys:
 - - c_compiler_version
   - cxx_compiler_version
+- - c_stdlib_version
+  - cdt_name
diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_.yaml
@@ -6,6 +6,10 @@ c_compiler:
 - gcc
 c_compiler_version:
 - '12'
+c_stdlib:
+- sysroot
+c_stdlib_version:
+- '2.17'
 cdt_arch:
 - aarch64
 cdt_name:
@@ -25,3 +29,5 @@ target_platform:
 zip_keys:
 - - c_compiler_version
   - cxx_compiler_version
+- - c_stdlib_version
+  - cdt_name
diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_.yaml
@@ -6,6 +6,8 @@ VSYEAR:
 - '2019'
 c_compiler:
 - vs2019
+c_stdlib:
+- vs
 channel_sources:
 - conda-forge
 channel_targets:

diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh
diff --git a/README.md b/README.md
diff --git a/build-locally.py b/build-locally.py
diff --git a/conda-forge.yml b/conda-forge.yml
@@ -10,3 +10,7 @@ github:
 provider:
   linux_aarch64: default
   linux_ppc64le: default
+os_version:
+  linux_64: cos7
+  linux_aarch64: cos7
+  linux_ppc64le: cos7
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -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" %}
@@ -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]
@@ -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 }}
@@ -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 }}
@@ -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 }}
@@ -156,6 +154,7 @@ outputs:
       requires:
         - {{ compiler("c") }}
         - {{ compiler("cxx") }}
+        - {{ stdlib("c") }}
         - gxx              # [linux]
         - gcc              # [linux]
         - vs{{ VSYEAR }}_win-64 =={{ CL_VERSION }}  # [win]
@@ -251,6 +250,7 @@ outputs:
       build:
         - {{ compiler("c") }}
         - {{ compiler("cxx") }}
+        - {{ stdlib("c") }}
       host:
         - arm-variant * {{ arm_variant_type }}  # [aarch64]
         - cuda-version {{ cuda_version }}
@@ -313,6 +313,7 @@ outputs:
       build:
         - {{ compiler("c") }}
         - {{ compiler("cxx") }}
+        - {{ stdlib("c") }}
       host:
         - arm-variant * {{ arm_variant_type }}  # [aarch64]
         - cuda-version {{ cuda_version }}

diff --git a/recipe/nvcc.profile.patch b/recipe/nvcc.profile.patch
@@ -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
  NVVMIR_LIBRARY_DIR = $(TOP)/nvvm/libdevice
 
  LD_LIBRARY_PATH += $(TOP)/lib: