Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update cugraph to with newest CMake features, including CPM for dependencies #1585

Merged
merged 56 commits into from
May 25, 2021
Merged
Show file tree
Hide file tree
Changes from 43 commits
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
31cc675
Convert cugraph over to using rapids-cmake
robertmaynard May 7, 2021
29e1719
use rapids-cmake HTTPS url
trxcllnt May 7, 2021
d58abde
fix GTest target alias names
trxcllnt May 7, 2021
5b2f073
Checkout rapids-cmake via https
robertmaynard May 7, 2021
64bd5aa
rename cuGraph -> cugraph
trxcllnt May 7, 2021
46641dd
Merge branch 'use_rapids_cmake' into use_rapids_cmake
trxcllnt May 7, 2021
a4ffde4
Merge pull request #1 from trxcllnt/use_rapids_cmake
robertmaynard May 7, 2021
89c724a
Explicitly search for Doxygen instead of having it as a side-effect o…
robertmaynard May 7, 2021
3e64039
Use rapids-cmake branch-0.20
robertmaynard May 7, 2021
71f6efc
cugraph provide an alias target to match exported namespace
robertmaynard May 7, 2021
fac9485
Merge branch 'branch-0.20' into use_rapids_cmake
robertmaynard May 7, 2021
e6f7329
Update conda CMake requirements
robertmaynard May 10, 2021
74bbea3
build.sh updated to use CMAKE_CUDA_ARCHITECTURES
robertmaynard May 10, 2021
9e58947
Correct issues in compiling tests found by CI
robertmaynard May 10, 2021
dbaf6a4
Refactor cugraph test CMakeLists.txt to follow modern style
robertmaynard May 10, 2021
170d17d
Refactor cugraph test CMakeLists.txt to follow modern style
robertmaynard May 10, 2021
52fb964
cugraph won't try to compile for unsupported archs
robertmaynard May 11, 2021
af21f48
:ENH Updates to get_raft and setuputils for changes for using rapids-…
dantegd May 11, 2021
0b35e06
FIX Remove print
dantegd May 11, 2021
072511a
Merge branch 'use_rapids_cmake' into use_rapids_cmake
dantegd May 11, 2021
1158f36
Merge pull request #2 from dantegd/use_rapids_cmake
robertmaynard May 11, 2021
20533e1
Make sure find_and_configure_raft argument parsing behaves consistently
robertmaynard May 11, 2021
8c67407
Remove unused import statements from setuputils
robertmaynard May 11, 2021
f68f034
Correct copy and paste of CUML version extraction
robertmaynard May 12, 2021
fce350a
Merge branch 'rapidsai:branch-0.20' into use_rapids_cmake
trxcllnt May 12, 2021
923d28a
Style fix
robertmaynard May 12, 2021
96aa416
cugraph config module setups up the cugraph::Thrust properly
robertmaynard May 13, 2021
c72a077
Correct find_and_configure_gunrock to properly setup CUDA flags for g…
robertmaynard May 13, 2021
bdb9f2d
Make sure cugraph adds raft and rmm to the export set correctly
robertmaynard May 13, 2021
28cc833
add fatbin.ld linker script hack for debug builds (like cudf)
trxcllnt May 14, 2021
cc8c563
use -I instead of -isystem for interface include directories
trxcllnt May 14, 2021
018c6b5
compile with -fPIC
trxcllnt May 14, 2021
be449bf
don't modify global CMAKE_ cxx and cuda variables, use Xcompiler= syn…
trxcllnt May 14, 2021
39877ee
set compile options on cugraphtestutil target
trxcllnt May 14, 2021
86c6cd3
remove redundant POSITION_INDEPENDENT_CODE option
trxcllnt May 14, 2021
2728d0e
Merge pull request #3 from trxcllnt/use_rapids_cmake
trxcllnt May 14, 2021
a408b5e
Make sure we use the correct include path when installed
robertmaynard May 14, 2021
91d1ea2
Back out NO_SYSTEM_FROM_IMPORTED flag, prefer users set CMAKE_NO_SYST…
robertmaynard May 14, 2021
693074d
Update cpm of raft to point upstream as it now is CPMable
robertmaynard May 14, 2021
3987b2d
Fix copyright in ci/release/update-version.sh
robertmaynard May 17, 2021
af9652e
Update cpp/cmake/thirdparty/get_rmm.cmake
robertmaynard May 18, 2021
039afe0
Update cpp/cmake/thirdparty/get_raft.cmake
robertmaynard May 18, 2021
b4aa762
Merge branch 'branch-21.06' into use_rapids_cmake
trxcllnt May 18, 2021
bbf4463
Handle the update to CalVersion
robertmaynard May 18, 2021
fbdbc55
Update to use CalVer branch names for rapids-cmake
robertmaynard May 18, 2021
16a8f12
Update compiler flags to use formats that ccache can parse
robertmaynard May 18, 2021
e1b817c
get_raft must be called with explicit branch names for setuputils.py
robertmaynard May 19, 2021
c1f7341
ENH Make setuputils deduce version of main branch from cmakelists
dantegd May 19, 2021
dc26c67
ENH Change get_raft back to using cugraph major/minor version
dantegd May 19, 2021
a854c21
FIX Accidental double pinned_tag
dantegd May 19, 2021
df668d2
Merge pull request #4 from dantegd/use_rapids_cmake
robertmaynard May 19, 2021
4927d78
Merge branch 'branch-21.06' into use_rapids_cmake
robertmaynard May 19, 2021
267cb09
update cuhornet hash, download the entire cuhornet git tree
trxcllnt May 20, 2021
40772b2
update cuhornet hash again
trxcllnt May 21, 2021
6e74330
Merge pull request #5 from trxcllnt/use_rapids_cmake
robertmaynard May 21, 2021
eb1b8c7
Merge branch 'branch-21.06' into use_rapids_cmake
robertmaynard May 24, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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