From 60b9dcb79deb26a1fecd0b374c9526982d5dc684 Mon Sep 17 00:00:00 2001 From: Allison Piper Date: Wed, 1 May 2024 14:12:58 -0400 Subject: [PATCH 1/3] Remove NVBench SHA override. The necessary changes have been made in upstream rapids-cmake. --- cpp/cmake/thirdparty/get_nvbench.cmake | 1 - cpp/cmake/thirdparty/patches/nvbench_override.json | 9 --------- 2 files changed, 10 deletions(-) delete mode 100644 cpp/cmake/thirdparty/patches/nvbench_override.json diff --git a/cpp/cmake/thirdparty/get_nvbench.cmake b/cpp/cmake/thirdparty/get_nvbench.cmake index bbd22693ba4..466148992e6 100644 --- a/cpp/cmake/thirdparty/get_nvbench.cmake +++ b/cpp/cmake/thirdparty/get_nvbench.cmake @@ -19,7 +19,6 @@ function(find_and_configure_nvbench) include(${rapids-cmake-dir}/cpm/package_override.cmake) set(cudf_patch_dir "${CMAKE_CURRENT_FUNCTION_LIST_DIR}/patches") - rapids_cpm_package_override("${cudf_patch_dir}/nvbench_override.json") rapids_cpm_nvbench(BUILD_STATIC) diff --git a/cpp/cmake/thirdparty/patches/nvbench_override.json b/cpp/cmake/thirdparty/patches/nvbench_override.json deleted file mode 100644 index ef0deb4c1e9..00000000000 --- a/cpp/cmake/thirdparty/patches/nvbench_override.json +++ /dev/null @@ -1,9 +0,0 @@ - -{ - "packages" : { - "nvbench" : { - "git_url": "https://github.com/NVIDIA/nvbench.git", - "git_tag": "555d628e9b250868c9da003e4407087ff1982e8e" - } - } -} From 7241afdb25fbce7043574457bfed547f2a247cd0 Mon Sep 17 00:00:00 2001 From: Allison Piper Date: Wed, 1 May 2024 16:58:45 -0400 Subject: [PATCH 2/3] Update cpp/cmake/thirdparty/get_nvbench.cmake Co-authored-by: Robert Maynard --- cpp/cmake/thirdparty/get_nvbench.cmake | 1 - 1 file changed, 1 deletion(-) diff --git a/cpp/cmake/thirdparty/get_nvbench.cmake b/cpp/cmake/thirdparty/get_nvbench.cmake index 466148992e6..d34d3b1c1f8 100644 --- a/cpp/cmake/thirdparty/get_nvbench.cmake +++ b/cpp/cmake/thirdparty/get_nvbench.cmake @@ -18,7 +18,6 @@ function(find_and_configure_nvbench) include(${rapids-cmake-dir}/cpm/nvbench.cmake) include(${rapids-cmake-dir}/cpm/package_override.cmake) - set(cudf_patch_dir "${CMAKE_CURRENT_FUNCTION_LIST_DIR}/patches") rapids_cpm_nvbench(BUILD_STATIC) From e4cad828c5ffa800f6d814a1f2e90b6098b0d06d Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Thu, 2 May 2024 10:45:44 -0500 Subject: [PATCH 3/3] Update copyright and remove extra newline. --- cpp/cmake/thirdparty/get_nvbench.cmake | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/cpp/cmake/thirdparty/get_nvbench.cmake b/cpp/cmake/thirdparty/get_nvbench.cmake index d34d3b1c1f8..84c27dd9d56 100644 --- a/cpp/cmake/thirdparty/get_nvbench.cmake +++ b/cpp/cmake/thirdparty/get_nvbench.cmake @@ -1,5 +1,5 @@ # ============================================================================= -# Copyright (c) 2023, NVIDIA CORPORATION. +# Copyright (c) 2023-2024, NVIDIA CORPORATION. # # Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except # in compliance with the License. You may obtain a copy of the License at @@ -18,7 +18,6 @@ function(find_and_configure_nvbench) include(${rapids-cmake-dir}/cpm/nvbench.cmake) include(${rapids-cmake-dir}/cpm/package_override.cmake) - rapids_cpm_nvbench(BUILD_STATIC) endfunction()