Skip to content
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

Fix google benchmark name and update version #425

Merged
merged 6 commits into from
Jun 8, 2023
Merged

Fix google benchmark name and update version #425

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
fd05306
Rename
vyasr Jun 7, 2023
39623ec
Fix versions.json
vyasr Jun 7, 2023
17145b2
Update benchmark version
vyasr Jun 7, 2023
d1aa437
Reuse version and reorder
vyasr Jun 7, 2023
e971d3d
Address one more round of reviews
vyasr Jun 7, 2023
4ead741
Update tests.
bdice Jun 8, 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
16 changes: 8 additions & 8 deletions rapids-cmake/cpm/gbench.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#=============================================================================
# Copyright (c) 2022, NVIDIA CORPORATION.
# Copyright (c) 2022-2023, NVIDIA CORPORATION.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -21,10 +21,10 @@ rapids_cpm_gbench

.. versionadded:: v22.12.00

Allow projects to find or build `Google Benchmark` via `CPM` with built-in
Allow projects to find or build Google Benchmark via `CPM` with built-in
tracking of these dependencies for correct export support.

Uses the version of GBench :ref:`specified in the version file <cpm_versions>` for consistency
Uses the version of Google benchmark :ref:`specified in the version file <cpm_versions>` for consistency
across all RAPIDS projects.

.. code-block:: cmake
Expand All @@ -33,7 +33,7 @@ across all RAPIDS projects.
[INSTALL_EXPORT_SET <export-name>]
[<CPM_ARGS> ...])

.. |PKG_NAME| replace:: GBench
.. |PKG_NAME| replace:: Google benchmark
vyasr marked this conversation as resolved.
Show resolved Hide resolved
.. include:: common_package_args.txt

Result Targets
Expand All @@ -50,16 +50,16 @@ function(rapids_cpm_gbench)
endif()

include("${rapids-cmake-dir}/cpm/detail/package_details.cmake")
rapids_cpm_package_details(GBench version repository tag shallow exclude)
rapids_cpm_package_details(benchmark version repository tag shallow exclude)

include("${rapids-cmake-dir}/cpm/detail/generate_patch_command.cmake")
rapids_cpm_generate_patch_command(GBench ${version} patch_command)
rapids_cpm_generate_patch_command(benchmark ${version} patch_command)

include("${rapids-cmake-dir}/cmake/install_lib_dir.cmake")
rapids_cmake_install_lib_dir(lib_dir)

include("${rapids-cmake-dir}/cpm/find.cmake")
rapids_cpm_find(GBench ${version} ${ARGN}
rapids_cpm_find(benchmark ${version} ${ARGN}
GLOBAL_TARGETS benchmark::benchmark benchmark::benchmark_main
CPM_ARGS
GIT_REPOSITORY ${repository}
Expand All @@ -72,7 +72,7 @@ function(rapids_cpm_gbench)
"CMAKE_INSTALL_LIBDIR ${lib_dir}")

include("${rapids-cmake-dir}/cpm/detail/display_patch_status.cmake")
rapids_cpm_display_patch_status(GBench)
rapids_cpm_display_patch_status(benchmark)

if(NOT TARGET benchmark::benchmark AND TARGET benchmark)
add_library(benchmark::benchmark ALIAS benchmark)
Expand Down
10 changes: 5 additions & 5 deletions rapids-cmake/cpm/versions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@

{
"packages" : {
"benchmark" : {
"version" : "1.8.0",
"git_url" : "https://github.com/google/benchmark.git",
"git_tag" : "v${1.8.0}"
vyasr marked this conversation as resolved.
Show resolved Hide resolved
},
"cuco" : {
"version" : "0.0.1",
"git_shallow" : false,
Expand All @@ -12,11 +17,6 @@
"git_url" : "https://github.com/fmtlib/fmt.git",
"git_tag" : "${version}"
},
"GBench" : {
"version" : "1.5.3",
"git_url" : "https://github.com/google/benchmark.git",
"git_tag" : "v1.5.3"
},
"GTest" : {
"version" : "1.13.0",
"git_url" : "https://github.com/google/googletest.git",
Expand Down