Skip to content

Stop force pulling fmt in nvbench. #12768

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
raydouglass merged 4 commits into from
Feb 15, 2023
Merged

Stop force pulling fmt in nvbench. #12768

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
23dda8e
Stop force pulling fmt in nvbench.
vyasr Feb 13, 2023
a1cfbbf
Update nvbench patch spacing so that it applies cleanly.
vyasr Feb 13, 2023
814f211
Allow nvbench to use an existing fmt when brought in via find_package
robertmaynard Feb 14, 2023
e2698c0
Use use_existing_fmt.diff that now exists in rapids-cmake
robertmaynard Feb 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions cpp/cmake/thirdparty/get_nvbench.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,6 @@ function(find_and_configure_nvbench)
include(${rapids-cmake-dir}/cpm/nvbench.cmake)
include(${rapids-cmake-dir}/cpm/package_override.cmake)

# Find or install NVBench Temporarily force downloading of fmt because current versions of nvbench
# do not support the latest version of fmt, which is automatically pulled into our conda
# environments by mamba.
set(CPM_DOWNLOAD_fmt TRUE)

set(cudf_patch_dir "${CMAKE_CURRENT_FUNCTION_LIST_DIR}/patches")
rapids_cpm_package_override("${cudf_patch_dir}/nvbench_override.json")

Expand Down
20 changes: 10 additions & 10 deletions cpp/cmake/thirdparty/patches/nvbench_global_setup.diff
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/nvbench/main.cuh b/nvbench/main.cuh
index 4c1588c..3ba2b99 100644
index 0ba82d7..7ab02c1 100644
--- a/nvbench/main.cuh
+++ b/nvbench/main.cuh
@@ -54,6 +54,14 @@
Expand All @@ -14,14 +14,14 @@ index 4c1588c..3ba2b99 100644
+#define NVBENCH_ENVIRONMENT nvbench::no_environment
+#endif
+
#define NVBENCH_MAIN_PARSE(argc, argv) \
nvbench::option_parser parser; \
#define NVBENCH_MAIN_PARSE(argc, argv) \
nvbench::option_parser parser; \
parser.parse(argc, argv)
@@ -77,6 +85,7 @@
printer.set_total_state_count(total_states); \
\
printer.set_completed_state_count(0); \
+ NVBENCH_ENVIRONMENT{}; \
for (auto &bench_ptr : benchmarks) \
{ \
bench_ptr->set_printer(printer); \
printer.set_total_state_count(total_states); \
\
printer.set_completed_state_count(0); \
+ NVBENCH_ENVIRONMENT(); \
for (auto &bench_ptr : benchmarks) \
{ \
bench_ptr->set_printer(printer); \
5 changes: 5 additions & 0 deletions cpp/cmake/thirdparty/patches/nvbench_override.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@
"file" : "${current_json_dir}/nvbench_global_setup.diff",
"issue" : "Fix add support for global setup to initialize RMM in nvbench [https://github.com/NVIDIA/nvbench/pull/123]",
"fixed_in" : ""
},
{
"file" : "nvbench/use_existing_fmt.diff",
"issue" : "Fix add support for using an existing fmt [https://github.com/NVIDIA/nvbench/pull/125]",
"fixed_in" : ""
}
]
}
Expand Down