Skip to content

Commit

Permalink
Merge branch 'branch-24.10' into test-nvcomp-4.0
Browse files Browse the repository at this point in the history
  • Loading branch information
robertmaynard authored Aug 7, 2024
2 parents 023e87e + 45e4597 commit 47c1efe
Show file tree
Hide file tree
Showing 45 changed files with 30 additions and 1,208 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ concurrency:
jobs:
cpp-build:
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@branch-24.08
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@branch-24.10
with:
build_type: ${{ inputs.build_type || 'branch' }}
branch: ${{ inputs.branch }}
Expand All @@ -37,7 +37,7 @@ jobs:
upload-conda:
needs: [cpp-build]
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/conda-upload-packages.yaml@branch-24.08
uses: rapidsai/shared-workflows/.github/workflows/conda-upload-packages.yaml@branch-24.10
with:
build_type: ${{ inputs.build_type || 'branch' }}
branch: ${{ inputs.branch }}
Expand All @@ -46,7 +46,7 @@ jobs:
docs-build:
if: github.ref_type == 'branch'
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-24.08
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-24.10
with:
arch: "amd64"
branch: ${{ inputs.branch }}
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,26 +17,26 @@ jobs:
- conda-cpp-tests
- docs-build
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@branch-24.08
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.08
uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@branch-24.10
conda-cpp-build:
needs: checks
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@branch-24.08
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.08
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@branch-24.10
with:
build_type: pull-request
docs-build:
needs: conda-cpp-build
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-24.08
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-24.10
with:
build_type: pull-request
node_type: "cpu4"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ on:
jobs:
cpp-tests:
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@branch-24.08
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@branch-24.10
with:
build_type: nightly
branch: ${{ inputs.branch }}
Expand Down
2 changes: 1 addition & 1 deletion RAPIDS.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
# Allow users to control which version is used
if(NOT rapids-cmake-version)
# Define a default version if the user doesn't set one
set(rapids-cmake-version 24.08)
set(rapids-cmake-version 24.10)
endif()

# Allow users to control which GitHub repo is fetched
Expand Down
2 changes: 1 addition & 1 deletion ci/build_docs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ conda activate docs

rapids-print-env

export RAPIDS_VERSION_NUMBER="24.08"
export RAPIDS_VERSION_NUMBER="24.10"
export RAPIDS_DOCS_DIR="$(mktemp -d)"

rapids-logger "Build Sphinx docs"
Expand Down
18 changes: 0 additions & 18 deletions cmake-format-rapids-cmake.json
Original file line number Diff line number Diff line change
Expand Up @@ -161,15 +161,6 @@
"INSTALL_EXPORT_SET": 1
}
},
"rapids_cpm_libcudacxx": {
"pargs": {
"nargs": 0
},
"kwargs": {
"BUILD_EXPORT_SET": 1,
"INSTALL_EXPORT_SET": 1
}
},
"rapids_cpm_nvbench": {
"pargs": {
"nargs": 0,
Expand Down Expand Up @@ -220,15 +211,6 @@
"INSTALL_EXPORT_SET": 1
}
},
"rapids_cpm_thrust": {
"pargs": {
"nargs": 2
},
"kwargs": {
"BUILD_EXPORT_SET": 1,
"INSTALL_EXPORT_SET": 1
}
},
"rapids_cuda_init_architectures": {
"pargs": {
"nargs": 1
Expand Down
1 change: 0 additions & 1 deletion docs/api.rst
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,6 @@ require.

rapids_cuda_init_architectures </command/rapids_cuda_init_architectures>
rapids_cuda_init_runtime </command/rapids_cuda_init_runtime>
rapids_cuda_patch_toolkit </command/rapids_cuda_patch_toolkit>
rapids_cuda_set_runtime </command/rapids_cuda_set_runtime>
rapids_cuda_set_architectures [Advanced] </command/rapids_cuda_set_architectures>

Expand Down
4 changes: 2 additions & 2 deletions docs/basics.rst
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ via CMake's `FetchContent <https://cmake.org/cmake/help/latest/module/FetchConte
cmake_minimum_required(...)
if(NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/<PROJ>_RAPIDS.cmake)
file(DOWNLOAD https://raw.githubusercontent.com/rapidsai/rapids-cmake/branch-24.08/RAPIDS.cmake
file(DOWNLOAD https://raw.githubusercontent.com/rapidsai/rapids-cmake/branch-24.10/RAPIDS.cmake
${CMAKE_CURRENT_BINARY_DIR}/<PROJ>_RAPIDS.cmake)
endif()
include(${CMAKE_CURRENT_BINARY_DIR}/<PROJ>_RAPIDS.cmake)
Expand Down Expand Up @@ -59,7 +59,7 @@ like this:
GIT_REPOSITORY https://github.com/<my_fork>/rapids-cmake.git
GIT_TAG <my_feature_branch>
)
file(DOWNLOAD https://raw.githubusercontent.com/rapidsai/rapids-cmake/branch-24.08/RAPIDS.cmake
file(DOWNLOAD https://raw.githubusercontent.com/rapidsai/rapids-cmake/branch-24.10/RAPIDS.cmake
${CMAKE_CURRENT_BINARY_DIR}/RAPIDS.cmake)
include(${CMAKE_CURRENT_BINARY_DIR}/RAPIDS.cmake)
Expand Down
1 change: 0 additions & 1 deletion docs/command/rapids_cuda_patch_toolkit.rst

This file was deleted.

4 changes: 2 additions & 2 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@
# built documents.
#
# The short X.Y version.
version = "24.08"
version = "24.10"
# The full version, including alpha/beta/rc tags.
release = "24.08.00"
release = "24.10.00"


# -- General configuration ---------------------------------------------------
Expand Down
2 changes: 0 additions & 2 deletions docs/packages/packages.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,8 @@
/packages/rapids_cpm_fmt
/packages/rapids_cpm_gbench
/packages/rapids_cpm_gtest
/packages/rapids_cpm_libcudacxx
/packages/rapids_cpm_nvbench
/packages/rapids_cpm_nvcomp
/packages/rapids_cpm_nvtx3
/packages/rapids_cpm_rmm
/packages/rapids_cpm_spdlog
/packages/rapids_cpm_thrust
1 change: 0 additions & 1 deletion docs/packages/rapids_cpm_libcudacxx.rst

This file was deleted.

1 change: 0 additions & 1 deletion docs/packages/rapids_cpm_thrust.rst

This file was deleted.

130 changes: 0 additions & 130 deletions rapids-cmake/cpm/libcudacxx.cmake

This file was deleted.

22 changes: 0 additions & 22 deletions rapids-cmake/cpm/patches/Thrust/install_rules.diff

This file was deleted.

47 changes: 0 additions & 47 deletions rapids-cmake/cpm/patches/Thrust/reroot_support.diff

This file was deleted.

Loading

0 comments on commit 47c1efe

Please sign in to comment.