From eeb43a2427ffb0eebb626e63016a7b7f895b91a6 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Wed, 13 Nov 2024 12:34:35 -0600 Subject: [PATCH] put a ceiling on Cython --- conda/environments/all_cuda-118_arch-aarch64.yaml | 2 +- conda/environments/all_cuda-118_arch-x86_64.yaml | 2 +- conda/environments/all_cuda-125_arch-aarch64.yaml | 2 +- conda/environments/all_cuda-125_arch-x86_64.yaml | 2 +- conda/environments/bench_ann_cuda-118_arch-aarch64.yaml | 2 +- conda/environments/bench_ann_cuda-118_arch-x86_64.yaml | 2 +- conda/environments/bench_ann_cuda-120_arch-aarch64.yaml | 2 +- conda/environments/bench_ann_cuda-120_arch-x86_64.yaml | 2 +- conda/recipes/pylibraft/meta.yaml | 2 +- conda/recipes/raft-dask/meta.yaml | 2 +- dependencies.yaml | 2 +- python/pylibraft/pyproject.toml | 2 +- python/raft-dask/pyproject.toml | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/conda/environments/all_cuda-118_arch-aarch64.yaml b/conda/environments/all_cuda-118_arch-aarch64.yaml index a21f30dd94..72c45be96e 100644 --- a/conda/environments/all_cuda-118_arch-aarch64.yaml +++ b/conda/environments/all_cuda-118_arch-aarch64.yaml @@ -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 diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml index 3eb7cdea67..feefccb721 100644 --- a/conda/environments/all_cuda-118_arch-x86_64.yaml +++ b/conda/environments/all_cuda-118_arch-x86_64.yaml @@ -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 diff --git a/conda/environments/all_cuda-125_arch-aarch64.yaml b/conda/environments/all_cuda-125_arch-aarch64.yaml index c13b4a4bfa..da240f40c7 100644 --- a/conda/environments/all_cuda-125_arch-aarch64.yaml +++ b/conda/environments/all_cuda-125_arch-aarch64.yaml @@ -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 diff --git a/conda/environments/all_cuda-125_arch-x86_64.yaml b/conda/environments/all_cuda-125_arch-x86_64.yaml index 5820017b5d..260d361ca3 100644 --- a/conda/environments/all_cuda-125_arch-x86_64.yaml +++ b/conda/environments/all_cuda-125_arch-x86_64.yaml @@ -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 diff --git a/conda/environments/bench_ann_cuda-118_arch-aarch64.yaml b/conda/environments/bench_ann_cuda-118_arch-aarch64.yaml index 4c9d308ecd..f8818c5c7a 100644 --- a/conda/environments/bench_ann_cuda-118_arch-aarch64.yaml +++ b/conda/environments/bench_ann_cuda-118_arch-aarch64.yaml @@ -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 diff --git a/conda/environments/bench_ann_cuda-118_arch-x86_64.yaml b/conda/environments/bench_ann_cuda-118_arch-x86_64.yaml index 1b62c492cf..8e28099b9c 100644 --- a/conda/environments/bench_ann_cuda-118_arch-x86_64.yaml +++ b/conda/environments/bench_ann_cuda-118_arch-x86_64.yaml @@ -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 diff --git a/conda/environments/bench_ann_cuda-120_arch-aarch64.yaml b/conda/environments/bench_ann_cuda-120_arch-aarch64.yaml index 54d67f462a..fa57cb1f39 100644 --- a/conda/environments/bench_ann_cuda-120_arch-aarch64.yaml +++ b/conda/environments/bench_ann_cuda-120_arch-aarch64.yaml @@ -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 diff --git a/conda/environments/bench_ann_cuda-120_arch-x86_64.yaml b/conda/environments/bench_ann_cuda-120_arch-x86_64.yaml index 4f39378047..3c9995e67f 100644 --- a/conda/environments/bench_ann_cuda-120_arch-x86_64.yaml +++ b/conda/environments/bench_ann_cuda-120_arch-x86_64.yaml @@ -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 diff --git a/conda/recipes/pylibraft/meta.yaml b/conda/recipes/pylibraft/meta.yaml index ceed46a2d7..dafedcb432 100644 --- a/conda/recipes/pylibraft/meta.yaml +++ b/conda/recipes/pylibraft/meta.yaml @@ -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 diff --git a/conda/recipes/raft-dask/meta.yaml b/conda/recipes/raft-dask/meta.yaml index b2e468f7ea..7687eee9a9 100644 --- a/conda/recipes/raft-dask/meta.yaml +++ b/conda/recipes/raft-dask/meta.yaml @@ -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 diff --git a/dependencies.yaml b/dependencies.yaml index f31464aa91..4260e37d2f 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -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 - ninja - output_types: [conda] packages: diff --git a/python/pylibraft/pyproject.toml b/python/pylibraft/pyproject.toml index 75707e1a0f..3d095f9a99 100644 --- a/python/pylibraft/pyproject.toml +++ b/python/pylibraft/pyproject.toml @@ -123,7 +123,7 @@ 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`. diff --git a/python/raft-dask/pyproject.toml b/python/raft-dask/pyproject.toml index 4c5df90601..2ecaff4abc 100644 --- a/python/raft-dask/pyproject.toml +++ b/python/raft-dask/pyproject.toml @@ -120,7 +120,7 @@ regex = "(?P.*)" 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`.