From f30b57c72d5c04adc1b8231a2f7349a34b490dd5 Mon Sep 17 00:00:00 2001 From: Ajit Mistry Date: Sat, 7 Dec 2024 13:26:31 +0000 Subject: [PATCH] adjust --- 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-125_arch-aarch64.yaml | 5 +---- conda/environments/bench_ann_cuda-125_arch-x86_64.yaml | 4 +--- conda/recipes/cuvs-bench-cpu/meta.yaml | 1 - conda/recipes/cuvs-bench/meta.yaml | 3 +-- 6 files changed, 3 insertions(+), 14 deletions(-) diff --git a/conda/environments/bench_ann_cuda-118_arch-aarch64.yaml b/conda/environments/bench_ann_cuda-118_arch-aarch64.yaml index 59ebbf777..bb85af66f 100644 --- a/conda/environments/bench_ann_cuda-118_arch-aarch64.yaml +++ b/conda/environments/bench_ann_cuda-118_arch-aarch64.yaml @@ -18,8 +18,6 @@ dependencies: - cuda-python>=11.8.5,<12.0a0 - cuda-version=11.8 - cudatoolkit -- cupy>=12.0.0 -- cuvs==24.12.*,>=0.0.0a0 - cxx-compiler - cython>=3.0.0 - dlpack>=0.8,<1.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 efdb17c69..225340fbb 100644 --- a/conda/environments/bench_ann_cuda-118_arch-x86_64.yaml +++ b/conda/environments/bench_ann_cuda-118_arch-x86_64.yaml @@ -18,8 +18,6 @@ dependencies: - cuda-python>=11.8.5,<12.0a0 - cuda-version=11.8 - cudatoolkit -- cupy>=12.0.0 -- cuvs==24.12.*,>=0.0.0a0 - cxx-compiler - cython>=3.0.0 - dlpack>=0.8,<1.0 diff --git a/conda/environments/bench_ann_cuda-125_arch-aarch64.yaml b/conda/environments/bench_ann_cuda-125_arch-aarch64.yaml index 7c2aac499..a541db0ca 100644 --- a/conda/environments/bench_ann_cuda-125_arch-aarch64.yaml +++ b/conda/environments/bench_ann_cuda-125_arch-aarch64.yaml @@ -19,8 +19,6 @@ dependencies: - cuda-profiler-api - cuda-python>=12.6.2,<13.0a0 - cuda-version=12.5 -- cupy>=12.0.0 -- cuvs==24.12.*,>=0.0.0a0 - cxx-compiler - cython>=3.0.0 - dlpack>=0.8,<1.0 @@ -31,8 +29,7 @@ dependencies: - libcurand-dev - libcusolver-dev - libcusparse-dev -- libcuvs==24.12.*,>=0.0.0a0 -- librmm==24.12.*,>=0.0.0a0 +- librmm==25.2.*,>=0.0.0a0 - matplotlib - nccl>=2.19 - ninja diff --git a/conda/environments/bench_ann_cuda-125_arch-x86_64.yaml b/conda/environments/bench_ann_cuda-125_arch-x86_64.yaml index a3f865601..3a4765934 100644 --- a/conda/environments/bench_ann_cuda-125_arch-x86_64.yaml +++ b/conda/environments/bench_ann_cuda-125_arch-x86_64.yaml @@ -19,7 +19,6 @@ dependencies: - cuda-profiler-api - cuda-python>=12.6.2,<13.0a0 - cuda-version=12.5 -- cupy>=12.0.0 - cuvs==24.12.*,>=0.0.0a0 - cxx-compiler - cython>=3.0.0 @@ -31,8 +30,7 @@ dependencies: - libcurand-dev - libcusolver-dev - libcusparse-dev -- libcuvs==24.12.*,>=0.0.0a0 -- librmm==24.12.*,>=0.0.0a0 +- librmm==25.2.*,>=0.0.0a0 - matplotlib - nccl>=2.19 - ninja diff --git a/conda/recipes/cuvs-bench-cpu/meta.yaml b/conda/recipes/cuvs-bench-cpu/meta.yaml index 016df56be..02c11346f 100644 --- a/conda/recipes/cuvs-bench-cpu/meta.yaml +++ b/conda/recipes/cuvs-bench-cpu/meta.yaml @@ -59,7 +59,6 @@ requirements: - glog {{ glog_version }} - h5py {{ h5py_version }} - matplotlib - - numpy >=1.23,<3.0a0 - pandas - pyyaml - python diff --git a/conda/recipes/cuvs-bench/meta.yaml b/conda/recipes/cuvs-bench/meta.yaml index 0681a1038..3e81edc58 100644 --- a/conda/recipes/cuvs-bench/meta.yaml +++ b/conda/recipes/cuvs-bench/meta.yaml @@ -88,11 +88,10 @@ requirements: - cudatoolkit {% else %} - cuda-cudart - - cupy>=12.0.0 - libcublas {% endif %} - glog {{ glog_version }} - - cuvs {{ version }} + - libcuvs {{ version }} - h5py {{ h5py_version }} - matplotlib - pandas