Skip to content

Commit

Permalink
Merge remote-tracking branch 'rhdong/rhdong/opt-bitmap-to-csr' into r…
Browse files Browse the repository at this point in the history
…hdong/opt-bitmap-to-csr
  • Loading branch information
rhdong committed Dec 7, 2024
2 parents ff6d50d + 86c354f commit fec566a
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion conda/environments/all_cuda-118_arch-aarch64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ dependencies:
- cmake>=3.26.4,!=3.30.0
- cuda-nvtx=11.8
- cuda-profiler-api=11.8.86
- cuda-python>=11.7.1,<12.0a0
- cuda-python>=11.8.5,<12.0a0
- cuda-version=11.8
- cudatoolkit
- cupy>=12.0.0
Expand Down
2 changes: 1 addition & 1 deletion conda/environments/all_cuda-118_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ dependencies:
- cmake>=3.26.4,!=3.30.0
- cuda-nvtx=11.8
- cuda-profiler-api=11.8.86
- cuda-python>=11.7.1,<12.0a0
- cuda-python>=11.8.5,<12.0a0
- cuda-version=11.8
- cudatoolkit
- cupy>=12.0.0
Expand Down
2 changes: 1 addition & 1 deletion conda/environments/all_cuda-125_arch-aarch64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ dependencies:
- cuda-nvcc
- cuda-nvtx-dev
- cuda-profiler-api
- cuda-python>=12.0,<13.0a0
- cuda-python>=12.6.2,<13.0a0
- cuda-version=12.5
- cupy>=12.0.0
- cxx-compiler
Expand Down
2 changes: 1 addition & 1 deletion conda/environments/all_cuda-125_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ dependencies:
- cuda-nvcc
- cuda-nvtx-dev
- cuda-profiler-api
- cuda-python>=12.0,<13.0a0
- cuda-python>=12.6.2,<13.0a0
- cuda-version=12.5
- cupy>=12.0.0
- cxx-compiler
Expand Down
8 changes: 4 additions & 4 deletions conda/recipes/pylibraft/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,10 @@ requirements:
- {{ stdlib("c") }}
host:
{% if cuda_major == "11" %}
- cuda-python >=11.7.1,<12.0a0
- cuda-python >=11.8.5,<12.0a0
- cudatoolkit
{% else %}
- cuda-python >=12.0,<13.0a0
- cuda-python >=12.6.2,<13.0a0
- cuda-cudart-dev
{% endif %}
- cuda-version ={{ cuda_version }}
Expand All @@ -61,10 +61,10 @@ requirements:
- {{ pin_compatible('cuda-version', max_pin='x', min_pin='x') }}
{% if cuda_major == "11" %}
- cudatoolkit
- cuda-python >=11.7.1,<12.0a0
- cuda-python >=11.8.5,<12.0a0
{% else %}
- cuda-cudart
- cuda-python >=12.0,<13.0a0
- cuda-python >=12.6.2,<13.0a0
{% endif %}
- libraft {{ version }}
- libraft-headers {{ version }}
Expand Down
8 changes: 4 additions & 4 deletions conda/recipes/raft-dask/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,10 @@ requirements:
- {{ stdlib("c") }}
host:
{% if cuda_major == "11" %}
- cuda-python >=11.7.1,<12.0a0
- cuda-python >=11.8.5,<12.0a0
- cudatoolkit
{% else %}
- cuda-python >=12.0,<13.0a0
- cuda-python >=12.6.2,<13.0a0
- cuda-cudart-dev
{% endif %}
- cuda-version ={{ cuda_version }}
Expand All @@ -62,10 +62,10 @@ requirements:
run:
{% if cuda_major == "11" %}
- cudatoolkit
- cuda-python >=11.7.1,<12.0a0
- cuda-python >=11.8.5,<12.0a0
{% else %}
- cuda-cudart
- cuda-python >=12.0,<13.0a0
- cuda-python >=12.6.2,<13.0a0
{% endif %}
- {{ pin_compatible('cuda-version', max_pin='x', min_pin='x') }}
- dask-cuda ={{ minor_version }}
Expand Down
4 changes: 2 additions & 2 deletions dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -197,11 +197,11 @@ dependencies:
- matrix:
cuda: "12.*"
packages:
- &cuda_python12 cuda-python>=12.0,<13.0a0
- &cuda_python12 cuda-python>=12.6.2,<13.0a0
- matrix:
cuda: "11.*"
packages:
- &cuda_python11 cuda-python>=11.7.1,<12.0a0
- &cuda_python11 cuda-python>=11.8.5,<12.0a0
- matrix:
packages:
- &cuda_python cuda-python
Expand Down

0 comments on commit fec566a

Please sign in to comment.