f22d04bdc1
* guix/import/cuda.scm (%cuda-updater): Add variable. * nongnu/packages/nvidia.scm (cuda-cccl, cuda-cudart, cuda-cuobjdump, cuda-cuxxfilt, cuda-cupti, cuda-gdb, libnvvm, cuda-nvcc, cuda-nvml-dev, cuda-nvdisasm, cuda-nvprof, cuda-nvprune, cuda-nvrtc, cuda-nvtx, cuda-opencl, cuda-profiler-api, cuda-sanitizer-api, libcublas, libcufft, libcurand, libcusolver, libcusparse, libnvfatbin, libnvjitlink, libnvjpeg, libnpp, cuda-toolkit, cuda-dev, nvidia-cudnn, nvidia-cudnn-frontend, nvidia-nccl): Add variables. * nonguix/build-system/cuda.scm (cuda-license, cuda-current-system, cuda-module-url, guix-system->cuda-system, %cuda-build-system-modules, cuda-build, cuda-build-system): Add variable. * nonguix/build/binary-build-system.scm (autopatchelf): Add variable. * nonguix/build/cuda-build-system.scm (cuda-build): Add variable. * nonguix/build/utils.scm (install-static-output): Add variable. * nongnu/packages/patches: Add necessary patches.
44 lines
1.1 KiB
Diff
44 lines
1.1 KiB
Diff
From 1b73d8d74b3ec7949e21d926d28385543c202dc7 Mon Sep 17 00:00:00 2001
|
|
From: Nicolas Graves <ngraves@ngraves.fr>
|
|
Date: Thu, 25 Jul 2024 14:33:24 +0200
|
|
Subject: [PATCH] Find dlpack package instead of building it.
|
|
|
|
---
|
|
python/CMakeLists.txt | 13 +++----------
|
|
1 file changed, 3 insertions(+), 10 deletions(-)
|
|
|
|
diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
|
|
index cdfbf55..4168411 100644
|
|
--- a/python/CMakeLists.txt
|
|
+++ b/python/CMakeLists.txt
|
|
@@ -2,15 +2,8 @@ cmake_minimum_required(VERSION 3.18)
|
|
|
|
Include(FetchContent)
|
|
|
|
-# Fetch and build dlpack
|
|
-set(CMAKE_POLICY_DEFAULT_CMP0077 NEW)
|
|
-set(BUILD_MOCK OFF)
|
|
-FetchContent_Declare(
|
|
- dlpack
|
|
- GIT_REPOSITORY https://github.com/dmlc/dlpack
|
|
- GIT_TAG v0.8
|
|
-)
|
|
-FetchContent_MakeAvailable(dlpack)
|
|
+# Find dlpack
|
|
+find_package(dlpack CONFIG REQUIRED)
|
|
|
|
# Find python
|
|
find_package(Python 3.8 COMPONENTS Interpreter Development.Module REQUIRED)
|
|
@@ -60,7 +53,7 @@ target_compile_definitions(_compiled_module PRIVATE NV_CUDNN_FRONTEND_USE_DYNAMI
|
|
target_link_libraries(
|
|
_compiled_module
|
|
|
|
- PRIVATE dlpack
|
|
+ PRIVATE dlpack::dlpack
|
|
)
|
|
|
|
set_target_properties(
|
|
--
|
|
2.45.2
|
|
|