From ba034974e0de6680ea5cf6ef595c51442ac0b9f8 Mon Sep 17 00:00:00 2001 From: Jake Awe Date: Mon, 25 Mar 2024 14:17:30 -0500 Subject: [PATCH 01/10] prevent path conflicts --- ci/build_cpp.sh | 1 + ci/build_python.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/ci/build_cpp.sh b/ci/build_cpp.sh index 7329d4a34..cc6b6fd64 100755 --- a/ci/build_cpp.sh +++ b/ci/build_cpp.sh @@ -16,6 +16,7 @@ rapids-print-env version=$(rapids-generate-version) rapids-logger "Begin cpp build" +conda config --set path_conflict prevent # This calls mambabuild when boa is installed (as is the case in the CI images) RAPIDS_PACKAGE_VERSION=${version} rapids-conda-retry mambabuild conda/recipes/librmm diff --git a/ci/build_python.sh b/ci/build_python.sh index b197b1ae1..84035c454 100755 --- a/ci/build_python.sh +++ b/ci/build_python.sh @@ -25,6 +25,7 @@ sed -i "/^__git_commit__/ s/= .*/= \"${commit}\"/g" "${package_dir}/${package_na rapids-logger "Begin py build" CPP_CHANNEL=$(rapids-download-conda-from-s3 cpp) +conda config --set path_conflict prevent # This calls mambabuild when boa is installed (as is the case in the CI images) RAPIDS_PACKAGE_VERSION=${version} rapids-conda-retry mambabuild -c "${CPP_CHANNEL}" conda/recipes/rmm From 0cee90c2d18a352004d83ec502a170212e91916e Mon Sep 17 00:00:00 2001 From: James Lamb Date: Mon, 22 Apr 2024 13:22:40 -0700 Subject: [PATCH 02/10] add more tests, skip running non-conda CI --- .github/workflows/build.yaml | 66 ++++++++++++++--------------- .github/workflows/pr.yaml | 76 +++++++++++++++++----------------- .github/workflows/test.yaml | 18 ++++---- conda/recipes/librmm/meta.yaml | 3 ++ 4 files changed, 83 insertions(+), 80 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index f22d60673..05c69db26 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -52,36 +52,36 @@ jobs: branch: ${{ inputs.branch }} date: ${{ inputs.date }} sha: ${{ inputs.sha }} - docs-build: - if: github.ref_type == 'branch' - needs: python-build - secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-24.06 - with: - build_type: ${{ inputs.build_type || 'branch' }} - branch: ${{ inputs.branch }} - sha: ${{ inputs.sha }} - date: ${{ inputs.date }} - node_type: "gpu-v100-latest-1" - arch: "amd64" - container_image: "rapidsai/ci-conda:latest" - run_script: "ci/build_docs.sh" - wheel-build: - secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.06 - with: - build_type: ${{ inputs.build_type || 'branch' }} - branch: ${{ inputs.branch }} - sha: ${{ inputs.sha }} - date: ${{ inputs.date }} - script: ci/build_wheel.sh - wheel-publish: - needs: wheel-build - secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@branch-24.06 - with: - build_type: ${{ inputs.build_type || 'branch' }} - branch: ${{ inputs.branch }} - sha: ${{ inputs.sha }} - date: ${{ inputs.date }} - package-name: rmm + # docs-build: + # if: github.ref_type == 'branch' + # needs: python-build + # secrets: inherit + # uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-24.06 + # with: + # build_type: ${{ inputs.build_type || 'branch' }} + # branch: ${{ inputs.branch }} + # sha: ${{ inputs.sha }} + # date: ${{ inputs.date }} + # node_type: "gpu-v100-latest-1" + # arch: "amd64" + # container_image: "rapidsai/ci-conda:latest" + # run_script: "ci/build_docs.sh" + # wheel-build: + # secrets: inherit + # uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.06 + # with: + # build_type: ${{ inputs.build_type || 'branch' }} + # branch: ${{ inputs.branch }} + # sha: ${{ inputs.sha }} + # date: ${{ inputs.date }} + # script: ci/build_wheel.sh + # wheel-publish: + # needs: wheel-build + # secrets: inherit + # uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@branch-24.06 + # with: + # build_type: ${{ inputs.build_type || 'branch' }} + # branch: ${{ inputs.branch }} + # sha: ${{ inputs.sha }} + # date: ${{ inputs.date }} + # package-name: rmm diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index 2abbfd078..85d3fe08b 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -17,10 +17,10 @@ jobs: - conda-cpp-tests - conda-python-build - conda-python-tests - - docs-build - - wheel-build - - wheel-tests - - devcontainer + # - docs-build + # - wheel-build + # - wheel-tests + # - devcontainer secrets: inherit uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@branch-24.06 checks: @@ -52,37 +52,37 @@ jobs: uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@branch-24.06 with: build_type: pull-request - docs-build: - needs: conda-python-build - secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-24.06 - with: - build_type: pull-request - node_type: "gpu-v100-latest-1" - arch: "amd64" - container_image: "rapidsai/ci-conda:latest" - run_script: "ci/build_docs.sh" - wheel-build: - needs: checks - secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.06 - with: - build_type: pull-request - script: ci/build_wheel.sh - wheel-tests: - needs: wheel-build - secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.06 - with: - build_type: pull-request - script: ci/test_wheel.sh - devcontainer: - secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/build-in-devcontainer.yaml@branch-24.06 - with: - arch: '["amd64"]' - cuda: '["12.2"]' - build_command: | - sccache -z; - build-all -DBUILD_BENCHMARKS=ON --verbose; - sccache -s; + # docs-build: + # needs: conda-python-build + # secrets: inherit + # uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-24.06 + # with: + # build_type: pull-request + # node_type: "gpu-v100-latest-1" + # arch: "amd64" + # container_image: "rapidsai/ci-conda:latest" + # run_script: "ci/build_docs.sh" + # wheel-build: + # needs: checks + # secrets: inherit + # uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.06 + # with: + # build_type: pull-request + # script: ci/build_wheel.sh + # wheel-tests: + # needs: wheel-build + # secrets: inherit + # uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.06 + # with: + # build_type: pull-request + # script: ci/test_wheel.sh + # devcontainer: + # secrets: inherit + # uses: rapidsai/shared-workflows/.github/workflows/build-in-devcontainer.yaml@branch-24.06 + # with: + # arch: '["amd64"]' + # cuda: '["12.2"]' + # build_command: | + # sccache -z; + # build-all -DBUILD_BENCHMARKS=ON --verbose; + # sccache -s; diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 747f9f544..22d6ac42e 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -30,12 +30,12 @@ jobs: branch: ${{ inputs.branch }} date: ${{ inputs.date }} sha: ${{ inputs.sha }} - wheel-tests: - secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.06 - with: - build_type: nightly - branch: ${{ inputs.branch }} - date: ${{ inputs.date }} - sha: ${{ inputs.sha }} - script: ci/test_wheel.sh + # wheel-tests: + # secrets: inherit + # uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.06 + # with: + # build_type: nightly + # branch: ${{ inputs.branch }} + # date: ${{ inputs.date }} + # sha: ${{ inputs.sha }} + # script: ci/test_wheel.sh diff --git a/conda/recipes/librmm/meta.yaml b/conda/recipes/librmm/meta.yaml index 8263e0f3d..15cb267c5 100644 --- a/conda/recipes/librmm/meta.yaml +++ b/conda/recipes/librmm/meta.yaml @@ -113,6 +113,9 @@ outputs: - test -f $PREFIX/include/rmm/mr/host/host_memory_resource.hpp - test -f $PREFIX/include/rmm/mr/host/new_delete_resource.hpp - test -f $PREFIX/include/rmm/mr/host/pinned_memory_resource.hpp + # should not vendor the spdlog or fmt headers + - ! test -d $PREFIX/include/fmt + - ! test -d $PREFIX/include/spdlog about: home: https://rapids.ai/ license: Apache-2.0 From db38985a44d983225a4a3333686547ec090c2fa7 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Mon, 22 Apr 2024 15:35:58 -0700 Subject: [PATCH 03/10] use my fork of rapids-cmake --- ci/build_cpp.sh | 2 +- rapids_config.cmake | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ci/build_cpp.sh b/ci/build_cpp.sh index cc6b6fd64..497c6a488 100755 --- a/ci/build_cpp.sh +++ b/ci/build_cpp.sh @@ -21,4 +21,4 @@ conda config --set path_conflict prevent # This calls mambabuild when boa is installed (as is the case in the CI images) RAPIDS_PACKAGE_VERSION=${version} rapids-conda-retry mambabuild conda/recipes/librmm -rapids-upload-conda-to-s3 cpp +#rapids-upload-conda-to-s3 cpp diff --git a/rapids_config.cmake b/rapids_config.cmake index 84c20c01e..924e2fdc1 100644 --- a/rapids_config.cmake +++ b/rapids_config.cmake @@ -26,6 +26,12 @@ else() endif() if(NOT EXISTS "${CMAKE_CURRENT_BINARY_DIR}/RMM_RAPIDS-${RAPIDS_VERSION_MAJOR_MINOR}.cmake") + include(FetchContent) + FetchContent_Declare( + rapids-cmake + GIT_REPOSITORY https://github.com/jameslamb/rapids-cmake.git + GIT_TAG fmt-version + ) file( DOWNLOAD "https://raw.githubusercontent.com/rapidsai/rapids-cmake/branch-${RAPIDS_VERSION_MAJOR_MINOR}/RAPIDS.cmake" From 0e7fd73c55784a15d7a497f8b7021cd5acf552eb Mon Sep 17 00:00:00 2001 From: James Lamb Date: Tue, 23 Apr 2024 07:31:30 -0700 Subject: [PATCH 04/10] changes --- conda/recipes/librmm/meta.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/conda/recipes/librmm/meta.yaml b/conda/recipes/librmm/meta.yaml index 15cb267c5..8263e0f3d 100644 --- a/conda/recipes/librmm/meta.yaml +++ b/conda/recipes/librmm/meta.yaml @@ -113,9 +113,6 @@ outputs: - test -f $PREFIX/include/rmm/mr/host/host_memory_resource.hpp - test -f $PREFIX/include/rmm/mr/host/new_delete_resource.hpp - test -f $PREFIX/include/rmm/mr/host/pinned_memory_resource.hpp - # should not vendor the spdlog or fmt headers - - ! test -d $PREFIX/include/fmt - - ! test -d $PREFIX/include/spdlog about: home: https://rapids.ai/ license: Apache-2.0 From 3d9494c5eddd3d09e3a1e21da7d9a58820fbb800 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Tue, 23 Apr 2024 07:34:33 -0700 Subject: [PATCH 05/10] formatting --- rapids_config.cmake | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/rapids_config.cmake b/rapids_config.cmake index 924e2fdc1..b4aa39fc8 100644 --- a/rapids_config.cmake +++ b/rapids_config.cmake @@ -30,8 +30,7 @@ if(NOT EXISTS "${CMAKE_CURRENT_BINARY_DIR}/RMM_RAPIDS-${RAPIDS_VERSION_MAJOR_MIN FetchContent_Declare( rapids-cmake GIT_REPOSITORY https://github.com/jameslamb/rapids-cmake.git - GIT_TAG fmt-version - ) + GIT_TAG fmt-version) file( DOWNLOAD "https://raw.githubusercontent.com/rapidsai/rapids-cmake/branch-${RAPIDS_VERSION_MAJOR_MINOR}/RAPIDS.cmake" From f8664fbe90c901ae704c69f22d75b9f01db600bc Mon Sep 17 00:00:00 2001 From: James Lamb Date: Tue, 23 Apr 2024 08:03:26 -0700 Subject: [PATCH 06/10] add uploads so tests can run --- ci/build_cpp.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/build_cpp.sh b/ci/build_cpp.sh index 497c6a488..cc6b6fd64 100755 --- a/ci/build_cpp.sh +++ b/ci/build_cpp.sh @@ -21,4 +21,4 @@ conda config --set path_conflict prevent # This calls mambabuild when boa is installed (as is the case in the CI images) RAPIDS_PACKAGE_VERSION=${version} rapids-conda-retry mambabuild conda/recipes/librmm -#rapids-upload-conda-to-s3 cpp +rapids-upload-conda-to-s3 cpp From f00512b54ca0e1aaa120c58d31c0e2de55637fdb Mon Sep 17 00:00:00 2001 From: James Lamb Date: Wed, 24 Apr 2024 10:58:45 -0700 Subject: [PATCH 07/10] update to fmt 10.2.1 and spdlog 1.13.0 --- conda/environments/all_cuda-118_arch-x86_64.yaml | 4 ++-- conda/environments/all_cuda-122_arch-x86_64.yaml | 4 ++-- conda/recipes/librmm/conda_build_config.yaml | 4 ++-- dependencies.yaml | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml index c4bbcccd2..633db3b2c 100644 --- a/conda/environments/all_cuda-118_arch-x86_64.yaml +++ b/conda/environments/all_cuda-118_arch-x86_64.yaml @@ -16,7 +16,7 @@ dependencies: - cxx-compiler - cython>=3.0.0 - doxygen=1.9.1 -- fmt>=10.1.1,<11 +- fmt>=10.2.1,<11 - gcc_linux-64=11.* - gcovr>=5.0 - graphviz @@ -34,7 +34,7 @@ dependencies: - pytest-cov - python>=3.9,<3.12 - scikit-build-core>=0.7.0 -- spdlog>=1.12.0,<1.13 +- spdlog>=1.13.0,<1.14 - sphinx - sphinx-copybutton - sphinx-markdown-tables diff --git a/conda/environments/all_cuda-122_arch-x86_64.yaml b/conda/environments/all_cuda-122_arch-x86_64.yaml index 63876715a..76ad09a85 100644 --- a/conda/environments/all_cuda-122_arch-x86_64.yaml +++ b/conda/environments/all_cuda-122_arch-x86_64.yaml @@ -15,7 +15,7 @@ dependencies: - cxx-compiler - cython>=3.0.0 - doxygen=1.9.1 -- fmt>=10.1.1,<11 +- fmt>=10.2.1,<11 - gcc_linux-64=11.* - gcovr>=5.0 - graphviz @@ -32,7 +32,7 @@ dependencies: - pytest-cov - python>=3.9,<3.12 - scikit-build-core>=0.7.0 -- spdlog>=1.12.0,<1.13 +- spdlog>=1.13.0,<1.14 - sphinx - sphinx-copybutton - sphinx-markdown-tables diff --git a/conda/recipes/librmm/conda_build_config.yaml b/conda/recipes/librmm/conda_build_config.yaml index e44698952..c1913f694 100644 --- a/conda/recipes/librmm/conda_build_config.yaml +++ b/conda/recipes/librmm/conda_build_config.yaml @@ -14,10 +14,10 @@ cmake_version: - ">=3.26.4" fmt_version: - - ">=10.1.1,<11" + - ">=10.2.1,<11" spdlog_version: - - ">=1.12.0,<1.13" + - ">=1.13.0,<1.14" sysroot_version: - "2.17" diff --git a/dependencies.yaml b/dependencies.yaml index 10d0eab2d..45e35a29d 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -75,9 +75,9 @@ dependencies: packages: - c-compiler - cxx-compiler - - fmt>=10.1.1,<11 + - fmt>=10.2.1,<11 - scikit-build-core>=0.7.0 - - spdlog>=1.12.0,<1.13 + - spdlog>=1.13.0,<1.14 - output_types: [requirements, pyproject] packages: - scikit-build-core[pyproject]>=0.7.0 From ddc4fca9e05f73bf8f2fe315e3dd65dba22d244a Mon Sep 17 00:00:00 2001 From: James Lamb Date: Wed, 24 Apr 2024 10:59:08 -0700 Subject: [PATCH 08/10] merge branch-24.06 --- .github/workflows/build.yaml | 66 +++++++++++++++---------------- .github/workflows/pr.yaml | 76 ++++++++++++++++++------------------ .github/workflows/test.yaml | 18 ++++----- 3 files changed, 80 insertions(+), 80 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 05c69db26..f22d60673 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -52,36 +52,36 @@ jobs: branch: ${{ inputs.branch }} date: ${{ inputs.date }} sha: ${{ inputs.sha }} - # docs-build: - # if: github.ref_type == 'branch' - # needs: python-build - # secrets: inherit - # uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-24.06 - # with: - # build_type: ${{ inputs.build_type || 'branch' }} - # branch: ${{ inputs.branch }} - # sha: ${{ inputs.sha }} - # date: ${{ inputs.date }} - # node_type: "gpu-v100-latest-1" - # arch: "amd64" - # container_image: "rapidsai/ci-conda:latest" - # run_script: "ci/build_docs.sh" - # wheel-build: - # secrets: inherit - # uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.06 - # with: - # build_type: ${{ inputs.build_type || 'branch' }} - # branch: ${{ inputs.branch }} - # sha: ${{ inputs.sha }} - # date: ${{ inputs.date }} - # script: ci/build_wheel.sh - # wheel-publish: - # needs: wheel-build - # secrets: inherit - # uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@branch-24.06 - # with: - # build_type: ${{ inputs.build_type || 'branch' }} - # branch: ${{ inputs.branch }} - # sha: ${{ inputs.sha }} - # date: ${{ inputs.date }} - # package-name: rmm + docs-build: + if: github.ref_type == 'branch' + needs: python-build + secrets: inherit + uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-24.06 + with: + build_type: ${{ inputs.build_type || 'branch' }} + branch: ${{ inputs.branch }} + sha: ${{ inputs.sha }} + date: ${{ inputs.date }} + node_type: "gpu-v100-latest-1" + arch: "amd64" + container_image: "rapidsai/ci-conda:latest" + run_script: "ci/build_docs.sh" + wheel-build: + secrets: inherit + uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.06 + with: + build_type: ${{ inputs.build_type || 'branch' }} + branch: ${{ inputs.branch }} + sha: ${{ inputs.sha }} + date: ${{ inputs.date }} + script: ci/build_wheel.sh + wheel-publish: + needs: wheel-build + secrets: inherit + uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@branch-24.06 + with: + build_type: ${{ inputs.build_type || 'branch' }} + branch: ${{ inputs.branch }} + sha: ${{ inputs.sha }} + date: ${{ inputs.date }} + package-name: rmm diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index 85d3fe08b..2abbfd078 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -17,10 +17,10 @@ jobs: - conda-cpp-tests - conda-python-build - conda-python-tests - # - docs-build - # - wheel-build - # - wheel-tests - # - devcontainer + - docs-build + - wheel-build + - wheel-tests + - devcontainer secrets: inherit uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@branch-24.06 checks: @@ -52,37 +52,37 @@ jobs: uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@branch-24.06 with: build_type: pull-request - # docs-build: - # needs: conda-python-build - # secrets: inherit - # uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-24.06 - # with: - # build_type: pull-request - # node_type: "gpu-v100-latest-1" - # arch: "amd64" - # container_image: "rapidsai/ci-conda:latest" - # run_script: "ci/build_docs.sh" - # wheel-build: - # needs: checks - # secrets: inherit - # uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.06 - # with: - # build_type: pull-request - # script: ci/build_wheel.sh - # wheel-tests: - # needs: wheel-build - # secrets: inherit - # uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.06 - # with: - # build_type: pull-request - # script: ci/test_wheel.sh - # devcontainer: - # secrets: inherit - # uses: rapidsai/shared-workflows/.github/workflows/build-in-devcontainer.yaml@branch-24.06 - # with: - # arch: '["amd64"]' - # cuda: '["12.2"]' - # build_command: | - # sccache -z; - # build-all -DBUILD_BENCHMARKS=ON --verbose; - # sccache -s; + docs-build: + needs: conda-python-build + secrets: inherit + uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-24.06 + with: + build_type: pull-request + node_type: "gpu-v100-latest-1" + arch: "amd64" + container_image: "rapidsai/ci-conda:latest" + run_script: "ci/build_docs.sh" + wheel-build: + needs: checks + secrets: inherit + uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.06 + with: + build_type: pull-request + script: ci/build_wheel.sh + wheel-tests: + needs: wheel-build + secrets: inherit + uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.06 + with: + build_type: pull-request + script: ci/test_wheel.sh + devcontainer: + secrets: inherit + uses: rapidsai/shared-workflows/.github/workflows/build-in-devcontainer.yaml@branch-24.06 + with: + arch: '["amd64"]' + cuda: '["12.2"]' + build_command: | + sccache -z; + build-all -DBUILD_BENCHMARKS=ON --verbose; + sccache -s; diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 22d6ac42e..747f9f544 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -30,12 +30,12 @@ jobs: branch: ${{ inputs.branch }} date: ${{ inputs.date }} sha: ${{ inputs.sha }} - # wheel-tests: - # secrets: inherit - # uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.06 - # with: - # build_type: nightly - # branch: ${{ inputs.branch }} - # date: ${{ inputs.date }} - # sha: ${{ inputs.sha }} - # script: ci/test_wheel.sh + wheel-tests: + secrets: inherit + uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.06 + with: + build_type: nightly + branch: ${{ inputs.branch }} + date: ${{ inputs.date }} + sha: ${{ inputs.sha }} + script: ci/test_wheel.sh From e5fb90bf09de6259a0a80f0da6dd818225a4bd12 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Wed, 24 Apr 2024 13:29:51 -0700 Subject: [PATCH 09/10] stop manually re-exporting spdlog targets --- cmake/thirdparty/get_spdlog.cmake | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/cmake/thirdparty/get_spdlog.cmake b/cmake/thirdparty/get_spdlog.cmake index 296370469..53f022510 100644 --- a/cmake/thirdparty/get_spdlog.cmake +++ b/cmake/thirdparty/get_spdlog.cmake @@ -16,19 +16,8 @@ function(find_and_configure_spdlog) include(${rapids-cmake-dir}/cpm/spdlog.cmake) - rapids_cpm_spdlog(FMT_OPTION "EXTERNAL_FMT_HO" INSTALL_EXPORT_SET rmm-exports) - rapids_export_package(BUILD spdlog rmm-exports) + rapids_cpm_spdlog(FMT_OPTION "EXTERNAL_FMT_HO" INSTALL_EXPORT_SET rmm-exports BUILD_EXPORT_SET rmm-exports) - if(spdlog_ADDED) - rapids_export( - BUILD spdlog - EXPORT_SET spdlog - GLOBAL_TARGETS spdlog spdlog_header_only - NAMESPACE spdlog::) - include("${rapids-cmake-dir}/export/find_package_root.cmake") - rapids_export_find_package_root(BUILD spdlog [=[${CMAKE_CURRENT_LIST_DIR}]=] - EXPORT_SET rmm-exports) - endif() endfunction() find_and_configure_spdlog() From 39a6a58ef3e797ae9d79d1ba2a3b90109502c5af Mon Sep 17 00:00:00 2001 From: James Lamb Date: Wed, 24 Apr 2024 13:39:37 -0700 Subject: [PATCH 10/10] formatting --- cmake/thirdparty/get_spdlog.cmake | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cmake/thirdparty/get_spdlog.cmake b/cmake/thirdparty/get_spdlog.cmake index 53f022510..2b60e93fd 100644 --- a/cmake/thirdparty/get_spdlog.cmake +++ b/cmake/thirdparty/get_spdlog.cmake @@ -16,7 +16,10 @@ function(find_and_configure_spdlog) include(${rapids-cmake-dir}/cpm/spdlog.cmake) - rapids_cpm_spdlog(FMT_OPTION "EXTERNAL_FMT_HO" INSTALL_EXPORT_SET rmm-exports BUILD_EXPORT_SET rmm-exports) + rapids_cpm_spdlog( + FMT_OPTION "EXTERNAL_FMT_HO" + INSTALL_EXPORT_SET rmm-exports + BUILD_EXPORT_SET rmm-exports) endfunction()