diff --git a/cpp/cmake/thirdparty/get_nvbench.cmake b/cpp/cmake/thirdparty/get_nvbench.cmake index 3a39e6c7ad1..f0642145fa0 100644 --- a/cpp/cmake/thirdparty/get_nvbench.cmake +++ b/cpp/cmake/thirdparty/get_nvbench.cmake @@ -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") diff --git a/cpp/cmake/thirdparty/patches/nvbench_global_setup.diff b/cpp/cmake/thirdparty/patches/nvbench_global_setup.diff index 4e18385f664..0487b0a1ac3 100644 --- a/cpp/cmake/thirdparty/patches/nvbench_global_setup.diff +++ b/cpp/cmake/thirdparty/patches/nvbench_global_setup.diff @@ -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 @@ @@ -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); \ diff --git a/cpp/cmake/thirdparty/patches/nvbench_override.json b/cpp/cmake/thirdparty/patches/nvbench_override.json index ad9b19c29c1..7be868081b6 100644 --- a/cpp/cmake/thirdparty/patches/nvbench_override.json +++ b/cpp/cmake/thirdparty/patches/nvbench_override.json @@ -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" : "" } ] }