NVIDIA/nvbench
1
0
Fork 0
mirror of https://github.com/NVIDIA/nvbench.git synced 2026-03-14 20:27:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #213 from alliepiper/version_prefix_fix

Browse Source 
Use the new(ish) PREFIX option of rapids-cmake version, git revision header utils.
This commit is contained in:
Allison Piper
2025-04-15 17:17:42 -04:00
committed by GitHub
parent eadb913322 109449438b
commit 46ab283d02
4 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cmake/NVBenchRapidsCMake.cmake
View File

@@ -20,6 +20,9 @@ endmacro()
# Called after project(...)
macro(nvbench_init_rapids_cmake)
rapids_cmake_build_type(Release)
rapids_cmake_write_version_file("${NVBench_BINARY_DIR}/nvbench/detail/version.cuh")
rapids_cmake_write_version_file(
"${NVBench_BINARY_DIR}/nvbench/detail/version.cuh"
PREFIX "NVBENCH"
)
rapids_cpm_init()
endmacro()

1
nvbench/CMakeLists.txt
View File

@@ -139,6 +139,7 @@ endif()
rapids_cmake_write_git_revision_file(
nvbench_git_revision
"${NVBench_BINARY_DIR}/nvbench/detail/git_revision.cuh"
PREFIX "NVBENCH"
)
target_link_libraries(nvbench PRIVATE nvbench_git_revision)

9
nvbench/git_revision.cuh
View File

@@ -18,12 +18,5 @@
#pragma once
// Include the auto-generated git revision header:
#include <nvbench/detail/git_revision.cuh>
// WAR issue rapidsai/rapids-cmake#99:
#define NVBENCH_GIT_BRANCH NVBench_GIT_BRANCH
#define NVBENCH_GIT_SHA1 NVBench_GIT_SHA1
#define NVBENCH_GIT_VERSION NVBench_GIT_VERSION
#ifdef NVBench_GIT_IS_DIRTY
#define NVBENCH_GIT_IS_DIRTY
#endif

6
nvbench/version.cuh
View File

@@ -18,13 +18,9 @@
#pragma once
// Include the auto-generated version header:
#include <nvbench/detail/version.cuh>
// WAR issue rapidsai/rapids-cmake#99
#define NVBENCH_VERSION_MAJOR NVBench_VERSION_MAJOR
#define NVBENCH_VERSION_MINOR NVBench_VERSION_MINOR
#define NVBENCH_VERSION_PATCH NVBench_VERSION_PATCH
// clang-format off
/// Numeric version as "MMmmpp"