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

enforce wheel size limits and README formatting in CI, put a ceiling on Cython dependency #2490

Merged
merged 5 commits into from
Nov 14, 2024
Merged

enforce wheel size limits and README formatting in CI, put a ceiling on Cython dependency #2490

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
736df57
enforce wheel size limits, README formatting in CI
jameslamb Nov 13, 2024
28cf9e4
use form that takes package_dir
jameslamb Nov 13, 2024
c5a15f8
aarch64 pylibraft wheels are over 700MB compressed
jameslamb Nov 13, 2024
eeb43a2
put a ceiling on Cython
jameslamb Nov 13, 2024
4206485
make Cython ceiling stricter
jameslamb Nov 14, 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
5 changes: 4 additions & 1 deletion ci/build_wheel_pylibraft.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@

set -euo pipefail

package_dir="python/pylibraft"

case "${RAPIDS_CUDA_VERSION}" in
12.*)
EXTRA_CMAKE_ARGS=";-DUSE_CUDA_MATH_WHEELS=ON"
Expand All @@ -15,4 +17,5 @@ esac
# Set up skbuild options. Enable sccache in skbuild config options
export SKBUILD_CMAKE_ARGS="-DDETECT_CONDA_ENV=OFF;-DFIND_RAFT_CPP=OFF${EXTRA_CMAKE_ARGS}"

ci/build_wheel.sh pylibraft python/pylibraft
ci/build_wheel.sh pylibraft ${package_dir}
ci/validate_wheel.sh ${package_dir} final_dist
5 changes: 4 additions & 1 deletion ci/build_wheel_raft_dask.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,10 @@

set -euo pipefail

package_dir="python/raft-dask"

# Set up skbuild options. Enable sccache in skbuild config options
export SKBUILD_CMAKE_ARGS="-DDETECT_CONDA_ENV=OFF;-DFIND_RAFT_CPP=OFF"

ci/build_wheel.sh raft-dask python/raft-dask
ci/build_wheel.sh raft-dask ${package_dir}
ci/validate_wheel.sh ${package_dir} final_dist
21 changes: 21 additions & 0 deletions ci/validate_wheel.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
#!/bin/bash
# Copyright (c) 2024, NVIDIA CORPORATION.

set -euo pipefail

package_dir=$1
wheel_dir_relative_path=$2

cd "${package_dir}"

rapids-logger "validate packages with 'pydistcheck'"

pydistcheck \
--inspect \
"$(echo ${wheel_dir_relative_path}/*.whl)"

rapids-logger "validate packages with 'twine'"

twine check \
--strict \
"$(echo ${wheel_dir_relative_path}/*.whl)"
2 changes: 1 addition & 1 deletion conda/environments/all_cuda-118_arch-aarch64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ dependencies:
- cudatoolkit
- cupy>=12.0.0
- cxx-compiler
- cython>=3.0.0
- cython>=3.0.0,<=3.1.0a0
- dask-cuda==24.12.*,>=0.0.0a0
- distributed-ucxx==0.41.*,>=0.0.0a0
- doxygen>=1.8.20
Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -19,7 +19,7 @@ dependencies:
- cudatoolkit
- cupy>=12.0.0
- cxx-compiler
- cython>=3.0.0
- cython>=3.0.0,<=3.1.0a0
- dask-cuda==24.12.*,>=0.0.0a0
- distributed-ucxx==0.41.*,>=0.0.0a0
- doxygen>=1.8.20
Expand Down
2 changes: 1 addition & 1 deletion conda/environments/all_cuda-125_arch-aarch64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ dependencies:
- cuda-version=12.5
- cupy>=12.0.0
- cxx-compiler
- cython>=3.0.0
- cython>=3.0.0,<=3.1.0a0
- dask-cuda==24.12.*,>=0.0.0a0
- distributed-ucxx==0.41.*,>=0.0.0a0
- doxygen>=1.8.20
Expand Down
2 changes: 1 addition & 1 deletion conda/environments/all_cuda-125_arch-x86_64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ dependencies:
- cuda-version=12.5
- cupy>=12.0.0
- cxx-compiler
- cython>=3.0.0
- cython>=3.0.0,<=3.1.0a0
- dask-cuda==24.12.*,>=0.0.0a0
- distributed-ucxx==0.41.*,>=0.0.0a0
- doxygen>=1.8.20
Expand Down
2 changes: 1 addition & 1 deletion conda/environments/bench_ann_cuda-118_arch-aarch64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ dependencies:
- cuda-version=11.8
- cudatoolkit
- cxx-compiler
- cython>=3.0.0
- cython>=3.0.0,<=3.1.0a0
- gcc_linux-aarch64=11.*
- glog>=0.6.0
- h5py>=3.8.0
Expand Down
2 changes: 1 addition & 1 deletion conda/environments/bench_ann_cuda-118_arch-x86_64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ dependencies:
- cuda-version=11.8
- cudatoolkit
- cxx-compiler
- cython>=3.0.0
- cython>=3.0.0,<=3.1.0a0
- gcc_linux-64=11.*
- glog>=0.6.0
- h5py>=3.8.0
Expand Down
2 changes: 1 addition & 1 deletion conda/environments/bench_ann_cuda-120_arch-aarch64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ dependencies:
- cuda-profiler-api
- cuda-version=12.0
- cxx-compiler
- cython>=3.0.0
- cython>=3.0.0,<=3.1.0a0
- gcc_linux-aarch64=11.*
- glog>=0.6.0
- h5py>=3.8.0
Expand Down
2 changes: 1 addition & 1 deletion conda/environments/bench_ann_cuda-120_arch-x86_64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ dependencies:
- cuda-profiler-api
- cuda-version=12.0
- cxx-compiler
- cython>=3.0.0
- cython>=3.0.0,<=3.1.0a0
- gcc_linux-64=11.*
- glog>=0.6.0
- h5py>=3.8.0
Expand Down
2 changes: 1 addition & 1 deletion conda/recipes/pylibraft/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ requirements:
- cuda-cudart-dev
{% endif %}
- cuda-version ={{ cuda_version }}
- cython >=3.0.0
- cython >=3.0.0,<=3.1.0a0
- libraft {{ version }}
- libraft-headers {{ version }}
- python x.x
Expand Down
2 changes: 1 addition & 1 deletion conda/recipes/raft-dask/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ requirements:
- cuda-cudart-dev
{% endif %}
- cuda-version ={{ cuda_version }}
- cython >=3.0.0
- cython >=3.0.0,<=3.1.0a0
- nccl {{ nccl_version }}
- pylibraft {{ version }}
- python x.x
Expand Down
2 changes: 1 addition & 1 deletion dependencies.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ dependencies:
- output_types: [conda, requirements, pyproject]
packages:
- &cmake_ver cmake>=3.26.4,!=3.30.0
- cython>=3.0.0
- cython>=3.0.0,<=3.1.0a0
Copy link
Contributor

@bdice bdice Nov 14, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this supposed to be strictly less than? (This appears several places.)

Suggested change
- cython>=3.0.0,<=3.1.0a0
- cython>=3.0.0,<3.1.0a0

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ahhh yes!!! Thank you for catching this 🙈

Updated all of them in 4206485

- ninja
- output_types: [conda]
packages:
Expand Down
10 changes: 9 additions & 1 deletion python/pylibraft/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,13 +123,21 @@ build-backend = "scikit_build_core.build"
requires = [
"cmake>=3.26.4,!=3.30.0",
"cuda-python",
"cython>=3.0.0",
"cython>=3.0.0,<=3.1.0a0",
"ninja",
"rmm==24.12.*,>=0.0.0a0",
] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`.
dependencies-file = "../../dependencies.yaml"
matrix-entry = "cuda_suffixed=true;use_cuda_wheels=true"

[tool.pydistcheck]
select = [
"distro-too-large-compressed",
]

# detect when package size grows significantly
max_allowed_size_compressed = '825M'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FYI, this size should decrease a lot with #2488.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🥳 hey awesome! We should decrease this in #2488 or some follow-up PR after.


[tool.pytest.ini_options]
filterwarnings = [
"error",
Expand Down
10 changes: 9 additions & 1 deletion python/raft-dask/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,9 +120,17 @@ regex = "(?P<value>.*)"
build-backend = "scikit_build_core.build"
requires = [
"cmake>=3.26.4,!=3.30.0",
"cython>=3.0.0",
"cython>=3.0.0,<=3.1.0a0",
"libucx==1.15.0",
"ninja",
] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit ../../dependencies.yaml and run `rapids-dependency-file-generator`.
dependencies-file = "../../dependencies.yaml"
matrix-entry = "cuda_suffixed=true"

[tool.pydistcheck]
select = [
"distro-too-large-compressed",
]

# detect when package size grows significantly
max_allowed_size_compressed = '300M'
Loading