Skip to content

Commit

Permalink
try to fix merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
@divyegala
divyegala committed Oct 4, 2023
1 parent 161bae2 commit a836596
Showing 1 changed file with 13 additions and 136 deletions.
149 changes: 13 additions & 136 deletions dependencies.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,12 @@ files:
- build_pylibraft
- cudatoolkit
- develop
- checks
- build_wheels
- test_libraft
- docs
- run_raft_dask
- run_pylibraft
- test_python_common
- test_pylibraft
- cupy
bench_ann:
output: conda
matrix:
Expand All @@ -41,7 +38,6 @@ files:
- py_version
- test_python_common
- test_pylibraft
- cupy
checks:
output: none
includes:
Expand All @@ -51,7 +47,6 @@ files:
output: none
includes:
- test_pylibraft
- cupy
- cudatoolkit
- docs
- py_version
Expand Down Expand Up @@ -80,7 +75,6 @@ files:
includes:
- test_python_common
- test_pylibraft
- cupy
py_build_raft_dask:
output: pyproject
pyproject_dir: python/raft-dask
Expand Down Expand Up @@ -151,30 +145,9 @@ dependencies:
packages:
- gcc_linux-aarch64=11.*
- sysroot_linux-aarch64==2.17
- output_types: conda
matrices:
- matrix: {cuda: "12.0"}
packages: [cuda-version=12.0, cuda-nvcc]
- matrix: {cuda: "11.8", arch: x86_64}
packages: [nvcc_linux-64=11.8]
- matrix: {cuda: "11.8", arch: aarch64}
packages: [nvcc_linux-aarch64=11.8]
- matrix: {cuda: "11.5", arch: x86_64}
packages: [nvcc_linux-64=11.5]
- matrix: {cuda: "11.5", arch: aarch64}
packages: [nvcc_linux-aarch64=11.5]
- matrix: {cuda: "11.4", arch: x86_64}
packages: [nvcc_linux-64=11.4]
- matrix: {cuda: "11.4", arch: aarch64}
packages: [nvcc_linux-aarch64=11.4]
- matrix: {cuda: "11.2", arch: x86_64}
packages: [nvcc_linux-64=11.2]
- matrix: {cuda: "11.2", arch: aarch64}
packages: [nvcc_linux-aarch64=11.2]

build_pylibraft:
common:
- output_types: [conda]
- output_types: [conda, requirements, pyproject]
packages:
- &rmm rmm==23.12.*
specific:
Expand All @@ -187,30 +160,18 @@ dependencies:
- matrix: # All CUDA 11 versions
packages:
- &cuda_python11 cuda-python>=11.7.1,<12.0a0
- output_types: [requirements, pyproject]
matrices:
- matrix: {cuda: "12.2"}
packages: &build_pylibraft_packages_cu12
- &rmm_cu12 rmm-cu12==23.10.*
- {matrix: {cuda: "12.1"}, packages: *build_pylibraft_packages_cu12}
- {matrix: {cuda: "12.0"}, packages: *build_pylibraft_packages_cu12}
- matrix: {cuda: "11.8"}
packages: &build_pylibraft_packages_cu11
- &rmm_cu11 rmm-cu11==23.10.*
- {matrix: {cuda: "11.5"}, packages: *build_pylibraft_packages_cu11}
- {matrix: {cuda: "11.4"}, packages: *build_pylibraft_packages_cu11}
- {matrix: {cuda: "11.2"}, packages: *build_pylibraft_packages_cu11}
- {matrix: null, packages: [*rmm_conda] }
checks:
common:
- output_types: [conda, requirements]
packages:
- pre-commit
develop:
common:
- output_types: conda
- output_types: [conda, requirements]
packages:
- clang=16.0.6
- output_types: [conda]
packages:
- clang==16.0.6
- clang-tools=16.0.6
nn_bench:
common:
Expand Down Expand Up @@ -304,45 +265,6 @@ dependencies:
- *libcusolver114
- *libcusparse_dev114
- *libcusparse114

cupy:
common:
- output_types: conda
packages:
- cupy>=12.0.0
specific:
- output_types: [requirements, pyproject]
matrices:
# All CUDA 12 + x86_64 versions
- matrix: {cuda: "12.2", arch: x86_64}
packages: &cupy_packages_cu12_x86_64
- &cupy_cu12_x86_64 cupy-cuda12x>=12.0.0
- {matrix: {cuda: "12.1", arch: x86_64}, packages: *cupy_packages_cu12_x86_64}
- {matrix: {cuda: "12.0", arch: x86_64}, packages: *cupy_packages_cu12_x86_64}
# All CUDA 12 + aarch64 versions
- matrix: {cuda: "12.2", arch: aarch64}
packages: &cupy_packages_cu12_aarch64
- &cupy_cu12_aarch64 cupy-cuda12x -f https://pip.cupy.dev/aarch64 # TODO: Verify that this works.
- {matrix: {cuda: "12.1", arch: aarch64}, packages: *cupy_packages_cu12_aarch64}
- {matrix: {cuda: "12.0", arch: aarch64}, packages: *cupy_packages_cu12_aarch64}

