mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-10-30 08:00:59 +00:00
python3Packages.cuda-cccl: 1.2.1 -> 1.3.0
Diff: https://github.com/NVIDIA/cccl/compare/python-1.2.1...python-1.3.0 Changelog: https://github.com/NVIDIA/cccl/releases/tag/python-1.3.0
This commit is contained in:
@@ -3,7 +3,6 @@
|
||||
config,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
cudaPackages,
|
||||
replaceVars,
|
||||
|
||||
@@ -31,7 +30,7 @@
|
||||
|
||||
buildPythonPackage.override { stdenv = cudaPackages.backendStdenv; } (finalAttrs: {
|
||||
pname = "cuda-cccl";
|
||||
version = "1.2.1";
|
||||
version = "1.3.0";
|
||||
pyproject = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
@@ -39,7 +38,7 @@ buildPythonPackage.override { stdenv = cudaPackages.backendStdenv; } (finalAttrs
|
||||
owner = "NVIDIA";
|
||||
repo = "cccl";
|
||||
tag = "python-${finalAttrs.version}";
|
||||
hash = "sha256-GyZD6YGqZNS3HDuhv0Y286LtisqqxHLr8SlGee5rXlw=";
|
||||
hash = "sha256-3lPANIBPFP/U8S3sMiA9jPvHD3/k7kwEt8qkXd57Avw=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/python/cuda_cccl";
|
||||
@@ -50,21 +49,12 @@ buildPythonPackage.override { stdenv = cudaPackages.backendStdenv; } (finalAttrs
|
||||
|
||||
patches = [
|
||||
(replaceVars ./patch-nvidia-libs-paths.patch {
|
||||
libcudart = lib.getLib cudaPackages.cuda_cudart;
|
||||
libnvjitlink = lib.getLib cudaPackages.libnvjitlink;
|
||||
libnvrtc = lib.getLib cudaPackages.cuda_nvrtc;
|
||||
})
|
||||
|
||||
# Disable all tests requiring unpackaged `numba-cuda-mlir` through `cuda.compute`
|
||||
./skip-missing-jit-backend.patch
|
||||
|
||||
# Fix build with CUDA >= 13.4
|
||||
# https://github.com/NVIDIA/cccl/pull/11823
|
||||
(fetchpatch {
|
||||
name = "c-parallel-allow-cuda-13_4.patch";
|
||||
url = "https://github.com/NVIDIA/cccl/commit/1504f9d7a6a8b15679c36df2f1ee11a413fdedc8.patch";
|
||||
hash = "sha256-OPwoxwshkw+h4pD60/eCxUi8O1WM2WhNSchxkGdagU4=";
|
||||
})
|
||||
];
|
||||
# Apply patches from the repository root (parent of sourceRoot)
|
||||
patchFlags = [
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
diff --git a/python/cuda_cccl/cuda/compute/_bindings.py b/python/cuda_cccl/cuda/compute/_bindings.py
|
||||
index 81aacebfbb..3947a4ac81 100644
|
||||
index 4c0012b1bf..5c0ee776ea 100644
|
||||
--- a/python/cuda_cccl/cuda/compute/_bindings.py
|
||||
+++ b/python/cuda_cccl/cuda/compute/_bindings.py
|
||||
@@ -27,9 +27,7 @@ from __future__ import annotations
|
||||
@@ -27,17 +27,15 @@ from __future__ import annotations
|
||||
import importlib
|
||||
import os
|
||||
|
||||
@@ -13,15 +13,13 @@ index 81aacebfbb..3947a4ac81 100644
|
||||
|
||||
from cuda.cccl._cuda_version_utils import detect_cuda_version, get_recommended_extra
|
||||
|
||||
@@ -43,8 +41,9 @@ def _load_cuda_libraries():
|
||||
# nvJitLink. Without this preload the extension imports only where a system
|
||||
# CUDA toolkit happens to be installed; a plain `pip install cuda-cccl[cu13]`
|
||||
# fails to find it even though cuda-toolkit[cudart] is a declared dependency.
|
||||
- for libname in ("nvrtc", "nvJitLink", "cudart"):
|
||||
|
||||
def _load_cuda_libraries():
|
||||
# Load appropriate libraries for the detected CUDA version.
|
||||
- for libname in ("nvrtc", "nvJitLink"):
|
||||
- load_nvidia_dynamic_lib(libname)
|
||||
+ CDLL("@libnvrtc@/lib/libnvrtc.so")
|
||||
+ CDLL("@libnvjitlink@/lib/libnvJitLink.so")
|
||||
+ CDLL("@libcudart@/lib/libcudart.so")
|
||||
|
||||
|
||||
_load_cuda_libraries()
|
||||
|
||||
Reference in New Issue
Block a user