-
Notifications
You must be signed in to change notification settings - Fork 48
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'branch-23.04' into fea/rapids-cmake-test
- Loading branch information
Showing
16 changed files
with
370 additions
and
44 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| #============================================================================= | ||
| # Copyright (c) 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. | ||
| # You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, software | ||
| # distributed under the License is distributed on an "AS IS" BASIS, | ||
| # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| # See the License for the specific language governing permissions and | ||
| # limitations under the License. | ||
| #============================================================================= | ||
| include_guard(GLOBAL) | ||
|
|
||
| #[=======================================================================[.rst: | ||
| download_proprietary_binary | ||
| ------------------- | ||
| .. versionadded:: v23.04.00 | ||
| Download the associated proprietary binary from the providied URL and make | ||
| it part of the project with `FetchContent_MakeAvailable` | ||
| #]=======================================================================] | ||
| function(rapids_cpm_download_proprietary_binary package_name url) | ||
| list(APPEND CMAKE_MESSAGE_CONTEXT "rapids.cpm.rapids_cpm_download_proprietary_binary") | ||
|
|
||
| # download and extract the binaries since they don't exist on the machine | ||
| include(FetchContent) | ||
| set(pkg_name "${package_name}_proprietary_binary") | ||
|
|
||
| if(POLICY CMP0135) | ||
| cmake_policy(SET CMP0135 NEW) | ||
| set(CMAKE_POLICY_DEFAULT_CMP0135 NEW) | ||
| endif() | ||
|
|
||
| FetchContent_Declare(${pkg_name} URL ${url}) | ||
| FetchContent_MakeAvailable(${pkg_name}) | ||
|
|
||
| # Tell the subsequent rapids_cpm_find where to search so that it uses this binary | ||
| set(${package_name}_ROOT "${${pkg_name}_SOURCE_DIR}" PARENT_SCOPE) | ||
| set(${package_name}_proprietary_binary ON PARENT_SCOPE) | ||
| endfunction() |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
31 changes: 31 additions & 0 deletions
31
rapids-cmake/cpm/patches/nvbench/public_fmt_dep_in_conda.diff
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| diff --git a/nvbench/CMakeLists.txt b/nvbench/CMakeLists.txt | ||
| index f86bd41..ba6418f 100644 | ||
| --- a/nvbench/CMakeLists.txt | ||
| +++ b/nvbench/CMakeLists.txt | ||
| @@ -76,10 +76,25 @@ target_link_libraries(nvbench | ||
| PUBLIC | ||
| ${ctk_libraries} | ||
| PRIVATE | ||
| - fmt::fmt | ||
| nvbench_json | ||
| nvbench_git_revision | ||
| ) | ||
| + | ||
| +# ################################################################################################## | ||
| +# * conda environment ----------------------------------------------------------------------------- | ||
| +rapids_cmake_support_conda_env(conda_env MODIFY_PREFIX_PATH) | ||
| +if(TARGET conda_env) | ||
| + # When we are inside a conda env the linker will be set to | ||
| + # `ld.bfd` which will try to resolve all undefined symbols at link time. | ||
| + # | ||
| + # Since we could be using a shared library version of fmt we need | ||
| + # it on the final link line of consumers | ||
| + target_link_libraries(nvbench PRIVATE $<BUILD_INTERFACE:conda_env> | ||
| + PUBLIC fmt::fmt) | ||
| +else() | ||
| + target_link_libraries(nvbench PRIVATE fmt::fmt) | ||
| +endif() | ||
| + | ||
| target_compile_features(nvbench PUBLIC cuda_std_17 PRIVATE cxx_std_17) | ||
| add_dependencies(nvbench.all nvbench) | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,55 @@ | ||
| #============================================================================= | ||
| # Copyright (c) 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. | ||
| # You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, software | ||
| # distributed under the License is distributed on an "AS IS" BASIS, | ||
| # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| # See the License for the specific language governing permissions and | ||
| # limitations under the License. | ||
| #============================================================================= | ||
| include(${rapids-cmake-dir}/cpm/init.cmake) | ||
| include(${rapids-cmake-dir}/cpm/rmm.cmake) | ||
| include(${rapids-cmake-dir}/cpm/nvbench.cmake) | ||
|
|
||
| enable_language(CUDA) | ||
| enable_language(CXX) | ||
|
|
||
| include(${rapids-cmake-dir}/cuda/set_architectures.cmake) | ||
| rapids_cuda_set_architectures(RAPIDS) | ||
|
|
||
| # Force shared libs so that nvbench doesn't have a chance to use a static fmt | ||
| set(BUILD_SHARED_LIBS ON) | ||
| set(NVBench_ENABLE_CUPTI OFF) | ||
| rapids_cpm_init() | ||
| rapids_cpm_rmm() | ||
| rapids_cpm_nvbench() | ||
|
|
||
| file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/use_fmt.cpp" [=[ | ||
| #include <spdlog/spdlog.h> | ||
| #include <nvbench/nvbench.cuh> | ||
|
|
||
| template <typename Type> | ||
| void nvbench_distinct(nvbench::state& state, nvbench::type_list<Type>) | ||
| { | ||
| } | ||
|
|
||
| using data_type = nvbench::type_list<bool, int8_t, int32_t, int64_t, float>; | ||
|
|
||
| NVBENCH_BENCH_TYPES(nvbench_distinct, NVBENCH_TYPE_AXES(data_type)) | ||
| .set_name("distinct") | ||
| .set_type_axes_names({"Type"}) | ||
| .add_int64_axis("NumRows", {10'000, 100'000, 1'000'000, 10'000'000}); | ||
|
|
||
| int main() { return 0; } | ||
| ]=]) | ||
|
|
||
|
|
||
| add_library(uses_fmt SHARED "${CMAKE_CURRENT_BINARY_DIR}/use_fmt.cpp") | ||
| target_link_libraries(uses_fmt PRIVATE rmm::rmm nvbench::nvbench) | ||
| target_compile_features(uses_fmt PRIVATE cxx_std_17) |
50 changes: 50 additions & 0 deletions
50
testing/cpm/cpm_proprietary-url-ctk-version-find-ctk.cmake
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,50 @@ | ||
| #============================================================================= | ||
| # Copyright (c) 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. | ||
| # You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, software | ||
| # distributed under the License is distributed on an "AS IS" BASIS, | ||
| # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| # See the License for the specific language governing permissions and | ||
| # limitations under the License. | ||
| #============================================================================= | ||
| include(${rapids-cmake-dir}/cpm/init.cmake) | ||
| include(${rapids-cmake-dir}/cpm/package_override.cmake) | ||
| include(${rapids-cmake-dir}/cpm/detail/get_proprietary_binary_url.cmake) | ||
| include(${rapids-cmake-dir}/cpm/detail/package_details.cmake) | ||
|
|
||
| rapids_cpm_init() | ||
|
|
||
| # Need to write out an override file with a proprietary blob url | ||
| file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/override.json | ||
| [=[ | ||
| { | ||
| "packages" : { | ||
| "test_binary" : { | ||
| "version" : "2.6.1", | ||
| "proprietary_binary" : { | ||
| "x86_64-linux" : "https://fake.url.com/${version}/${cuda-toolkit-version}/x86_64_${cuda-toolkit-version-major}.tgz", | ||
| "aarch64-linux" : "https://fake.url.com/${version}/${cuda-toolkit-version}/aarch64_${cuda-toolkit-version-major}.tgz", | ||
| } | ||
| } | ||
| } | ||
| } | ||
| ]=]) | ||
| rapids_cpm_package_override(${CMAKE_CURRENT_BINARY_DIR}/override.json) | ||
|
|
||
| # Verify that the placeholders are evaluated correctly from `enable_language(CUDA)` | ||
| rapids_cpm_package_details(test_binary version repository tag shallow exclude) | ||
| rapids_cpm_get_proprietary_binary_url(test_binary ${version} url) | ||
|
|
||
| find_package(CUDAToolkit) | ||
| set(CTK_VER ${CUDAToolkit_VERSION_MAJOR}.${CUDAToolkit_VERSION_MINOR}) | ||
| set(CTK_VER_M ${CUDAToolkit_VERSION_MAJOR}) | ||
| set(valid_url "https://fake.url.com/2.6.1/${CTK_VER}/${CMAKE_SYSTEM_PROCESSOR}_${CTK_VER_M}.tgz") | ||
| if(NOT valid_url STREQUAL url) | ||
| message(FATAL_ERROR "Expected: ${valid_url} got: ${url}") | ||
| endif() |
Oops, something went wrong.