From f067b45c8ac2018b0407492fbacbc150d605660b Mon Sep 17 00:00:00 2001 From: James Lamb Date: Wed, 11 Sep 2024 12:03:34 -0500 Subject: [PATCH 01/18] Update fmt (to 11.0.2) and spdlog (to 1.14.1). --- conda/environments/all_cuda-118_arch-x86_64.yaml | 4 ++-- conda/environments/all_cuda-125_arch-x86_64.yaml | 4 ++-- conda/recipes/librmm/conda_build_config.yaml | 4 ++-- dependencies.yaml | 4 ++-- rapids_config.cmake | 2 ++ 5 files changed, 10 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 33b54b3f9..170cb2ba9 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>=11.0.2,<12 - gcc_linux-64=11.* - gcovr>=5.0 - graphviz @@ -35,7 +35,7 @@ dependencies: - python>=3.10,<3.13 - rapids-build-backend>=0.3.0,<0.4.0.dev0 - scikit-build-core >=0.10.0 -- spdlog>=1.12.0,<1.13 +- spdlog>=1.14.1,<15 - sphinx - sphinx-copybutton - sphinx-markdown-tables diff --git a/conda/environments/all_cuda-125_arch-x86_64.yaml b/conda/environments/all_cuda-125_arch-x86_64.yaml index 5946a9786..111c9a44e 100644 --- a/conda/environments/all_cuda-125_arch-x86_64.yaml +++ b/conda/environments/all_cuda-125_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>=11.0.2,<12 - gcc_linux-64=11.* - gcovr>=5.0 - graphviz @@ -34,7 +34,7 @@ dependencies: - python>=3.10,<3.13 - rapids-build-backend>=0.3.0,<0.4.0.dev0 - scikit-build-core >=0.10.0 -- spdlog>=1.12.0,<1.13 +- spdlog>=1.14.1,<15 - 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 6afd32c32..de96f9d37 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,!=3.30.0" fmt_version: - - ">=10.1.1,<11" + - ">=11.0.2,<12" spdlog_version: - - ">=1.12.0,<1.13" + - ">=1.14.1,<15" c_stdlib: - sysroot diff --git a/dependencies.yaml b/dependencies.yaml index eff3560e7..b921d80f5 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -111,8 +111,8 @@ dependencies: packages: - c-compiler - cxx-compiler - - fmt>=10.1.1,<11 - - spdlog>=1.12.0,<1.13 + - fmt>=11.0.2,<12 + - spdlog>=1.14.1,<15 specific: - output_types: conda matrices: diff --git a/rapids_config.cmake b/rapids_config.cmake index 84c20c01e..5273a2e82 100644 --- a/rapids_config.cmake +++ b/rapids_config.cmake @@ -26,6 +26,8 @@ else() endif() if(NOT EXISTS "${CMAKE_CURRENT_BINARY_DIR}/RMM_RAPIDS-${RAPIDS_VERSION_MAJOR_MINOR}.cmake") + set(rapids-cmake-repo jameslamb/rapids-cmake) + set(rapids-cmake-branch fmt-and-spdlog) file( DOWNLOAD "https://raw.githubusercontent.com/rapidsai/rapids-cmake/branch-${RAPIDS_VERSION_MAJOR_MINOR}/RAPIDS.cmake" From d7cafc14b3e148533c16922dffa72eb3090614ce Mon Sep 17 00:00:00 2001 From: James Lamb Date: Wed, 11 Sep 2024 12:05:49 -0500 Subject: [PATCH 02/18] simplify get_spdlog --- cmake/thirdparty/get_spdlog.cmake | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/cmake/thirdparty/get_spdlog.cmake b/cmake/thirdparty/get_spdlog.cmake index 296370469..66065b485 100644 --- a/cmake/thirdparty/get_spdlog.cmake +++ b/cmake/thirdparty/get_spdlog.cmake @@ -16,19 +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) - rapids_export_package(BUILD spdlog 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() + rapids_cpm_spdlog( + FMT_OPTION "EXTERNAL_FMT_HO" + INSTALL_EXPORT_SET rmm-exports + BUILD_EXPORT_SET rmm-exports) endfunction() find_and_configure_spdlog() From f028364e2a40459988494a8dab1f904a9a051488 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Wed, 11 Sep 2024 12:13:20 -0500 Subject: [PATCH 03/18] copyright --- cmake/thirdparty/get_spdlog.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/thirdparty/get_spdlog.cmake b/cmake/thirdparty/get_spdlog.cmake index 66065b485..cb6afb301 100644 --- a/cmake/thirdparty/get_spdlog.cmake +++ b/cmake/thirdparty/get_spdlog.cmake @@ -1,5 +1,5 @@ # ============================================================================= -# Copyright (c) 2021-2023, NVIDIA CORPORATION. +# Copyright (c) 2021-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 From b159ad91bfc060de23394fbd193f2293c8d13c13 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Wed, 11 Sep 2024 15:11:27 -0500 Subject: [PATCH 04/18] Apply suggestions from code review Co-authored-by: Bradley Dice --- conda/recipes/librmm/conda_build_config.yaml | 2 +- dependencies.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/conda/recipes/librmm/conda_build_config.yaml b/conda/recipes/librmm/conda_build_config.yaml index de96f9d37..b4791745f 100644 --- a/conda/recipes/librmm/conda_build_config.yaml +++ b/conda/recipes/librmm/conda_build_config.yaml @@ -17,7 +17,7 @@ fmt_version: - ">=11.0.2,<12" spdlog_version: - - ">=1.14.1,<15" + - ">=1.14.1,<1.15" c_stdlib: - sysroot diff --git a/dependencies.yaml b/dependencies.yaml index b921d80f5..483c21e61 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -112,7 +112,7 @@ dependencies: - c-compiler - cxx-compiler - fmt>=11.0.2,<12 - - spdlog>=1.14.1,<15 + - spdlog>=1.14.1,<1.15 specific: - output_types: conda matrices: From 4127d9c76af1380625036f9ca8a33b1f07ba0343 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Wed, 11 Sep 2024 15:18:17 -0500 Subject: [PATCH 05/18] Apply suggestions from code review --- conda/environments/all_cuda-118_arch-x86_64.yaml | 2 +- conda/environments/all_cuda-125_arch-x86_64.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml index 170cb2ba9..bf64d4d55 100644 --- a/conda/environments/all_cuda-118_arch-x86_64.yaml +++ b/conda/environments/all_cuda-118_arch-x86_64.yaml @@ -35,7 +35,7 @@ dependencies: - python>=3.10,<3.13 - rapids-build-backend>=0.3.0,<0.4.0.dev0 - scikit-build-core >=0.10.0 -- spdlog>=1.14.1,<15 +- spdlog>=1.14.1,<1.15 - sphinx - sphinx-copybutton - sphinx-markdown-tables diff --git a/conda/environments/all_cuda-125_arch-x86_64.yaml b/conda/environments/all_cuda-125_arch-x86_64.yaml index 111c9a44e..112c635a8 100644 --- a/conda/environments/all_cuda-125_arch-x86_64.yaml +++ b/conda/environments/all_cuda-125_arch-x86_64.yaml @@ -34,7 +34,7 @@ dependencies: - python>=3.10,<3.13 - rapids-build-backend>=0.3.0,<0.4.0.dev0 - scikit-build-core >=0.10.0 -- spdlog>=1.14.1,<15 +- spdlog>=1.14.1,<1.15 - sphinx - sphinx-copybutton - sphinx-markdown-tables From 73530d542ad41660224b5555e0e5162ef463dda9 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Tue, 17 Sep 2024 15:01:42 -0500 Subject: [PATCH 06/18] test with changes from https://github.com/rapidsai/rapids-cmake/pull/689/commits/d7671a30f99bc2b239653b5c1089ff51bcc37dc4 From 14ba307302eff71360120abe9abf2377570390fc Mon Sep 17 00:00:00 2001 From: James Lamb Date: Tue, 17 Sep 2024 22:08:47 -0500 Subject: [PATCH 07/18] Update cmake/thirdparty/get_spdlog.cmake --- cmake/thirdparty/get_spdlog.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/cmake/thirdparty/get_spdlog.cmake b/cmake/thirdparty/get_spdlog.cmake index cb6afb301..229cea3e5 100644 --- a/cmake/thirdparty/get_spdlog.cmake +++ b/cmake/thirdparty/get_spdlog.cmake @@ -20,6 +20,7 @@ function(find_and_configure_spdlog) FMT_OPTION "EXTERNAL_FMT_HO" INSTALL_EXPORT_SET rmm-exports BUILD_EXPORT_SET rmm-exports) + rapids_export_package(BUILD spdlog rmm-exports) endfunction() find_and_configure_spdlog() From 15956bf2afd2d9649b41af402e567266b0aa7884 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Wed, 18 Sep 2024 09:42:45 -0700 Subject: [PATCH 08/18] move rapids-cmake overrides [skip ci] --- rapids_config.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rapids_config.cmake b/rapids_config.cmake index 5273a2e82..1eac1c297 100644 --- a/rapids_config.cmake +++ b/rapids_config.cmake @@ -25,9 +25,9 @@ else() "Could not determine RAPIDS version. Contents of VERSION file:\n${_rapids_version_formatted}") endif() +set(rapids-cmake-repo jameslamb/rapids-cmake) +set(rapids-cmake-branch fmt-and-spdlog) if(NOT EXISTS "${CMAKE_CURRENT_BINARY_DIR}/RMM_RAPIDS-${RAPIDS_VERSION_MAJOR_MINOR}.cmake") - set(rapids-cmake-repo jameslamb/rapids-cmake) - set(rapids-cmake-branch fmt-and-spdlog) file( DOWNLOAD "https://raw.githubusercontent.com/rapidsai/rapids-cmake/branch-${RAPIDS_VERSION_MAJOR_MINOR}/RAPIDS.cmake" From e216a55f3d18a7b4f5131f92932ab2cf34d79b89 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Wed, 18 Sep 2024 10:22:45 -0700 Subject: [PATCH 09/18] try reverting get_spdlog export changes [skip ci] --- cmake/thirdparty/get_spdlog.cmake | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/cmake/thirdparty/get_spdlog.cmake b/cmake/thirdparty/get_spdlog.cmake index 229cea3e5..777134fad 100644 --- a/cmake/thirdparty/get_spdlog.cmake +++ b/cmake/thirdparty/get_spdlog.cmake @@ -12,15 +12,24 @@ # the License. # ============================================================================= +# Use CPM to find or clone speedlog # Use CPM to find or clone speedlog 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) rapids_export_package(BUILD spdlog 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 3d62108517270560dbe10c979b7155ff50576a39 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Wed, 18 Sep 2024 10:26:01 -0700 Subject: [PATCH 10/18] more fiddling with export sets [skip ci] --- cmake/thirdparty/get_spdlog.cmake | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/cmake/thirdparty/get_spdlog.cmake b/cmake/thirdparty/get_spdlog.cmake index 777134fad..5b0b38211 100644 --- a/cmake/thirdparty/get_spdlog.cmake +++ b/cmake/thirdparty/get_spdlog.cmake @@ -20,16 +20,6 @@ function(find_and_configure_spdlog) rapids_cpm_spdlog(FMT_OPTION "EXTERNAL_FMT_HO" INSTALL_EXPORT_SET rmm-exports) rapids_export_package(BUILD spdlog 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 12eaa62255aa9f98c3cf8e54a20287cbc1a46969 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Wed, 18 Sep 2024 10:28:06 -0700 Subject: [PATCH 11/18] more exporting [skip ci] --- cmake/thirdparty/get_spdlog.cmake | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/cmake/thirdparty/get_spdlog.cmake b/cmake/thirdparty/get_spdlog.cmake index 5b0b38211..908b27457 100644 --- a/cmake/thirdparty/get_spdlog.cmake +++ b/cmake/thirdparty/get_spdlog.cmake @@ -17,8 +17,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) - 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) endfunction() From c4d94e46a5e7c62ef76b734aa46484d31e8a542b Mon Sep 17 00:00:00 2001 From: James Lamb Date: Wed, 18 Sep 2024 10:44:14 -0700 Subject: [PATCH 12/18] more export set fiddling [skip ci] --- cmake/thirdparty/get_spdlog.cmake | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/cmake/thirdparty/get_spdlog.cmake b/cmake/thirdparty/get_spdlog.cmake index 908b27457..920ae2657 100644 --- a/cmake/thirdparty/get_spdlog.cmake +++ b/cmake/thirdparty/get_spdlog.cmake @@ -22,6 +22,17 @@ function(find_and_configure_spdlog) INSTALL_EXPORT_SET rmm-exports BUILD_EXPORT_SET rmm-exports) + if(spdlog_ADDED) + rapids_export( + BUILD spdlog + EXPORT_SET rmm-exports + 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 4feacb7b482300dcba2aadeada1200f86f995dd6 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Wed, 18 Sep 2024 10:45:30 -0700 Subject: [PATCH 13/18] more [skip ci] --- cmake/thirdparty/get_spdlog.cmake | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/cmake/thirdparty/get_spdlog.cmake b/cmake/thirdparty/get_spdlog.cmake index 920ae2657..908b27457 100644 --- a/cmake/thirdparty/get_spdlog.cmake +++ b/cmake/thirdparty/get_spdlog.cmake @@ -22,17 +22,6 @@ function(find_and_configure_spdlog) INSTALL_EXPORT_SET rmm-exports BUILD_EXPORT_SET rmm-exports) - if(spdlog_ADDED) - rapids_export( - BUILD spdlog - EXPORT_SET rmm-exports - 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 6e52f7e653e50117b7fe509f357df13ad76584f7 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Wed, 18 Sep 2024 10:58:32 -0700 Subject: [PATCH 14/18] exports [skip ci] --- cmake/thirdparty/get_spdlog.cmake | 1 - 1 file changed, 1 deletion(-) diff --git a/cmake/thirdparty/get_spdlog.cmake b/cmake/thirdparty/get_spdlog.cmake index 908b27457..7f80b3726 100644 --- a/cmake/thirdparty/get_spdlog.cmake +++ b/cmake/thirdparty/get_spdlog.cmake @@ -12,7 +12,6 @@ # the License. # ============================================================================= -# Use CPM to find or clone speedlog # Use CPM to find or clone speedlog function(find_and_configure_spdlog) From 1ec97890792d973ba12f3d166fd85a5e78129977 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Wed, 18 Sep 2024 18:06:12 -0500 Subject: [PATCH 15/18] run a build --- .github/workflows/pr.yaml | 82 +++++++++++++++++++-------------------- 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index 1160b93e9..5219abfef 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -12,59 +12,59 @@ concurrency: jobs: pr-builder: needs: - - checks + # - checks - conda-cpp-build - - conda-cpp-tests + # - conda-cpp-tests - conda-python-build - - conda-python-tests - - docs-build + # - conda-python-tests + # - docs-build - wheel-build-cpp - wheel-build-python - - wheel-tests + # - wheel-tests - devcontainer secrets: inherit uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@branch-24.10 - checks: - secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@branch-24.10 - with: - enable_check_generated_files: false + # checks: + # secrets: inherit + # uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@branch-24.10 + # with: + # enable_check_generated_files: false conda-cpp-build: - needs: checks + # needs: checks secrets: inherit uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@branch-24.10 with: build_type: pull-request - conda-cpp-tests: - needs: conda-cpp-build - secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@branch-24.10 - with: - build_type: pull-request + # conda-cpp-tests: + # needs: conda-cpp-build + # secrets: inherit + # uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@branch-24.10 + # with: + # build_type: pull-request conda-python-build: needs: conda-cpp-build secrets: inherit uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-24.10 with: build_type: pull-request - conda-python-tests: - needs: conda-python-build - secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@branch-24.10 - with: - build_type: pull-request - docs-build: - needs: conda-python-build - secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-24.10 - 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" + # conda-python-tests: + # needs: conda-python-build + # secrets: inherit + # uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@branch-24.10 + # with: + # build_type: pull-request + # docs-build: + # needs: conda-python-build + # secrets: inherit + # uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-24.10 + # 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-cpp: - needs: checks + # needs: checks secrets: inherit uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.10 with: @@ -78,13 +78,13 @@ jobs: with: build_type: pull-request script: ci/build_wheel_python.sh - wheel-tests: - needs: wheel-build-python - secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.10 - with: - build_type: pull-request - script: ci/test_wheel.sh + # wheel-tests: + # needs: wheel-build-python + # secrets: inherit + # uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.10 + # 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.10 From f8fd212f93d7d92b2daf2b3ee7a5da95d842028c Mon Sep 17 00:00:00 2001 From: James Lamb Date: Thu, 19 Sep 2024 09:20:40 -0500 Subject: [PATCH 16/18] restore tests --- .github/workflows/pr.yaml | 94 +++++++++++++++++++-------------------- 1 file changed, 47 insertions(+), 47 deletions(-) diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index 5219abfef..7d9fbb086 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -12,61 +12,61 @@ concurrency: jobs: pr-builder: needs: - # - checks + - checks - conda-cpp-build - # - conda-cpp-tests + - conda-cpp-tests - conda-python-build - # - conda-python-tests - # - docs-build + - conda-python-tests + - docs-build - wheel-build-cpp - wheel-build-python - # - wheel-tests + - wheel-tests - devcontainer secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@branch-24.10 - # checks: - # secrets: inherit - # uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@branch-24.10 - # with: - # enable_check_generated_files: false + uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@python-3.12 + checks: + secrets: inherit + uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@python-3.12 + with: + enable_check_generated_files: false conda-cpp-build: - # needs: checks + needs: checks + secrets: inherit + uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@python-3.12 + with: + build_type: pull-request + conda-cpp-tests: + needs: conda-cpp-build secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@branch-24.10 + uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@python-3.12 with: build_type: pull-request - # conda-cpp-tests: - # needs: conda-cpp-build - # secrets: inherit - # uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@branch-24.10 - # with: - # build_type: pull-request conda-python-build: needs: conda-cpp-build secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-24.10 + uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@python-3.12 with: build_type: pull-request - # conda-python-tests: - # needs: conda-python-build - # secrets: inherit - # uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@branch-24.10 - # with: - # build_type: pull-request - # docs-build: - # needs: conda-python-build - # secrets: inherit - # uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-24.10 - # 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" + conda-python-tests: + needs: conda-python-build + secrets: inherit + uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@python-3.12 + with: + build_type: pull-request + docs-build: + needs: conda-python-build + secrets: inherit + uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@python-3.12 + 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-cpp: - # needs: checks + needs: checks secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.10 + uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@python-3.12 with: matrix_filter: group_by([.ARCH, (.CUDA_VER|split(".")|map(tonumber)|.[0])]) | map(max_by(.PY_VER|split(".")|map(tonumber))) build_type: pull-request @@ -74,20 +74,20 @@ jobs: wheel-build-python: needs: wheel-build-cpp secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.10 + uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@python-3.12 with: build_type: pull-request script: ci/build_wheel_python.sh - # wheel-tests: - # needs: wheel-build-python - # secrets: inherit - # uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.10 - # with: - # build_type: pull-request - # script: ci/test_wheel.sh + wheel-tests: + needs: wheel-build-python + secrets: inherit + uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@python-3.12 + 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.10 + uses: rapidsai/shared-workflows/.github/workflows/build-in-devcontainer.yaml@python-3.12 with: arch: '["amd64"]' cuda: '["12.5"]' From a175083c9835732b53e24d60a3baeaca9f847a4e Mon Sep 17 00:00:00 2001 From: James Lamb Date: Thu, 19 Sep 2024 09:21:28 -0500 Subject: [PATCH 17/18] branch references --- .github/workflows/pr.yaml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index 7d9fbb086..1160b93e9 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -23,40 +23,40 @@ jobs: - wheel-tests - devcontainer secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@python-3.12 + uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@branch-24.10 checks: secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@python-3.12 + uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@branch-24.10 with: enable_check_generated_files: false conda-cpp-build: needs: checks secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@python-3.12 + uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@branch-24.10 with: build_type: pull-request conda-cpp-tests: needs: conda-cpp-build secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@python-3.12 + uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@branch-24.10 with: build_type: pull-request conda-python-build: needs: conda-cpp-build secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@python-3.12 + uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-24.10 with: build_type: pull-request conda-python-tests: needs: conda-python-build secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@python-3.12 + uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@branch-24.10 with: build_type: pull-request docs-build: needs: conda-python-build secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@python-3.12 + uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-24.10 with: build_type: pull-request node_type: "gpu-v100-latest-1" @@ -66,7 +66,7 @@ jobs: wheel-build-cpp: needs: checks secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@python-3.12 + uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.10 with: matrix_filter: group_by([.ARCH, (.CUDA_VER|split(".")|map(tonumber)|.[0])]) | map(max_by(.PY_VER|split(".")|map(tonumber))) build_type: pull-request @@ -74,20 +74,20 @@ jobs: wheel-build-python: needs: wheel-build-cpp secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@python-3.12 + uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.10 with: build_type: pull-request script: ci/build_wheel_python.sh wheel-tests: needs: wheel-build-python secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@python-3.12 + uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.10 with: build_type: pull-request script: ci/test_wheel.sh devcontainer: secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/build-in-devcontainer.yaml@python-3.12 + uses: rapidsai/shared-workflows/.github/workflows/build-in-devcontainer.yaml@branch-24.10 with: arch: '["amd64"]' cuda: '["12.5"]' From 4135b68d5cc1673636ed8a114b2275734146c229 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Mon, 23 Sep 2024 10:25:04 -0500 Subject: [PATCH 18/18] remove testing-only changes [skip ci] --- rapids_config.cmake | 2 -- 1 file changed, 2 deletions(-) diff --git a/rapids_config.cmake b/rapids_config.cmake index 1eac1c297..84c20c01e 100644 --- a/rapids_config.cmake +++ b/rapids_config.cmake @@ -25,8 +25,6 @@ else() "Could not determine RAPIDS version. Contents of VERSION file:\n${_rapids_version_formatted}") endif() -set(rapids-cmake-repo jameslamb/rapids-cmake) -set(rapids-cmake-branch fmt-and-spdlog) if(NOT EXISTS "${CMAKE_CURRENT_BINARY_DIR}/RMM_RAPIDS-${RAPIDS_VERSION_MAJOR_MINOR}.cmake") file( DOWNLOAD