MNT: rerender (#88)

automerged PR by conda-forge/automerge-action
conda-forge · Oct 15, 2024 · bea44d1 · bea44d1
2 parents 18e506d + d4824d9
commit bea44d1
Show file tree

Hide file tree

Showing 12 changed files with 50 additions and 167 deletions.
diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml
diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml
diff --git a/..._compilercuda-nvcccuda_compiler_version12cxx_compiler_version12python3.8.____cpython.yaml b/..._compilercuda-nvcccuda_compiler_version12cxx_compiler_version12python3.8.____cpython.yaml
diff --git a/..._compilercuda-nvcccuda_compiler_version12cxx_compiler_version12python3.8.____cpython.yaml b/..._compilercuda-nvcccuda_compiler_version12cxx_compiler_version12python3.8.____cpython.yaml
diff --git a/.ci_support/migrations/cuda120.yaml → .ci_support/migrations/cuda12x.yaml b/.ci_support/migrations/cuda120.yaml → .ci_support/migrations/cuda12x.yaml
@@ -1,8 +1,8 @@
-migrator_ts: 1682985063
+migrator_ts: 1728606578
 __migrator:
   kind:
     version
-  # Vendor CUDA 12 migrator to use CUDA 12 (instead of CUDA 12.0).
+  # Use migrator to add CUDA 12 latest.
   use_local: true
   migration_number:
     3
@@ -66,16 +66,8 @@ __migrator:
       - 11.1                       # [(linux64 or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
       - 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                         # [(linux or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
-  commit_message: |
-    Rebuild for CUDA 12 w/arch + Windows support
-    
-    The transition to CUDA 12 SDK includes new packages for all CUDA libraries and
-    build tools. Notably, the cudatoolkit package no longer exists, and packages
-    should depend directly on the specific CUDA libraries (libcublas, libcusolver,
-    etc) as needed. For an in-depth overview of the changes and to report problems
-    [see this issue]( https://github.com/conda-forge/conda-forge.github.io/issues/1963 ).
-    Please feel free to raise any issues encountered there. Thank you! :pray:
 
 cuda_compiler:                 # [(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"]

diff --git a/.ci_support/win_64_cuda_compilercuda-nvcccuda_compiler_version12python3.8.____cpython.yaml b/.ci_support/win_64_cuda_compilercuda-nvcccuda_compiler_version12python3.8.____cpython.yaml
diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh
diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat
diff --git a/README.md b/README.md
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
diff --git a/build-locally.py b/build-locally.py
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -15,11 +15,11 @@ package:
 
 source:
   url: https://github.com/NVIDIA/cuda-python/archive/refs/tags/v{{ version }}.tar.gz
-  sha256: 4b7f81ca48e91c3af58857641115da294885126f00f0b72e3c87db5ed8549ff3
+  sha256: d86d4e64f4b8a037260dfc49df2a12f86c668a2137aa8f57be4dc658eb85401f
 
 build:
-  number: 0
-  {% if not (environ.get("cuda_compiler_version")|string()).startswith(major_version|string()) %}
+  number: 1
+  {% if not (environ.get("cuda_compiler_version")|string()) == (major_version|string()) %}
   skip: true
   {% endif %}
   # `linux_ppc64le` is unsupported by the CUDA Toolkit as of 12.5.0.
@@ -61,8 +61,10 @@ requirements:
     - pip
     - pyclibrary
     - python
-    - setuptools
-    - tomli  # [py<311]
+    # Pin Setuptools to workaround Windows build issue
+    # xref: https://github.com/conda-forge/cuda-python-feedstock/pull/88#issuecomment-2412656425
+    - setuptools <74
+    - tomli           # [py<311]
     - versioneer
     - cuda-version {{ major_version }}.{{ minor_version }}
   run: