Merge pull request #754 from rapidsai/branch-24.08

rapidsai · Aug 7, 2024 · 44671da · 44671da
2 parents a383154 + 2c63e75
commit 44671da
Show file tree

Hide file tree

Showing 34 changed files with 194 additions and 102 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -9,8 +9,14 @@ python/            @rapidsai/cucim-python-codeowners
 **/CMakeLists.txt  @rapidsai/cucim-cmake-codeowners
 **/cmake/          @rapidsai/cucim-cmake-codeowners
 
-#build/ops code owners
-/.github/           @rapidsai/ops-codeowners
-/ci/                @rapidsai/ops-codeowners
-/conda/             @rapidsai/ops-codeowners
-dependencies.yaml  @rapidsai/ops-codeowners
+#CI code owners
+/.github/                @rapidsai/ci-codeowners
+/ci/                     @rapidsai/ci-codeowners
+/.pre-commit-config.yaml @rapidsai/ci-codeowners
+
+#packaging code owners
+/.devcontainer/    @rapidsai/packaging-codeowners
+/conda/            @rapidsai/packaging-codeowners
+/dependencies.yaml @rapidsai/packaging-codeowners
+/build.sh          @rapidsai/packaging-codeowners
+pyproject.toml     @rapidsai/packaging-codeowners
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -28,7 +28,7 @@ concurrency:
 jobs:
   cpp-build:
     secrets: inherit
-    uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@branch-24.06
+    uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@branch-24.08
     with:
       build_type: ${{ inputs.build_type || 'branch' }}
       branch: ${{ inputs.branch }}
@@ -38,7 +38,7 @@ jobs:
     if: github.ref_type == 'branch'
     needs: [python-build]
     secrets: inherit
-    uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-24.06
+    uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-24.08
     with:
       arch: "amd64"
       branch: ${{ inputs.branch }}
@@ -51,7 +51,7 @@ jobs:
   python-build:
     needs: [cpp-build]
     secrets: inherit
-    uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-24.06
+    uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-24.08
     with:
       build_type: ${{ inputs.build_type || 'branch' }}
       branch: ${{ inputs.branch }}
@@ -60,15 +60,15 @@ jobs:
   upload-conda:
     needs: [cpp-build, python-build]
     secrets: inherit
-    uses: rapidsai/shared-workflows/.github/workflows/conda-upload-packages.yaml@branch-24.06
+    uses: rapidsai/shared-workflows/.github/workflows/conda-upload-packages.yaml@branch-24.08
     with:
       build_type: ${{ inputs.build_type || 'branch' }}
       branch: ${{ inputs.branch }}
       date: ${{ inputs.date }}
       sha: ${{ inputs.sha }}
   wheel-build:
     secrets: inherit
-    uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.06
+    uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.08
     with:
       build_type: ${{ inputs.build_type || 'branch' }}
       branch: ${{ inputs.branch }}
@@ -78,7 +78,7 @@ jobs:
   wheel-publish:
     needs: wheel-build
     secrets: inherit
-    uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@branch-24.06
+    uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@branch-24.08
     with:
       build_type: ${{ inputs.build_type || 'branch' }}
       branch: ${{ inputs.branch }}

diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
@@ -20,32 +20,32 @@ jobs:
       - wheel-build
       - wheel-tests
     secrets: inherit
-    uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@branch-24.06
+    uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@branch-24.08
   checks:
     secrets: inherit
-    uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@branch-24.06
+    uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@branch-24.08
   conda-cpp-build:
     needs: checks
     secrets: inherit
-    uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@branch-24.06
+    uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@branch-24.08
     with:
       build_type: pull-request
   conda-python-build:
     needs: conda-cpp-build
     secrets: inherit
-    uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-24.06
+    uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-24.08
     with:
       build_type: pull-request
   conda-python-tests:
     needs: conda-python-build
     secrets: inherit
-    uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@branch-24.06
+    uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@branch-24.08
     with:
       build_type: pull-request
   docs-build:
     needs: conda-python-build
     secrets: inherit
-    uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-24.06
+    uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-24.08
     with:
       build_type: pull-request
       node_type: "gpu-v100-latest-1"
@@ -55,14 +55,14 @@ jobs:
   wheel-build:
     needs: checks
     secrets: inherit
-    uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.06
+    uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-24.08
     with:
       build_type: pull-request
       script: ci/build_wheel.sh
   wheel-tests:
     needs: wheel-build
     secrets: inherit