# All CUDA 11 + x86_64 versions
- matrix: {cuda: "11.8", arch: x86_64}
packages: &cupy_packages_cu11_x86_64
- cupy-cuda11x>=12.0.0
- {matrix: {cuda: "11.5", arch: x86_64}, packages: *cupy_packages_cu11_x86_64}
- {matrix: {cuda: "11.4", arch: x86_64}, packages: *cupy_packages_cu11_x86_64}
- {matrix: {cuda: "11.2", arch: x86_64}, packages: *cupy_packages_cu11_x86_64}

# All CUDA 11 + aarch64 versions
- matrix: {cuda: "11.8", arch: aarch64}
packages: &cupy_packages_cu11_aarch64
- cupy-cuda11x -f https://pip.cupy.dev/aarch64 # TODO: Verify that this works.
- {matrix: {cuda: "11.5", arch: aarch64}, packages: *cupy_packages_cu11_aarch64}
- {matrix: {cuda: "11.4", arch: aarch64}, packages: *cupy_packages_cu11_aarch64}
- {matrix: {cuda: "11.2", arch: aarch64}, packages: *cupy_packages_cu11_aarch64}
- {matrix: null, packages: [cupy-cuda11x>=12.0.0]}

test_libraft:
common:
- output_types: [conda]
Expand All @@ -365,7 +287,7 @@ dependencies:
- sphinx-markdown-tables
build_wheels:
common:
- output_types: [requirements, pyproject]
- output_types: pyproject
packages:
- wheel
- setuptools
Expand All @@ -389,14 +311,7 @@ dependencies:
- output_types: [conda, pyproject]
packages:
- &numpy numpy>=1.21
- output_types: [conda]
packages:
- *rmm_conda
- output_types: requirements
packages:
# pip recognizes the index as a global option for the requirements.txt file
# This index is needed for cudf and rmm.
- --extra-index-url=https://pypi.nvidia.com
- *rmm
specific:
- output_types: [conda, requirements, pyproject]
matrices:
Expand All @@ -407,20 +322,6 @@ dependencies:
- matrix: # All CUDA 11 versions
packages:
- *cuda_python11
- output_types: [requirements, pyproject]
matrices:
- matrix: {cuda: "12.2"}
packages: &run_pylibraft_packages_cu12
- *rmm_cu12
- {matrix: {cuda: "12.1"}, packages: *run_pylibraft_packages_cu12}
- {matrix: {cuda: "12.0"}, packages: *run_pylibraft_packages_cu12}
- matrix: {cuda: "11.8"}
packages: &run_pylibraft_packages_cu11
- *rmm_cu11
- {matrix: {cuda: "11.5"}, packages: *run_pylibraft_packages_cu11}
- {matrix: {cuda: "11.4"}, packages: *run_pylibraft_packages_cu11}
- {matrix: {cuda: "11.2"}, packages: *run_pylibraft_packages_cu11}
- {matrix: null, packages: [*rmm_conda]}
run_raft_dask:
common:
- output_types: [conda, pyproject]
Expand All @@ -431,45 +332,15 @@ dependencies:
- joblib>=0.11
- numba>=0.57
- *numpy
<<<<<<< HEAD
=======
- ucx-py==0.35.*
>>>>>>> upstream/branch-23.12
- output_types: conda
packages:
- dask-core>=2023.7.1
- ucx>=1.13.0
- ucx-proc=*=gpu
- &ucx_py_conda ucx-py==0.34.*
- output_types: pyproject
packages:
<<<<<<< HEAD
- &pylibraft_conda pylibraft==23.10.*
- output_types: requirements
packages:
# pip recognizes the index as a global option for the requirements.txt file
# This index is needed for cudf and rmm.
- --extra-index-url=https://pypi.nvidia.com
specific:
- output_types: [requirements, pyproject]
matrices:
- matrix: {cuda: "12.2"}
packages: &run_raft_dask_packages_cu12
- &pylibraft_cu12 pylibraft-cu12==23.10.*
- &ucx_py_cu12 ucx-py-cu12==0.34.*
- {matrix: {cuda: "12.1"}, packages: *run_raft_dask_packages_cu12}
- {matrix: {cuda: "12.0"}, packages: *run_raft_dask_packages_cu12}
- matrix: {cuda: "11.8"}
packages: &run_raft_dask_packages_cu11
- &pylibraft_cu11 pylibraft-cu11==23.10.*
- &ucx_py_cu11 ucx-py-cu11==0.34.*
- {matrix: {cuda: "11.5"}, packages: *run_raft_dask_packages_cu11}
- {matrix: {cuda: "11.4"}, packages: *run_raft_dask_packages_cu11}
- {matrix: {cuda: "11.2"}, packages: *run_raft_dask_packages_cu11}
- {matrix: null, packages: [*pylibraft_conda, *ucx_py_conda]}
=======
- pylibraft==23.12.*
>>>>>>> upstream/branch-23.12
test_python_common:
common:
- output_types: [conda, requirements, pyproject]
Expand All @@ -482,3 +353,9 @@ dependencies:
packages:
- scikit-learn
- scipy
- output_types: conda
packages:
- cupy>=12.0.0
- output_types: pyproject
packages:
- cupy-cuda11x>=12.0.0

0 comments on commit a836596

Please sign in to comment.