Bump versions to 25.07 (#231)

seberg · web-flow · commit 04aae59ffa08 · 2025-07-04T12:44:52.000+02:00
* Bump versions to 25.07

Signed-off-by: Sebastian Berg &lt;sebastianb@nvidia.com&gt;

* Temporarily pin to scikit-learn&lt;1.7 due to sklear&lt;-&gt;cupynumeric interaction

Signed-off-by: Sebastian Berg &lt;sebastianb@nvidia.com&gt;

* CI,BLD: Bump Python range to 3.11-3.13

Signed-off-by: Sebastian Berg &lt;sebastianb@nvidia.com&gt;

* forgot to rerun rapids-dependency-file-generator

Signed-off-by: Sebastian Berg &lt;sebastianb@nvidia.com&gt;

* Actually, 1.6.1 and cupynumeric already don't get along

Signed-off-by: Sebastian Berg &lt;sebastianb@nvidia.com&gt;

* The work-around is actually pinning NumPy&lt;2 :/

Signed-off-by: Sebastian Berg &lt;sebastianb@nvidia.com&gt;

* Python 3.13 can't be supported so long numpy&lt;2 is required due to cupynumeric

Signed-off-by: Sebastian Berg &lt;sebastianb@nvidia.com&gt;

* use no omps for running gpu tests (autoconfigure is failing)

Signed-off-by: Sebastian Berg &lt;sebastianb@nvidia.com&gt;

* Bump hypothesis deadline to 20s

Signed-off-by: Sebastian Berg &lt;sebastianb@nvidia.com&gt;

* TST: Print stderr on test_benchmark failure at least and make it easier to filter test runs

Signed-off-by: Sebastian Berg &lt;sebastianb@nvidia.com&gt;

* Use --omps=0 and fix style

Signed-off-by: Sebastian Berg &lt;sebastianb@nvidia.com&gt;

---------

Signed-off-by: Sebastian Berg &lt;sebastianb@nvidia.com&gt;
diff --git a/.github/workflows/conda-python-build.yaml b/.github/workflows/conda-python-build.yaml
@@ -45,9 +45,11 @@ jobs:
         CUDA_VER:
           - "12.5.1"
         PY_VER:
-          - "3.10"
           - "3.11"
           - "3.12"
+          # Can't do 3.13 due to NumPy<2 which is needed due to cupynumeric issue:
+          # https://github.com/nv-legate/cupynumeric.internal/issues/840
+          # - "3.13"
     runs-on: linux-${{ matrix.ARCH }}-cpu4
     container:
       image: "rapidsai/ci-conda:cuda${{ matrix.CUDA_VER }}-ubuntu22.04-py${{ matrix.PY_VER }}"
diff --git a/.github/workflows/docs-build.yaml b/.github/workflows/docs-build.yaml
@@ -31,6 +31,8 @@ jobs:
         include:
           - ARCH: amd64
             CUDA_VER: "12.5.1"
+            # Not using 3.13 due to cupynumeric issue forcing numpy<2:
+            # https://github.com/nv-legate/cupynumeric.internal/issues/840
             PY_VER: "3.12"
     container:
       image: "rapidsai/ci-conda:cuda${{ matrix.CUDA_VER }}-ubuntu22.04-py${{ matrix.PY_VER }}"
diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
@@ -55,7 +55,7 @@ jobs:
         include:
           - ARCH: "amd64"
             CUDA_VER: "12.5.1"
-            PY_VER: "3.11"
+            PY_VER: "3.12"
     runs-on: linux-${{ matrix.ARCH }}-cpu16
     container:
       image: "rapidsai/ci-conda:cuda${{ matrix.CUDA_VER }}-ubuntu22.04-py${{ matrix.PY_VER }}"
@@ -90,7 +90,7 @@ jobs:
         include:
           - ARCH: "amd64"
             CUDA_VER: "12.5.1"
-            PY_VER: "3.11"
+            PY_VER: "3.12"
     runs-on: linux-${{ matrix.ARCH }}-cpu4
     container:
       image: "rapidsai/ci-conda:cuda${{ matrix.CUDA_VER }}-ubuntu22.04-py${{ matrix.PY_VER }}"
@@ -114,14 +114,14 @@ jobs:
       #
       #  * architectures: amd64 only
       #  * CUDA: >=12.2
-      #  * Python: 3.10, 3.11, 3.12
+      #  * Python: 3.11, 3.12, 3.13
       #
       # Valid set of RAPIDS ci-conda image tags: https://hub.docker.com/r/rapidsai/ci-conda/tags
       matrix:
         include:
           - ARCH: "amd64"
             CUDA_VER: "12.5.1"
-            PY_VER: "3.10"
+            PY_VER: "3.11"
     runs-on: linux-${{ matrix.ARCH }}-gpu-v100-latest-1
     container:
       image: "rapidsai/ci-conda:cuda${{ matrix.CUDA_VER }}-ubuntu22.04-py${{ matrix.PY_VER }}"
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -28,6 +28,14 @@ endif()
 
 set(BUILD_SHARED_LIBS ON)
 
+# add third party dependencies using CPM
+rapids_cpm_init()
+
+# Ensure we find the same CCCL as legate (uses RAPIDS).
+# As of 25.07 this was required (2.5 worked but was found).
+include("${rapids-cmake-dir}/cpm/cccl.cmake")
+rapids_cpm_cccl()
+
 # Look for an existing C++ editable build
 # Not required. We will build it if not found.
 find_package(legateboost QUIET)
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-25.05.00
+25.07.00
diff --git a/ci/run_pytests_cpu.sh b/ci/run_pytests_cpu.sh
@@ -23,7 +23,6 @@ legate \
     --gpus 0 \
     --omps 0 \
     --module pytest \
-    . \
     -sv \
     --durations=0 \
     "${@}"
diff --git a/ci/run_pytests_gpu.sh b/ci/run_pytests_gpu.sh
@@ -20,12 +20,12 @@ nvidia-smi
 cd legateboost/test
 
 legate \
+    --omps 0 \
     --gpus 1 \
     --fbmem 28000 \
     --sysmem 28000 \
     --module pytest \
-    . \
     -sv \
-    --durations=0 \
     -k 'not sklearn' \
+    --durations=0 \
     "${@}"
diff --git a/cmake/legateboost/get_rapids_cmake.cmake b/cmake/legateboost/get_rapids_cmake.cmake
@@ -17,7 +17,7 @@ macro(legateboost_get_rapids_cmake)
 
   if(NOT rapids-cmake-version)
     # default
-    set(rapids-cmake-version 24.10)
+    set(rapids-cmake-version 25.04)
   endif()
 
   if(NOT EXISTS ${CMAKE_BINARY_DIR}/RAPIDS.cmake)
diff --git a/cmake/thirdparty/fetch_rapids.cmake b/cmake/thirdparty/fetch_rapids.cmake
@@ -12,7 +12,7 @@
 # the License.
 
 # Use this variable to update RAPIDS versions
-set(RAPIDS_VERSION "24.06")
+set(RAPIDS_VERSION "25.04")
 
 if(NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/LEGATEBOOST-RAPIDS-${RAPIDS_VERSION}.cmake)
     file(DOWNLOAD https://raw.githubusercontent.com/rapidsai/rapids-cmake/branch-${RAPIDS_VERSION}/RAPIDS.cmake
diff --git a/conda/environments/all_cuda-122.yaml b/conda/environments/all_cuda-122.yaml
@@ -15,9 +15,9 @@ dependencies:
 - cuda-nvcc
 - cuda-toolkit
 - cuda-version>=12.2
-- cupynumeric==25.05.*,>=0.0.0.dev0
+- cupynumeric==25.07.*,>=0.0.0.dev0
 - hypothesis>=6
-- legate==25.05.*,>=0.0.0.dev0
+- legate==25.07.*,>=0.0.0.dev0
 - libcublas-dev
 - llvm-openmp
 - make
@@ -27,7 +27,7 @@ dependencies:
 - nbconvert>=7.16
 - ninja>=1.11.1.1
 - notebook>=7
-- numpy
+- numpy<2
 - onnx>=1.10
 - onnxmltools>=1.10
 - openblas
diff --git a/conda/recipes/legate-boost/conda_build_config.yaml b/conda/recipes/legate-boost/conda_build_config.yaml
@@ -26,6 +26,6 @@ gpu_enabled:
   - false
 
 cupynumeric_version:
-  - "=25.05.*,>=0.0.0.dev0"
+  - "=25.07.*,>=0.0.0.dev0"
 legate_version:
-  - "=25.05.*,>=0.0.0.dev0"
+  - "=25.07.*,>=0.0.0.dev0"
diff --git a/conda/recipes/legate-boost/meta.yaml b/conda/recipes/legate-boost/meta.yaml
@@ -114,8 +114,10 @@ requirements:
     # that if legate-boost builds against, say, legate=24.06.0 and then a legate=24.06.1 is
     # released, a new legate-boost would be required.
     - legate
-    - numpy
-    - scikit-learn
+    # <2 due to bad interaction of cupynumeric and sklearn via NumPy:
+    # https://github.com/nv-legate/cupynumeric.internal/issues/840
+    - numpy<2
+    - scikit-learn>=1.6,<1.6.1
     - typing-extensions>=4.0
 
 test:
diff --git a/dependencies.yaml b/dependencies.yaml
@@ -81,7 +81,7 @@ dependencies:
       - output_types: [conda, pyproject, requirements]
         packages:
           - cmake>=3.26.4,!=3.30.0
-          - &legate legate==25.05.*,>=0.0.0.dev0
+          - &legate legate==25.07.*,>=0.0.0.dev0
           - ninja>=1.11.1.1
   clang_tidy:
     common:
@@ -138,10 +138,6 @@ dependencies:
     specific:
       - output_types: conda
         matrices:
-          - matrix:
-              py: "3.10"
-            packages:
-              - python=3.10
           - matrix:
               py: "3.11"
             packages:
@@ -157,12 +153,14 @@ dependencies:
     common:
       - output_types: [conda, pyproject, requirements]
         packages:
-          - numpy
+          # <2 due to bad interaction of cupynumeric and sklearn via NumPy:
+          # https://github.com/nv-legate/cupynumeric.internal/issues/840
+          - numpy<2
           - scikit-learn>=1.6
           - typing-extensions>=4.0
       - output_types: [conda, pyproject, requirements]
         packages:
-          - cupynumeric==25.05.*,>=0.0.0.dev0
+          - cupynumeric==25.07.*,>=0.0.0.dev0
           - *legate
   test:
     common:
diff --git a/legateboost/test/test_examples.py b/legateboost/test/test_examples.py
@@ -65,15 +65,15 @@ def test_benchmark(benchmark_dir):
     env = os.environ.copy()
     del env["LEGATE_CONFIG"]
 
-    subprocess.run(
-        "legate --cpus=2 --gpus=0"
-        + " legateboost_scaling.py --nrows 100 --ncols 5 --niter 2"
-        + " --model_types tree,linear,krr,nn",
-        shell=True,
-        check=True,
-        cwd=benchmark_dir,
-        env=env,
+    cmd = (
+        "legate --cpus=2 --gpus=0 --omps=0"
+        " legateboost_scaling.py --nrows 100 --ncols 5 --niter 2"
+        " --model_types tree,linear,krr,nn"
     )
+    res = subprocess.run(
+        cmd, shell=True, capture_output=True, cwd=benchmark_dir, env=env
+    )
+    assert res.returncode == 0, res.stderr.decode("utf-8")
 
 
 def assert_docstrings_run(files):
diff --git a/legateboost/test/test_with_hypothesis.py b/legateboost/test/test_with_hypothesis.py
@@ -13,7 +13,7 @@
 settings.register_profile(
     "local",
     max_examples=50,
-    deadline=10000,
+    deadline=20_000,
     verbosity=Verbosity.verbose,
     suppress_health_check=(HealthCheck.too_slow,),
     print_blob=True,
diff --git a/pyproject.toml b/pyproject.toml
@@ -12,7 +12,7 @@ commit-files = ["legateboost/GIT_COMMIT"]
 matrix-entry = "cuda_suffixed=true"
 requires = [
     "cmake>=3.26.4,!=3.30.0",
-    "legate==25.05.*,>=0.0.0.dev0",
+    "legate==25.07.*,>=0.0.0.dev0",
     "ninja>=1.11.1.1",
 ] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit dependencies.yaml and run `rapids-dependency-file-generator`.
 
@@ -27,20 +27,19 @@ classifiers = [
     "Topic :: Scientific/Engineering",
     "License :: OSI Approved :: Apache Software License",
     "Programming Language :: Python",
-    "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
 ]
 dependencies = [
-    "cupynumeric==25.05.*,>=0.0.0.dev0",
-    "legate==25.05.*,>=0.0.0.dev0",
-    "numpy",
+    "cupynumeric==25.07.*,>=0.0.0.dev0",
+    "legate==25.07.*,>=0.0.0.dev0",
+    "numpy<2",
     "scikit-learn>=1.6",
     "typing-extensions>=4.0",
 ] # This list was generated by `rapids-dependency-file-generator`. To make changes, edit dependencies.yaml and run `rapids-dependency-file-generator`.
 description = "GBM libary on Legate"
 license = {text = "Apache 2.0"}
-requires-python = ">=3.10"
+requires-python = ">=3.11"
 
 [project.optional-dependencies]
 test = [
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -69,6 +69,11 @@ target_compile_options(legateboost
               "$<$<COMPILE_LANGUAGE:CUDA>:${LB_CUDA_FLAGS}>"
 )
 
+# Need to add this define, as is done in legate CMakeLists.txt as well for __half support.  If
+# __half support fails elsewhere it may be needed there. This may be a CCCL 2.7.0 issue and become
+# unnecessary in the future.
+target_compile_definitions(legateboost PRIVATE _LIBCUDACXX_HAS_NVFP16=1)
+
 if (Legion_USE_CUDA)
   target_compile_definitions(legateboost PRIVATE LEGATEBOOST_USE_CUDA)
 endif()