-    uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.06
+    uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.08
     with:
       build_type: pull-request
       script: ci/test_wheel.sh
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -16,15 +16,15 @@ on:
 jobs:
   conda-python-tests:
     secrets: inherit
-    uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@branch-24.06
+    uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@branch-24.08
     with:
       build_type: nightly
       branch: ${{ inputs.branch }}
       date: ${{ inputs.date }}
       sha: ${{ inputs.sha }}
   wheel-tests:
     secrets: inherit
-    uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.06
+    uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.08
     with:
       build_type: nightly
       branch: ${{ inputs.branch }}

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -28,8 +28,13 @@ repos:
         args: ["--toml", "python/cucim/pyproject.toml"]
         additional_dependencies:
           - tomli
+  - repo: https://github.com/rapidsai/pre-commit-hooks
+    rev: v0.2.0
+    hooks:
+      - id: verify-alpha-spec
+        args: ["--fix", "--mode=release"]
   - repo: https://github.com/rapidsai/dependency-file-generator
-    rev: v1.8.0
+    rev: v1.13.11
     hooks:
         - id: rapids-dependency-file-generator
           args: ["--clean"]
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,18 @@
+# cucim 24.08.00 (7 Aug 2024)
+
+## 🛠️ Improvements
+
+- Drop NumPy build dependency ([#751](https://github.com/rapidsai/cucim/pull/751)) [@jakirkham](https://github.com/jakirkham)
+- Use workflow branch 24.08 again ([#749](https://github.com/rapidsai/cucim/pull/749)) [@KyleFromNVIDIA](https://github.com/KyleFromNVIDIA)
+- Build and test with CUDA 12.5.1 ([#747](https://github.com/rapidsai/cucim/pull/747)) [@KyleFromNVIDIA](https://github.com/KyleFromNVIDIA)
+- Minor fixes for NumPy 2.0 compatiblity ([#746](https://github.com/rapidsai/cucim/pull/746)) [@grlee77](https://github.com/grlee77)
+- skip CMake 3.30.0, require CMake &gt;=3.26.4 ([#745](https://github.com/rapidsai/cucim/pull/745)) [@jameslamb](https://github.com/jameslamb)
+- Use verify-alpha-spec hook ([#744](https://github.com/rapidsai/cucim/pull/744)) [@KyleFromNVIDIA](https://github.com/KyleFromNVIDIA)
+- remove .gitattributes ([#740](https://github.com/rapidsai/cucim/pull/740)) [@jameslamb](https://github.com/jameslamb)
+- Adopt CI/packaging codeowners ([#739](https://github.com/rapidsai/cucim/pull/739)) [@bdice](https://github.com/bdice)
+- Remove text builds of documentation ([#738](https://github.com/rapidsai/cucim/pull/738)) [@vyasr](https://github.com/vyasr)
+- use rapids-build-backend ([#736](https://github.com/rapidsai/cucim/pull/736)) [@jameslamb](https://github.com/jameslamb)
+
 # cucim 24.06.00 (5 Jun 2024)
 
 ## 🚨 Breaking Changes

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -13,9 +13,7 @@
 # limitations under the License.
 #
 
-# CUDA_STANDARD 17 is supported from CMAKE 3.18
-# : https://cmake.org/cmake/help/v3.18/prop_tgt/CUDA_STANDARD.html
-cmake_minimum_required(VERSION 3.18)
+cmake_minimum_required(VERSION 3.26.4)
 
 ################################################################################
 # Prerequisite statements

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-24.06.00
+24.08.00
diff --git a/ci/build_cpp.sh b/ci/build_cpp.sh
@@ -13,12 +13,10 @@ export CMAKE_GENERATOR=Ninja
 
 rapids-print-env
 
-version=$(rapids-generate-version)
-
 rapids-logger "Begin cpp build"
 
 conda config --set path_conflict prevent
 
-RAPIDS_PACKAGE_VERSION=${version} rapids-conda-retry mambabuild conda/recipes/libcucim
+RAPIDS_PACKAGE_VERSION=$(rapids-generate-version) rapids-conda-retry mambabuild conda/recipes/libcucim
 
 rapids-upload-conda-to-s3 cpp
diff --git a/ci/build_docs.sh b/ci/build_docs.sh
@@ -9,7 +9,7 @@ rapids-logger "Create test conda environment"
 
 rapids-dependency-file-generator \
     --output conda \
-    --file_key docs \
+    --file-key docs \
     --matrix "cuda=${RAPIDS_CUDA_VERSION%.*};arch=$(arch);py=${RAPIDS_PY_VERSION}" | tee env.yaml
 
 rapids-mamba-retry env create --yes -f env.yaml -n docs
@@ -31,10 +31,8 @@ export RAPIDS_DOCS_DIR="$(mktemp -d)"
 rapids-logger "Build Python docs"
 pushd docs
 sphinx-build -b dirhtml ./source _html
-sphinx-build -b text ./source _text
-mkdir -p "${RAPIDS_DOCS_DIR}/cucim/"{html,txt}
+mkdir -p "${RAPIDS_DOCS_DIR}/cucim/"html
 mv _html/* "${RAPIDS_DOCS_DIR}/cucim/html"
-mv _text/* "${RAPIDS_DOCS_DIR}/cucim/txt"
 popd
 
 rapids-upload-docs
diff --git a/ci/build_python.sh b/ci/build_python.sh
@@ -13,16 +13,7 @@ export CMAKE_GENERATOR=Ninja
 
 rapids-print-env
 
-package_name="cucim"
-package_dir="python/cucim"
-package_src_dir="${package_dir}/src/${package_name}"
-
-version=$(rapids-generate-version)
-
-commit=$(git rev-parse HEAD)
-
-echo "${version}" > VERSION
-sed -i "/^__git_commit__/ s/= .*/= \"${commit}\"/g" "${package_src_dir}/_version.py"
+rapids-generate-version > ./VERSION
 
 rapids-logger "Begin py build"
 conda config --set path_conflict prevent
@@ -31,7 +22,7 @@ CPP_CHANNEL=$(rapids-download-conda-from-s3 cpp)
 
 # TODO: Remove `--no-test` flag once importing on a CPU
 # node works correctly
-RAPIDS_PACKAGE_VERSION=${version} rapids-conda-retry mambabuild \
+RAPIDS_PACKAGE_VERSION=$(head -1 ./VERSION) rapids-conda-retry mambabuild \
   --no-test \
   --channel "${CPP_CHANNEL}" \
   conda/recipes/cucim

diff --git a/ci/build_wheel.sh b/ci/build_wheel.sh
@@ -12,28 +12,15 @@ CMAKE_BUILD_TYPE="release"
 source rapids-configure-sccache
 source rapids-date-string
 
-version=$(rapids-generate-version)
-commit=$(git rev-parse HEAD)
+rapids-generate-version > ./VERSION
 
 RAPIDS_PY_CUDA_SUFFIX="$(rapids-wheel-ctk-name-gen ${RAPIDS_CUDA_VERSION})"
 
-# Patch project metadata files to include the CUDA version suffix and version override.
-pyproject_file="${package_dir}/pyproject.toml"
-
 PACKAGE_CUDA_SUFFIX="-${RAPIDS_PY_CUDA_SUFFIX}"
-# update package name to have the cuda suffix
-sed -i "s/name = \"${package_name}\"/name = \"${package_name}${PACKAGE_CUDA_SUFFIX}\"/g" ${pyproject_file}
-echo "${version}" > VERSION
-sed -i "/^__git_commit__/ s/= .*/= \"${commit}\"/g" "${package_src_dir}/_version.py"
-
-if [[ ${PACKAGE_CUDA_SUFFIX} == "-cu12" ]]; then
-    # change pyproject.toml to use CUDA 12.x version of cupy
-    sed -i "s/cupy-cuda11x/cupy-cuda12x/g" ${pyproject_file}
-fi
 
 # Install pip build dependencies (not yet using pyproject.toml)
 rapids-dependency-file-generator \
-  --file_key "py_build" \
+  --file-key "py_build" \
   --output "requirements" \
   --matrix "cuda=${RAPIDS_CUDA_VERSION%.*};arch=$(arch);py=${RAPIDS_PY_VERSION}" | tee build_requirements.txt
 pip install -r build_requirements.txt

diff --git a/ci/check_style.sh b/ci/check_style.sh
@@ -8,7 +8,7 @@ rapids-logger "Create checks conda environment"
 
 rapids-dependency-file-generator \
   --output conda \
-  --file_key checks \
+  --file-key checks \
   --matrix "cuda=${RAPIDS_CUDA_VERSION%.*};arch=$(arch);py=${RAPIDS_PY_VERSION}" | tee env.yaml
 
 rapids-mamba-retry env create --yes -f env.yaml -n checks

diff --git a/ci/test_python.sh b/ci/test_python.sh
@@ -12,7 +12,7 @@ RAPIDS_VERSION_NUMBER=$(rapids-generate-version)
 rapids-logger "Generate Python testing dependencies"
 rapids-dependency-file-generator \
   --output conda \
-  --file_key test_python \
+  --file-key test_python \
   --matrix "cuda=${RAPIDS_CUDA_VERSION%.*};arch=$(arch);py=${RAPIDS_PY_VERSION}" | tee env.yaml
 
 rapids-mamba-retry env create --yes -f env.yaml -n test

diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml
@@ -9,7 +9,7 @@ dependencies:
 - GPUtil>=1.4.0
 - c-compiler
 - click
-- cmake>=3.23.1,!=3.25.0
+- cmake>=3.26.4,!=3.30.0
 - cuda-version=11.8
 - cudatoolkit
 - cupy>=12.0.0

diff --git a/...nvironments/all_cuda-122_arch-x86_64.yaml → ...nvironments/all_cuda-125_arch-x86_64.yaml b/...nvironments/all_cuda-122_arch-x86_64.yaml → ...nvironments/all_cuda-125_arch-x86_64.yaml
@@ -9,10 +9,10 @@ dependencies:
 - GPUtil>=1.4.0
 - c-compiler
 - click
-- cmake>=3.23.1,!=3.25.0
+- cmake>=3.26.4,!=3.30.0
 - cuda-cudart-dev
 - cuda-nvcc
-- cuda-version=12.2
+- cuda-version=12.5
 - cupy>=12.0.0
 - cxx-compiler
 - gcc_linux-64=11.*
@@ -53,4 +53,4 @@ dependencies:
 - zstd
 - pip:
   - opencv-python-headless>=4.6
-name: all_cuda-122_arch-x86_64
+name: all_cuda-125_arch-x86_64
diff --git a/conda/recipes/cucim/build.sh b/conda/recipes/cucim/build.sh
@@ -18,6 +18,6 @@ cp -P python/install/lib/* python/cucim/src/cucim/clara/
 pushd python/cucim
 
 echo "PYTHON: ${PYTHON}"
-$PYTHON -m pip install . -vv
+$PYTHON -m pip install --config-settings rapidsai.disable-cuda=true . -vv
 
 popd
diff --git a/conda/recipes/cucim/conda_build_config.yaml b/conda/recipes/cucim/conda_build_config.yaml
@@ -15,3 +15,6 @@ c_stdlib:
 
 c_stdlib_version:
   - "2.17"
+
+cmake_version:
+  - ">=3.26.4,!=3.30.0"
diff --git a/conda/recipes/cucim/meta.yaml b/conda/recipes/cucim/meta.yaml
@@ -51,7 +51,7 @@ requirements:
     - {{ compiler('cuda') }}
     {% endif %}
     - cuda-version ={{ cuda_version }}
-    - cmake >=3.23.1,!=3.25.0
+    - cmake {{ cmake_version }}
     - make
     - ninja
     - {{ stdlib("c") }}
@@ -63,16 +63,17 @@ requirements:
     {% endif %}
     - cupy >=12.0.0
     - libcucim ={{ version }}
-    - numpy 1.23
     - python
+    - rapids-build-backend >=0.3.0,<0.4.0.dev0
     - scikit-image >=0.19.0,<0.23.0a0
     - scipy >=1.6
+    - setuptools >=24.2.0
   run:
     - {{ pin_compatible('cuda-version', max_pin='x', min_pin='x') }}
     {% if cuda_major != "11" %}
     - cuda-cudart
     {% endif %}
-    - {{ pin_compatible('numpy') }}
+    - numpy >=1.23,<2.0a0
     - click
     - cupy >=12.0.0
     - lazy_loader >=0.1

diff --git a/conda/recipes/libcucim/conda_build_config.yaml b/conda/recipes/libcucim/conda_build_config.yaml
@@ -16,6 +16,9 @@ c_stdlib:
 c_stdlib_version:
   - "2.17"
 
+cmake_version:
+  - ">=3.26.4,!=3.30.0"
+
 # The CTK libraries below are missing from the conda-forge::cudatoolkit package
 # for CUDA 11. The "*_host_*" version specifiers correspond to `11.8` packages
 # and the "*_run_*" version specifiers correspond to `11.x` packages.

diff --git a/conda/recipes/libcucim/meta.yaml b/conda/recipes/libcucim/meta.yaml
@@ -56,7 +56,7 @@ requirements:
     {% endif %}
     - cuda-version ={{ cuda_version }}
     - binutils
-    - cmake >=3.23.1,!=3.25.0
+    - cmake {{ cmake_version }}
     - make
     - ninja
     - {{ stdlib("c") }}