Skip to content

Commit

Permalink
Build CUDA 11.8 and Python 3.10 Packages (#3120)
Browse files Browse the repository at this point in the history
This PR updates `cugraph` to build against branch [cuda-118](https://github.com/rapidsai/shared-action-workflows/compare/cuda-118) of the `shared-action-workflow` repository.

That branch contains updates for CUDA 11.8 and Python 3.10 packages.

It also includes some minor file renames.

Depends on rapidsai/raft#1120

Authors:
  - Bradley Dice (https://github.com/bdice)
  - AJ Schmidt (https://github.com/ajschmidt8)

Approvers:
  - AJ Schmidt (https://github.com/ajschmidt8)
  - Chuck Hastings (https://github.com/ChuckHastings)
  - Rick Ratzel (https://github.com/rlratzel)

URL: #3120
  • Loading branch information
bdice authored Jan 24, 2023
1 parent 75b619f commit 014faf2
Show file tree
Hide file tree
Showing 13 changed files with 59 additions and 54 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ concurrency:
jobs:
cpp-build:
secrets: inherit
uses: rapidsai/shared-action-workflows/.github/workflows/conda-cpp-matrix-build.yaml@main
uses: rapidsai/shared-action-workflows/.github/workflows/conda-cpp-build.yaml@cuda-118
with:
build_type: ${{ inputs.build_type || 'branch' }}
branch: ${{ inputs.branch }}
Expand All @@ -37,7 +37,7 @@ jobs:
python-build:
needs: [cpp-build]
secrets: inherit
uses: rapidsai/shared-action-workflows/.github/workflows/conda-python-matrix-build.yaml@main
uses: rapidsai/shared-action-workflows/.github/workflows/conda-python-build.yaml@cuda-118
with:
build_type: ${{ inputs.build_type || 'branch' }}
branch: ${{ inputs.branch }}
Expand All @@ -46,7 +46,7 @@ jobs:
upload-conda:
needs: [cpp-build, python-build]
secrets: inherit
uses: rapidsai/shared-action-workflows/.github/workflows/conda-upload-packages.yaml@main
uses: rapidsai/shared-action-workflows/.github/workflows/conda-upload-packages.yaml@cuda-118
with:
build_type: ${{ inputs.build_type || 'branch' }}
branch: ${{ inputs.branch }}
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,39 +19,39 @@ jobs:
- conda-python-build
- conda-python-tests
secrets: inherit
uses: rapidsai/shared-action-workflows/.github/workflows/pr-builder.yaml@main
uses: rapidsai/shared-action-workflows/.github/workflows/pr-builder.yaml@cuda-118
checks:
secrets: inherit
uses: rapidsai/shared-action-workflows/.github/workflows/checks.yaml@main
uses: rapidsai/shared-action-workflows/.github/workflows/checks.yaml@cuda-118
conda-cpp-build:
needs: checks
secrets: inherit
uses: rapidsai/shared-action-workflows/.github/workflows/conda-cpp-matrix-build.yaml@main
uses: rapidsai/shared-action-workflows/.github/workflows/conda-cpp-build.yaml@cuda-118
with:
build_type: pull-request
node_type: cpu16
conda-cpp-tests:
needs: conda-cpp-build
secrets: inherit
uses: rapidsai/shared-action-workflows/.github/workflows/conda-cpp-tests.yaml@main
uses: rapidsai/shared-action-workflows/.github/workflows/conda-cpp-tests.yaml@cuda-118
with:
build_type: pull-request
conda-python-build:
needs: conda-cpp-build
secrets: inherit
uses: rapidsai/shared-action-workflows/.github/workflows/conda-python-matrix-build.yaml@main
uses: rapidsai/shared-action-workflows/.github/workflows/conda-python-build.yaml@cuda-118
with:
build_type: pull-request
conda-python-tests:
needs: conda-python-build
secrets: inherit
uses: rapidsai/shared-action-workflows/.github/workflows/conda-python-tests.yaml@main
uses: rapidsai/shared-action-workflows/.github/workflows/conda-python-tests.yaml@cuda-118
with:
build_type: pull-request
conda-notebook-tests:
needs: conda-python-build
secrets: inherit
uses: rapidsai/shared-action-workflows/.github/workflows/custom-job.yaml@main
uses: rapidsai/shared-action-workflows/.github/workflows/custom-job.yaml@cuda-118
with:
build_type: pull-request
node_type: "gpu-latest-1"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@ on:
jobs:
conda-cpp-tests:
secrets: inherit
uses: rapidsai/shared-action-workflows/.github/workflows/conda-cpp-tests.yaml@main
uses: rapidsai/shared-action-workflows/.github/workflows/conda-cpp-tests.yaml@cuda-118
with:
build_type: nightly
branch: ${{ inputs.branch }}
date: ${{ inputs.date }}
sha: ${{ inputs.sha }}
conda-python-tests:
secrets: inherit
uses: rapidsai/shared-action-workflows/.github/workflows/conda-python-tests.yaml@main
uses: rapidsai/shared-action-workflows/.github/workflows/conda-python-tests.yaml@cuda-118
with:
build_type: nightly
branch: ${{ inputs.branch }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ dependencies:
- c-compiler
- cmake>=3.23.1,!=3.25.0
- cuda-python>=11.7.1,<12.0
- cudatoolkit=11.5
- cudatoolkit=11.8
- cudf=23.02.*
- cxx-compiler
- cython>=0.29,<0.30
Expand All @@ -34,7 +34,7 @@ dependencies:
- ninja
- notebook>=0.5.0
- numpydoc
- nvcc_linux-64=11.5
- nvcc_linux-64=11.8
- ogb
- openmpi
- pip
Expand All @@ -59,4 +59,4 @@ dependencies:
- sphinxcontrib-websupport
- ucx-proc=*=gpu
- ucx-py=0.30.*
name: all_cuda-115_arch-x86_64
name: all_cuda-118_arch-x86_64
10 changes: 5 additions & 5 deletions conda/recipes/cugraph/conda_build_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,16 @@ ucx_py_version:
- "0.30.*"

# The CTK libraries below are missing from the conda-forge::cudatoolkit
# package. The "*_host_*" version specifiers correspond to `11.5` packages.
# package. The "*_host_*" version specifiers correspond to `11.8` packages.

libcublas_host_version:
- ">=11.7.3.1,<=11.7.4.6"
- "=11.11.3.6"

libcurand_host_version:
- ">=10.2.6.48,<=10.2.7.107"
- "=10.3.0.86"

libcusolver_host_version:
- ">=11.2.1.48,<=11.3.2.107"
- "=11.4.1.48"

libcusparse_host_version:
- ">=11.7.0.31,<=11.7.0.107"
- "=11.7.5.86"
12 changes: 6 additions & 6 deletions conda/recipes/libcugraph/conda_build_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,22 +20,22 @@ gtest_version:
- "=1.10.0"

cuda_profiler_api_version:
- ">=11.4.240,<12"
- ">=11.8.86,<12"

sysroot_version:
- "2.17"

# The CTK libraries below are missing from the conda-forge::cudatoolkit
# package. The "*_host_*" version specifiers correspond to `11.5` packages.
# package. The "*_host_*" version specifiers correspond to `11.8` packages.

libcublas_host_version:
- ">=11.7.3.1,<=11.7.4.6"
- "=11.11.3.6"

libcurand_host_version:
- ">=10.2.6.48,<=10.2.7.107"
- "=10.3.0.86"

libcusolver_host_version:
- ">=11.2.1.48,<=11.3.2.107"
- "=11.4.1.48"

libcusparse_host_version:
- ">=11.7.0.31,<=11.7.0.107"
- "=11.7.5.86"
10 changes: 5 additions & 5 deletions conda/recipes/pylibcugraph/conda_build_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,16 @@ ucx_py_version:
- "0.30.*"

# The CTK libraries below are missing from the conda-forge::cudatoolkit
# package. The "*_host_*" version specifiers correspond to `11.5` packages.
# package. The "*_host_*" version specifiers correspond to `11.8` packages.

libcublas_host_version:
- ">=11.7.3.1,<=11.7.4.6"
- "=11.11.3.6"

libcurand_host_version:
- ">=10.2.6.48,<=10.2.7.107"
- "=10.3.0.86"

libcusolver_host_version:
- ">=11.2.1.48,<=11.3.2.107"
- "=11.4.1.48"

libcusparse_host_version:
- ">=11.7.0.31,<=11.7.0.107"
- "=11.7.5.86"
20 changes: 14 additions & 6 deletions dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ files:
all:
output: [conda]
matrix:
cuda: ["11.5"]
cuda: ["11.8"]
arch: [x86_64]
includes:
- checks
Expand Down Expand Up @@ -54,6 +54,10 @@ dependencies:
specific:
- output_types: [conda]
matrices:
- matrix:
cuda: "11.8"
packages:
- cudatoolkit=11.8
- matrix:
cuda: "11.5"
packages:
Expand Down Expand Up @@ -91,14 +95,14 @@ dependencies:
matrices:
- matrix:
arch: x86_64
cuda: "11.5"
cuda: "11.8"
packages:
- nvcc_linux-64=11.5
- nvcc_linux-64=11.8
- matrix:
arch: aarch64
cuda: "11.5"
cuda: "11.8"
packages:
- nvcc_linux-aarch64=11.5
- nvcc_linux-aarch64=11.8
py_version:
specific:
- output_types: [conda]
Expand All @@ -111,9 +115,13 @@ dependencies:
py: "3.9"
packages:
- python=3.9
- matrix:
py: "3.10"
packages:
- python=3.10
- matrix:
packages:
- python>=3.8,<3.10
- python>=3.8,<3.11
python_build:
common:
- output_types: [conda]
Expand Down
3 changes: 2 additions & 1 deletion python/cugraph-pyg/setup.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2018-2022, NVIDIA CORPORATION.
# Copyright (c) 2018-2023, NVIDIA CORPORATION.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
Expand Down Expand Up @@ -83,6 +83,7 @@ def run(self):
"Programming Language :: Python",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
],
# Include the separately-compiled shared library
author="NVIDIA Corporation",
Expand Down
3 changes: 2 additions & 1 deletion python/cugraph/setup.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2018-2022, NVIDIA CORPORATION.
# Copyright (c) 2018-2023, NVIDIA CORPORATION.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
Expand Down Expand Up @@ -114,6 +114,7 @@ def get_versions():
"Programming Language :: Python",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
],
# Include the separately-compiled shared library
author="NVIDIA Corporation",
Expand Down
3 changes: 2 additions & 1 deletion python/pylibcugraph/setup.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2018-2022, NVIDIA CORPORATION.
# Copyright (c) 2018-2023, NVIDIA CORPORATION.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
Expand Down Expand Up @@ -85,6 +85,7 @@ def get_versions():
"Programming Language :: Python",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
],
# Include the separately-compiled shared library
author="NVIDIA Corporation",
Expand Down
4 changes: 2 additions & 2 deletions readme_pages/SOURCEBUILD.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ __Create the conda development environment__
# create the conda environment (assuming in base `cugraph` directory)
# for CUDA 11.5
conda env create --name cugraph_dev --file conda/environments/all_cuda-115_arch-x86_64.yaml
conda env create --name cugraph_dev --file conda/environments/all_cuda-118_arch-x86_64.yaml
# activate the environment
conda activate cugraph_dev
Expand Down Expand Up @@ -231,7 +231,7 @@ Run either the C++ or the Python tests with datasets
make test
```
Note: This conda installation only applies to Linux and Python versions 3.8/3.9.
Note: This conda installation only applies to Linux and Python versions 3.8/3.10.
### Building and Testing on a gpuCI image locally
Expand Down
18 changes: 6 additions & 12 deletions readme_pages/getting_cugraph.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ Or checkout the [RAPIDS install selector](https://rapids.ai/start.html) for a pi

<br>

## Docker
## Docker
The RAPIDS Docker containers contain all RAPIDS packages, including all from cuGraph, as well as all required supporting packages. To download a container, please see the [Docker Repository](https://hub.docker.com/r/rapidsai/rapidsai/), choosing a tag based on the NVIDIA CUDA version you’re running. This provides a ready to run Docker container with example notebooks and data, showcasing how you can utilize all of the RAPIDS libraries: cuDF, cuML, and cuGraph.

<br>


## Conda
## Conda
It is easy to install cuGraph using conda. You can get a minimal conda installation with [Miniconda](https://conda.io/miniconda.html) or get the full installation with [Anaconda](https://www.anaconda.com/download).

cuGraph Conda packages
Expand All @@ -35,16 +35,10 @@ Replace the package name in the example below to the one you want to install.
Install and update cuGraph using the conda command:

```bash
# CUDA 11.4
conda install -c nvidia -c rapidsai -c numba -c conda-forge cugraph cudatoolkit=11.4

# CUDA 11.5
conda install -c nvidia -c rapidsai -c numba -c conda-forge cugraph cudatoolkit=11.5

For CUDA > 11.5, please use the 11.5 environment
conda install -c rapidsai -c numba -c conda-forge -c nvidia cugraph cudatoolkit=11.8
```

Note: This conda installation only applies to Linux and Python versions 3.8/3.9.
Note: This conda installation only applies to Linux and Python versions 3.8/3.10.

<br>

Expand All @@ -60,5 +54,5 @@ pip packages for other packages are being worked and should be available in earl
<br>

## SOURCE
cuGraph can be build directly from source. First check to make sure you have or can configure a supported environment.
Instructions for building from source is in our [source build](./SOURCEBUILD.md) page.
cuGraph can be build directly from source. First check to make sure you have or can configure a supported environment.
Instructions for building from source is in our [source build](./SOURCEBUILD.md) page.

0 comments on commit 014faf2

Please sign in to comment.