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.
37 lines
1.1 KiB
Diff
37 lines
1.1 KiB
Diff
From 3f7a23cc5a84af36442c4035db78e616d884b540 Mon Sep 17 00:00:00 2001
|
|
From: Nicolas Graves <ngraves@ngraves.fr>
|
|
Date: Thu, 25 Jul 2024 16:43:12 +0200
|
|
Subject: [PATCH] Find unbundled nlohmann-json package.
|
|
|
|
---
|
|
CMakeLists.txt | 6 ++++++
|
|
1 file changed, 6 insertions(+)
|
|
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index adf22fc..8211fcd 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -16,6 +16,11 @@ endif()
|
|
|
|
add_library(cudnn_frontend INTERFACE)
|
|
|
|
+# Find the nlohmann_json package
|
|
+if(NOT CUDNN_FRONTEND_SKIP_NLOHMANN_JSON)
|
|
+ find_package(nlohmann_json CONFIG REQUIRED)
|
|
+endif()
|
|
+
|
|
target_compile_definitions(
|
|
cudnn_frontend INTERFACE
|
|
$<$<BOOL:${CUDNN_FRONTEND_SKIP_JSON_LIB}>:CUDNN_FRONTEND_SKIP_JSON_LIB>
|
|
@@ -25,6 +30,7 @@ target_include_directories(
|
|
cudnn_frontend INTERFACE
|
|
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
|
|
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
|
|
+ $<$<NOT:$<BOOL:${CUDNN_FRONTEND_SKIP_NLOHMANN_JSON}>>:$<TARGET_PROPERTY:nlohmann_json::nlohmann_json,INTERFACE_INCLUDE_DIRECTORIES>>
|
|
)
|
|
|
|
# Find the cuda compiler
|
|
--
|
|
2.45.2
|
|
|