Skip to content

Commit

Permalink
Merge branch 'branch-24.04' of https://github.com/rapidsai/kvikio int…
Browse files Browse the repository at this point in the history
…o remove-legate
  • Loading branch information
madsbk committed Feb 27, 2024
2 parents 505503e + 5337e73 commit dff71d8
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 19 deletions.
1 change: 1 addition & 0 deletions .github/ops-bot.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@ branch_checker: true
label_checker: true
release_drafter: true
recently_updated: true
forward_merger: true
9 changes: 0 additions & 9 deletions ci/release/update-version.sh
Original file line number Diff line number Diff line change
Expand Up @@ -58,15 +58,6 @@ sed_runner 's/PROJECT_NUMBER = .*/PROJECT_NUMBER = '${NEXT_FULL_
sed_runner 's/version = .*/version = '"'${NEXT_SHORT_TAG}'"'/g' docs/source/conf.py
sed_runner 's/release = .*/release = '"'${NEXT_FULL_TAG}'"'/g' docs/source/conf.py

DEPENDENCIES=(
cudf
)
for DEP in "${DEPENDENCIES[@]}"; do
for FILE in dependencies.yaml conda/environments/*.yaml; do
sed_runner "/-.* ${DEP}\(-cu[[:digit:]]\{2\}\)\{0,1\}==/ s/==.*/==${NEXT_SHORT_TAG_PEP440}.*/g" "${FILE}"
done
done

# CI files
for FILE in .github/workflows/*.yaml; do
sed_runner "/shared-workflows/ s/@.*/@branch-${NEXT_SHORT_TAG}/g" "${FILE}"
Expand Down
3 changes: 1 addition & 2 deletions conda/environments/all_cuda-118_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ dependencies:
- cuda-python>=11.7.1,<12.0a0
- cuda-version=11.8
- cudatoolkit
- cudf==24.4.*
- cupy>=12.0.0
- cxx-compiler
- cython>=3.0.0
Expand All @@ -25,7 +24,7 @@ dependencies:
- numpy>=1.21
- numpydoc
- nvcc_linux-64=11.8
- nvcomp==3.0.5
- nvcomp==3.0.6
- packaging
- pre-commit
- pytest
Expand Down
3 changes: 1 addition & 2 deletions conda/environments/all_cuda-122_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ dependencies:
- cuda-nvcc
- cuda-python>=12.0,<13.0a0
- cuda-version=12.2
- cudf==24.4.*
- cupy>=12.0.0
- cxx-compiler
- cython>=3.0.0
Expand All @@ -23,7 +22,7 @@ dependencies:
- numcodecs <0.12.0
- numpy>=1.21
- numpydoc
- nvcomp==3.0.5
- nvcomp==3.0.6
- packaging
- pre-commit
- pytest
Expand Down
2 changes: 1 addition & 1 deletion conda/recipes/kvikio/conda_build_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ cmake_version:
- ">=3.26.4"

nvcomp_version:
- "=3.0.5"
- "=3.0.6"
10 changes: 5 additions & 5 deletions dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ files:
- cuda_version
- depends_on_cupy
- docs
- notebooks
- py_version
- run
- test_python
Expand Down Expand Up @@ -147,7 +146,7 @@ dependencies:
common:
- output_types: conda
packages:
- nvcomp==3.0.5
- nvcomp==3.0.6
specific:
- output_types: conda
matrices:
Expand Down Expand Up @@ -261,8 +260,9 @@ dependencies:
- matrix: # All CUDA 11 versions
packages:
- cuda-python>=11.7.1,<12.0a0
notebooks:
test_python_legate:
common:
- output_types: conda
- output_types: [conda, requirements, pyproject]
packages:
- cudf==24.4.*
- *dask
- distributed>=2022.05.2

0 comments on commit dff71d8

Please sign in to comment.