Skip to content

Commit 8bbd481

Browse files
raydouglassraydouglass
authored
Merge pull request #322 from rapidsai/branch-23.12
[RELEASE] kvikio v23.12
2 parents 5ea0525 + 26efdd1 commit 8bbd481

40 files changed

+726
-1884
lines changed

‎.devcontainer/cuda11.8-conda/devcontainer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
"args": {
66
"CUDA": "11.8",
77
"PYTHON_PACKAGE_MANAGER": "conda",
8-
"BASE": "rapidsai/devcontainers:23.10-cpp-llvm16-cuda11.8-mambaforge-ubuntu22.04"
8+
"BASE": "rapidsai/devcontainers:23.12-cpp-llvm16-cuda11.8-mambaforge-ubuntu22.04"
99
}
1010
},
1111
"hostRequirements": {"gpu": "optional"},
1212
"features": {
13-
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:23.10": {}
13+
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:23.12": {}
1414
},
1515
"overrideFeatureInstallOrder": [
1616
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils"

‎.devcontainer/cuda11.8-pip/devcontainer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
"args": {
66
"CUDA": "11.8",
77
"PYTHON_PACKAGE_MANAGER": "pip",
8-
"BASE": "rapidsai/devcontainers:23.10-cpp-llvm16-cuda11.8-ubuntu22.04"
8+
"BASE": "rapidsai/devcontainers:23.12-cpp-llvm16-cuda11.8-ubuntu22.04"
99
}
1010
},
1111
"hostRequirements": {"gpu": "optional"},
1212
"features": {
13-
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:23.10": {}
13+
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:23.12": {}
1414
},
1515
"overrideFeatureInstallOrder": [
1616
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils"

‎.devcontainer/cuda12.0-conda/devcontainer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
"args": {
66
"CUDA": "12.0",
77
"PYTHON_PACKAGE_MANAGER": "conda",
8-
"BASE": "rapidsai/devcontainers:23.10-cpp-mambaforge-ubuntu22.04"
8+
"BASE": "rapidsai/devcontainers:23.12-cpp-mambaforge-ubuntu22.04"
99
}
1010
},
1111
"hostRequirements": {"gpu": "optional"},
1212
"features": {
13-
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:23.10": {}
13+
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:23.12": {}
1414
},
1515
"overrideFeatureInstallOrder": [
1616
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils"

‎.devcontainer/cuda12.0-pip/devcontainer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
"args": {
66
"CUDA": "12.0",
77
"PYTHON_PACKAGE_MANAGER": "pip",
8-
"BASE": "rapidsai/devcontainers:23.10-cpp-llvm16-cuda12.0-ubuntu22.04"
8+
"BASE": "rapidsai/devcontainers:23.12-cpp-llvm16-cuda12.0-ubuntu22.04"
99
}
1010
},
1111
"hostRequirements": {"gpu": "optional"},
1212
"features": {
13-
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:23.10": {}
13+
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:23.12": {}
1414
},
1515
"overrideFeatureInstallOrder": [
1616
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils"

‎.github/workflows/build.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ on:
2222
default: nightly
2323

2424
concurrency:
25-
group: ${{ github.workflow }}-${{ github.ref }}
25+
group: ${{ github.workflow }}-${{ github.ref }}-${{ github.event_name }}
2626
cancel-in-progress: true
2727

2828
jobs:
2929
cpp-build:
3030
secrets: inherit
31-
uses: rapidsai/shared-action-workflows/.github/workflows/conda-cpp-build.yaml@branch-23.10
31+
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@branch-23.12
3232
with:
3333
build_type: ${{ inputs.build_type || 'branch' }}
3434
branch: ${{ inputs.branch }}
@@ -37,7 +37,7 @@ jobs:
3737
python-build:
3838
needs: [cpp-build]
3939
secrets: inherit
40-
uses: rapidsai/shared-action-workflows/.github/workflows/conda-python-build.yaml@branch-23.10
40+
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-23.12
4141
with:
4242
build_type: ${{ inputs.build_type || 'branch' }}
4343
branch: ${{ inputs.branch }}
@@ -46,7 +46,7 @@ jobs:
4646
upload-conda:
4747
needs: [cpp-build, python-build]
4848
secrets: inherit
49-
uses: rapidsai/shared-action-workflows/.github/workflows/conda-upload-packages.yaml@branch-23.10
49+
uses: rapidsai/shared-workflows/.github/workflows/conda-upload-packages.yaml@branch-23.12
5050
with:
5151
build_type: ${{ inputs.build_type || 'branch' }}
5252
branch: ${{ inputs.branch }}
@@ -56,7 +56,7 @@ jobs:
5656
if: github.ref_type == 'branch'
5757
needs: python-build
5858
secrets: inherit
59-
uses: rapidsai/shared-action-workflows/.github/workflows/custom-job.yaml@branch-23.10
59+
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-23.12
6060
with:
6161
arch: "amd64"
6262
branch: ${{ inputs.branch }}

‎.github/workflows/pr.yaml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -18,51 +18,51 @@ jobs:
1818
- conda-python-build
1919
- conda-python-tests
2020
- docs-build
21-
- devcontainer
21+
# - devcontainer
2222
secrets: inherit
23-
uses: rapidsai/shared-action-workflows/.github/workflows/pr-builder.yaml@branch-23.10
23+
uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@branch-23.12
2424
checks:
2525
secrets: inherit
26-
uses: rapidsai/shared-action-workflows/.github/workflows/checks.yaml@branch-23.10
26+
uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@branch-23.12
2727
conda-cpp-build:
2828
needs: checks
2929
secrets: inherit
30-
uses: rapidsai/shared-action-workflows/.github/workflows/conda-cpp-build.yaml@branch-23.10
30+
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@branch-23.12
3131
with:
3232
build_type: pull-request
3333
conda-cpp-tests:
3434
needs: conda-cpp-build
3535
secrets: inherit
36-
uses: rapidsai/shared-action-workflows/.github/workflows/conda-cpp-tests.yaml@branch-23.10
36+
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@branch-23.12
3737
with:
3838
build_type: pull-request
3939
conda-python-build:
4040
needs: conda-cpp-build
4141
secrets: inherit
42-
uses: rapidsai/shared-action-workflows/.github/workflows/conda-python-build.yaml@branch-23.10
42+
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-23.12
4343
with:
4444
build_type: pull-request
4545
conda-python-tests:
4646
needs: conda-python-build
4747
secrets: inherit
48-
uses: rapidsai/shared-action-workflows/.github/workflows/conda-python-tests.yaml@branch-23.10
48+
uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@branch-23.12
4949
with:
5050
build_type: pull-request
5151
docs-build:
5252
needs: conda-python-build
5353
secrets: inherit
54-
uses: rapidsai/shared-action-workflows/.github/workflows/custom-job.yaml@branch-23.10
54+
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-23.12
5555
with:
5656
build_type: pull-request
5757
node_type: "gpu-v100-latest-1"
5858
arch: "amd64"
5959
container_image: "rapidsai/ci-conda:latest"
6060
run_script: "ci/build_docs.sh"
61-
devcontainer:
62-
secrets: inherit
63-
uses: rapidsai/shared-action-workflows/.github/workflows/build-in-devcontainer.yaml@branch-23.10
64-
with:
65-
build_command: |
66-
sccache -z;
67-
build-all;
68-
sccache -s;
61+
# devcontainer:
62+
# secrets: inherit
63+
# uses: rapidsai/shared-workflows/.github/workflows/build-in-devcontainer.yaml@branch-23.12
64+
# with:
65+
# build_command: |
66+
# sccache -z;
67+
# build-all;
68+
# sccache -s;

‎.github/workflows/test.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@ on:
1616
jobs:
1717
cpp-tests:
1818
secrets: inherit
19-
uses: rapidsai/shared-action-workflows/.github/workflows/conda-cpp-tests.yaml@branch-23.10
19+
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@branch-23.12
2020
with:
2121
build_type: nightly
2222
branch: ${{ inputs.branch }}
2323
date: ${{ inputs.date }}
2424
sha: ${{ inputs.sha }}
2525
python-tests:
2626
secrets: inherit
27-
uses: rapidsai/shared-action-workflows/.github/workflows/conda-python-tests.yaml@branch-23.10
27+
uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@branch-23.12
2828
with:
2929
build_type: nightly
3030
branch: ${{ inputs.branch }}

‎CHANGELOG.md

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,31 @@
1+
# kvikio 23.12.00 (6 Dec 2023)
2+
3+
## 🚨 Breaking Changes
4+
5+
- Update nvcomp to 3.0.4 (includes API changes) ([#314](https://github.com/rapidsai/kvikio/pull/314)) [@vuule](https://github.com/vuule)
6+
7+
## 🐛 Bug Fixes
8+
9+
- Remove duplicated thread-pool API ([#308](https://github.com/rapidsai/kvikio/pull/308)) [@madsbk](https://github.com/madsbk)
10+
- updated the nvcomp notebook to use the new API ([#294](https://github.com/rapidsai/kvikio/pull/294)) [@madsbk](https://github.com/madsbk)
11+
12+
## 🚀 New Features
13+
14+
- Update nvcomp to 3.0.4 (includes API changes) ([#314](https://github.com/rapidsai/kvikio/pull/314)) [@vuule](https://github.com/vuule)
15+
16+
## 🛠️ Improvements
17+
18+
- Build concurrency for nightly and merge triggers ([#319](https://github.com/rapidsai/kvikio/pull/319)) [@bdice](https://github.com/bdice)
19+
- Revert rapids-cmake branch. ([#316](https://github.com/rapidsai/kvikio/pull/316)) [@bdice](https://github.com/bdice)
20+
- Support no compressor in `open_cupy_array()` ([#312](https://github.com/rapidsai/kvikio/pull/312)) [@madsbk](https://github.com/madsbk)
21+
- Update `shared-action-workflows` references ([#305](https://github.com/rapidsai/kvikio/pull/305)) [@AyodeAwe](https://github.com/AyodeAwe)
22+
- Use branch-23.12 workflows. ([#304](https://github.com/rapidsai/kvikio/pull/304)) [@bdice](https://github.com/bdice)
23+
- Update rapids-cmake functions to non-deprecated signatures ([#301](https://github.com/rapidsai/kvikio/pull/301)) [@robertmaynard](https://github.com/robertmaynard)
24+
- Unify the CUDA Codecs ([#298](https://github.com/rapidsai/kvikio/pull/298)) [@madsbk](https://github.com/madsbk)
25+
- Improve performance of nvCOMP batch codec. ([#293](https://github.com/rapidsai/kvikio/pull/293)) [@Alexey-Kamenev](https://github.com/Alexey-Kamenev)
26+
- Merge branch-23.10 into branch-23.12 and fix devcontainer CI workflow. ([#292](https://github.com/rapidsai/kvikio/pull/292)) [@bdice](https://github.com/bdice)
27+
- kvikio: Build CUDA 12.0 ARM conda packages. ([#282](https://github.com/rapidsai/kvikio/pull/282)) [@bdice](https://github.com/bdice)
28+
129
# kvikio 23.10.00 (11 Oct 2023)
230

331
## 🚨 Breaking Changes

‎ci/build_docs.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ rapids-mamba-retry install \
2525
--channel "${PYTHON_CHANNEL}" \
2626
kvikio libkvikio
2727

28-
export RAPIDS_VERSION_NUMBER="23.10"
28+
export RAPIDS_VERSION_NUMBER="23.12"
2929
export RAPIDS_DOCS_DIR="$(mktemp -d)"
3030

3131
rapids-logger "Build CPP docs"

‎ci/checks/style.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ PATH=/conda/bin:$PATH
1010
. /opt/conda/etc/profile.d/conda.sh
1111
conda activate rapids
1212

13-
FORMAT_FILE_URL=https://raw.githubusercontent.com/rapidsai/rapids-cmake/branch-23.10/cmake-format-rapids-cmake.json
13+
FORMAT_FILE_URL=https://raw.githubusercontent.com/rapidsai/rapids-cmake/branch-23.12/cmake-format-rapids-cmake.json
1414
export RAPIDS_CMAKE_FORMAT_FILE=/tmp/rapids_cmake_ci/cmake-formats-rapids-cmake.json
1515
mkdir -p $(dirname ${RAPIDS_CMAKE_FORMAT_FILE})
1616
wget -O ${RAPIDS_CMAKE_FORMAT_FILE} ${FORMAT_FILE_URL}

‎ci/release/update-version.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,12 +71,12 @@ done
7171

7272
# CI files
7373
for FILE in .github/workflows/*.yaml; do
74-
sed_runner "/shared-action-workflows/ s/@.*/@branch-${NEXT_SHORT_TAG}/g" "${FILE}"
74+
sed_runner "/shared-workflows/ s/@.*/@branch-${NEXT_SHORT_TAG}/g" "${FILE}"
7575
done
7676
sed_runner "s/RAPIDS_VERSION_NUMBER=\".*/RAPIDS_VERSION_NUMBER=\"${NEXT_SHORT_TAG}\"/g" ci/build_docs.sh
7777

7878
# .devcontainer files
7979
find .devcontainer/ -type f -name devcontainer.json -print0 | while IFS= read -r -d '' filename; do
80-
sed_runner "s@rapidsai/devcontainers:[0-9.]*@rapidsai/devcontainers:${NEXT_FULL_TAG}@g" "${filename}"
80+
sed_runner "s@rapidsai/devcontainers:[0-9.]*@rapidsai/devcontainers:${NEXT_SHORT_TAG}@g" "${filename}"
8181
sed_runner "s@rapidsai/devcontainers/features/rapids-build-utils:[0-9.]*@rapidsai/devcontainers/features/rapids-build-utils:${NEXT_SHORT_TAG_PEP440}@" "${filename}"
8282
done

‎conda/environments/all_cuda-118_arch-x86_64.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ dependencies:
1111
- cuda-python>=11.7.1,<12.0a0
1212
- cuda-version=11.8
1313
- cudatoolkit
14-
- cudf==23.10.*
14+
- cudf==23.12.*
1515
- cupy>=12.0.0
1616
- cxx-compiler
1717
- cython>=3.0.0
@@ -26,7 +26,7 @@ dependencies:
2626
- numpy>=1.21
2727
- numpydoc
2828
- nvcc_linux-64=11.8
29-
- nvcomp==2.6.1
29+
- nvcomp==3.0.4
3030
- packaging
3131
- pre-commit
3232
- pytest

‎conda/environments/all_cuda-120_arch-x86_64.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ dependencies:
1111
- cuda-nvcc
1212
- cuda-python>=12.0,<13.0a0
1313
- cuda-version=12.0
14-
- cudf==23.10.*
14+
- cudf==23.12.*
1515
- cupy>=12.0.0
1616
- cxx-compiler
1717
- cython>=3.0.0
@@ -25,7 +25,7 @@ dependencies:
2525
- numcodecs <0.12.0
2626
- numpy>=1.21
2727
- numpydoc
28-
- nvcomp==2.6.1
28+
- nvcomp==3.0.4
2929
- packaging
3030
- pre-commit
3131
- pytest

‎conda/recipes/kvikio/conda_build_config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ cmake_version:
1717
- ">=3.26.4"
1818

1919
nvcomp_version:
20-
- "=2.6.1"
20+
- "=3.0.4"

‎cpp/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ include(rapids-find)
2222

2323
project(
2424
KvikIO
25-
VERSION 23.10.00
25+
VERSION 23.12.00
2626
LANGUAGES CXX
2727
)
2828

@@ -125,10 +125,10 @@ install(FILES ${KvikIO_BINARY_DIR}/include/kvikio/version_config.hpp DESTINATION
125125

126126
include("${rapids-cmake-dir}/export/find_package_file.cmake")
127127
rapids_export_find_package_file(
128-
BUILD "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules/FindcuFile.cmake" kvikio-exports
128+
BUILD "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules/FindcuFile.cmake" EXPORT_SET kvikio-exports
129129
)
130130
rapids_export_find_package_file(
131-
INSTALL "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules/FindcuFile.cmake" kvikio-exports
131+
INSTALL "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules/FindcuFile.cmake" EXPORT_SET kvikio-exports
132132
)
133133

134134
set(doc_string

‎cpp/cmake/fetch_rapids.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# the License.
1313
# =============================================================================
1414
if(NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/KVIKIO_RAPIDS.cmake)
15-
file(DOWNLOAD https://raw.githubusercontent.com/rapidsai/rapids-cmake/branch-23.10/RAPIDS.cmake
15+
file(DOWNLOAD https://raw.githubusercontent.com/rapidsai/rapids-cmake/branch-23.12/RAPIDS.cmake
1616
${CMAKE_CURRENT_BINARY_DIR}/KVIKIO_RAPIDS.cmake
1717
)
1818
endif()

‎cpp/cmake/thirdparty/get_gtest.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ function(find_and_configure_gtest)
3232

3333
include("${rapids-cmake-dir}/export/find_package_root.cmake")
3434
rapids_export_find_package_root(
35-
BUILD GTest [=[${CMAKE_CURRENT_LIST_DIR}]=] kvikio-testing-exports
35+
BUILD GTest [=[${CMAKE_CURRENT_LIST_DIR}]=] EXPORT_SET kvikio-testing-exports
3636
)
3737
endif()
3838

‎cpp/doxygen/Doxyfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ PROJECT_NAME = "libkvikio"
3838
# could be handy for archiving the generated documentation or if some version
3939
# control system is used.
4040

41-
PROJECT_NUMBER = 23.10.00
41+
PROJECT_NUMBER = 23.12.00
4242

4343
# Using the PROJECT_BRIEF tag one can provide an optional one line description
4444
# for a project that appears at the top of each page and should give viewer a

‎dependencies.yaml

Lines changed: 5 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,10 @@ dependencies:
139139
packages:
140140
- pre-commit
141141
cudatoolkit:
142+
common:
143+
- output_types: conda
144+
packages:
145+
- nvcomp==3.0.4
142146
specific:
143147
- output_types: conda
144148
matrices:
@@ -204,34 +208,6 @@ dependencies:
204208
# Fallback matrix for aarch64, which doesn't support libcufile.
205209
- matrix:
206210
packages:
207-
- output_types: conda
208-
matrices:
209-
- matrix:
210-
arch: x86_64
211-
packages:
212-
# Align nvcomp version with rapids-cmake
213-
# TODO: not yet available for aarch64 CUDA 12
214-
- &nvcomp nvcomp==2.6.1
215-
- matrix:
216-
arch: aarch64
217-
cuda: "11.8"
218-
packages:
219-
- *nvcomp
220-
- matrix:
221-
arch: aarch64
222-
cuda: "11.5"
223-
packages:
224-
- *nvcomp
225-
- matrix:
226-
arch: aarch64
227-
cuda: "11.4"
228-
packages:
229-
- *nvcomp
230-
- matrix:
231-
arch: aarch64
232-
cuda: "11.2"
233-
packages:
234-
- *nvcomp
235211
docs:
236212
common:
237213
- output_types: [conda, requirements]
@@ -300,4 +276,4 @@ dependencies:
300276
common:
301277
- output_types: conda
302278
packages:
303-
- cudf==23.10.*
279+
- cudf==23.12.*

0 commit comments

Comments
 (0)