Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Forward-merge branch-24.02 into branch-24.04 [skip ci] #349

Merged
merged 2 commits into from
Feb 26, 2024
Merged

Forward-merge branch-24.02 into branch-24.04 [skip ci] #349

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a72a105
Bump to nvcomp 3.0.6. (#346)
bdice Feb 26, 2024
aa3b029
Merge branch-24.02 into branch-24.04
jakirkham Feb 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions ci/release/update-version.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,15 +60,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
View file
Open in desktop
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 @@ -26,7 +25,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
View file
Open in desktop
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 @@ -24,7 +23,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
View file
Open in desktop
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"
8 changes: 1 addition & 7 deletions dependencies.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ files:
- cuda_version
- depends_on_cupy
- docs
- notebooks
- py_version
- run
- test_python
Expand Down Expand Up @@ -180,7 +179,7 @@ dependencies:
common:
- output_types: conda
packages:
- nvcomp==3.0.5
- nvcomp==3.0.6
specific:
- output_types: conda
matrices:
Expand Down Expand Up @@ -300,8 +299,3 @@ dependencies:
packages:
- *dask
- distributed>=2022.05.2
notebooks:
common:
- output_types: conda
packages:
- cudf==24.4.*
Loading