Skip to content

Commit

Permalink
Update cugraph to with newest CMake features, including CPM for dep…
Browse files Browse the repository at this point in the history
…endencies (#1585)

This allows the `cugraph` to be used via `CPM` either from a system installed version or from a build-directory.

Authors:
  - Robert Maynard (https://github.com/robertmaynard)
  - Paul Taylor (https://github.com/trxcllnt)
  - Dante Gama Dessavre (https://github.com/dantegd)

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

URL: #1585
  • Loading branch information
robertmaynard authored May 25, 2021
1 parent 570d811 commit 03dae45
Show file tree
Hide file tree
Showing 23 changed files with 716 additions and 1,059 deletions.
10 changes: 6 additions & 4 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ INSTALL_TARGET=install
BUILD_DISABLE_DEPRECATION_WARNING=ON
BUILD_CPP_MG_TESTS=OFF
BUILD_STATIC_FAISS=OFF
GPU_ARCH=""
BUILD_ALL_GPU_ARCH=0

# Set defaults for vars that may not have been defined externally
# FIXME: if PREFIX is not set, check CONDA_PREFIX, but there is no fallback
Expand Down Expand Up @@ -96,7 +96,7 @@ if hasArg -n; then
INSTALL_TARGET=""
fi
if hasArg --allgpuarch; then
GPU_ARCH="-DGPU_ARCHS=ALL"
BUILD_ALL_GPU_ARCH=1
fi
if hasArg --buildfaiss; then
BUILD_STATIC_FAISS=ON
Expand Down Expand Up @@ -154,15 +154,17 @@ fi
################################################################################
# Configure, build, and install libcugraph
if buildAll || hasArg libcugraph; then
if [[ ${GPU_ARCH} == "" ]]; then
if (( ${BUILD_ALL_GPU_ARCH} == 0 )); then
CUGRAPH_CMAKE_CUDA_ARCHITECTURES="NATIVE"
echo "Building for the architecture of the GPU in the system..."
else
CUGRAPH_CMAKE_CUDA_ARCHITECTURES="ALL"
echo "Building for *ALL* supported GPU architectures..."
fi
mkdir -p ${LIBCUGRAPH_BUILD_DIR}
cd ${LIBCUGRAPH_BUILD_DIR}
cmake -DCMAKE_INSTALL_PREFIX=${INSTALL_PREFIX} \
${GPU_ARCH} \
-DCMAKE_CUDA_ARCHITECTURES=${CUGRAPH_CMAKE_CUDA_ARCHITECTURES} \
-DDISABLE_DEPRECATION_WARNING=${BUILD_DISABLE_DEPRECATION_WARNING} \
-DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
-DBUILD_STATIC_FAISS=${BUILD_STATIC_FAISS} \
Expand Down
2 changes: 1 addition & 1 deletion ci/release/update-version.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
# Copyright (c) 2018-2020, NVIDIA CORPORATION.
# Copyright (c) 2018-2021, 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
2 changes: 1 addition & 1 deletion conda/environments/cugraph_dev_cuda11.0.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ dependencies:
- networkx>=2.5.1
- clang=8.0.1
- clang-tools=8.0.1
- cmake>=3.18
- cmake>=3.20.1
- python>=3.6,<3.9
- notebook>=0.5.0
- boost
Expand Down
2 changes: 1 addition & 1 deletion conda/environments/cugraph_dev_cuda11.1.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ dependencies:
- networkx>=2.5.1
- clang=8.0.1
- clang-tools=8.0.1
- cmake>=3.18
- cmake>=3.20.1
- python>=3.6,<3.9
- notebook>=0.5.0
- boost
Expand Down
2 changes: 1 addition & 1 deletion conda/environments/cugraph_dev_cuda11.2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ dependencies:
- networkx>=2.5.1
- clang=8.0.1
- clang-tools=8.0.1
- cmake>=3.18
- cmake>=3.20.1
- python>=3.6,<3.9
- notebook>=0.5.0
- boost
Expand Down
2 changes: 1 addition & 1 deletion conda/recipes/libcugraph/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ build:

requirements:
build:
- cmake>=3.12.4
- cmake>=3.20.1
- cudatoolkit {{ cuda_version }}.*
- librmm {{ minor_version }}.*
- boost-cpp>=1.66
Expand Down
Loading

0 comments on commit 03dae45

Please sign in to comment.