Skip to content

Commit

Permalink
add libcugraphops as a dependency of cugraph (#2019)
Browse files Browse the repository at this point in the history
We need to do several things:
- Add libcugraphops to conda (both in the cugraph recipe as well as build environment)
- Add libcugraphops to cmake (I added a new thirdparty include here)
- Ensure that the right headers and objects are added in cmake

<s>For now, this is a work in progress since libcugraphops doesn't seem available on anaconda yet.</s>

Authors:
  - Matt Joux (https://github.com/MatthiasKohl)
  - Rick Ratzel (https://github.com/rlratzel)

Approvers:
  - Brad Rees (https://github.com/BradReesWork)
  - Robert Maynard (https://github.com/robertmaynard)
  - Rick Ratzel (https://github.com/rlratzel)
  - Jordan Jacobelli (https://github.com/Ethyling)

URL: #2019
  • Loading branch information
MatthiasKohl authored Feb 12, 2022
1 parent 3187fbf commit 18ac2c2
Show file tree
Hide file tree
Showing 9 changed files with 41 additions and 1 deletion.
2 changes: 1 addition & 1 deletion ci/benchmark/build.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/usr/bin/env bash
# Copyright (c) 2018-2021, NVIDIA CORPORATION.
# Copyright (c) 2018-2022, NVIDIA CORPORATION.
##########################################
# cuGraph Benchmark test script for CI #
##########################################
Expand Down
1 change: 1 addition & 0 deletions conda/environments/cugraph_dev_cuda11.0.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ channels:
- conda-forge
dependencies:
- cudatoolkit=11.0
- libcugraphops=22.04.*
- cudf=22.04.*
- libcudf=22.04.*
- rmm=22.04.*
Expand Down
1 change: 1 addition & 0 deletions conda/environments/cugraph_dev_cuda11.2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ channels:
- conda-forge
dependencies:
- cudatoolkit=11.2
- libcugraphops=22.04.*
- cudf=22.04.*
- libcudf=22.04.*
- rmm=22.04.*
Expand Down
1 change: 1 addition & 0 deletions conda/environments/cugraph_dev_cuda11.4.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ channels:
- conda-forge
dependencies:
- cudatoolkit=11.4
- libcugraphops=22.04.*
- cudf=22.04.*
- libcudf=22.04.*
- rmm=22.04.*
Expand Down
1 change: 1 addition & 0 deletions conda/environments/cugraph_dev_cuda11.5.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ channels:
- conda-forge
dependencies:
- cudatoolkit=11.5
- libcugraphops=22.04.*
- cudf=22.04.*
- libcudf=22.04.*
- rmm=22.04.*
Expand Down
1 change: 1 addition & 0 deletions conda/recipes/libcugraph/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ requirements:
- cmake>=3.20.1
- doxygen>=1.8.11
- cudatoolkit {{ cuda_version }}.*
- libcugraphops {{ minor_version }}.*
- librmm {{ minor_version }}.*
- cudf {{ minor_version }}.*
- boost-cpp>=1.66
Expand Down
1 change: 1 addition & 0 deletions conda/recipes/libcugraph_etl/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ requirements:
- cmake>=3.20.1
- doxygen>=1.8.11
- cudatoolkit {{ cuda_version }}.*
- libcugraphops {{ minor_version }}.* # needed for cmake to find transitive deps
- libcudf {{ minor_version }}.*
- libcugraph {{ minor_version }}.*
run:
Expand Down
1 change: 1 addition & 0 deletions cpp/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,7 @@ rapids_cpm_init()
# lags behind.
###
include(cmake/thirdparty/get_raft.cmake)
include(cmake/thirdparty/get_libcugraphops.cmake)

include(cmake/thirdparty/get_nccl.cmake)
include(cmake/thirdparty/get_cuhornet.cmake)
Expand Down
33 changes: 33 additions & 0 deletions cpp/cmake/thirdparty/get_libcugraphops.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
#=============================================================================
# Copyright (c) 2022, 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
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#=============================================================================

function(find_and_configure_cugraphops)

if(TARGET cugraphops::cugraphops)
return()
endif()

rapids_find_generate_module(cugraphops
HEADER_NAMES graph/sampling.h
LIBRARY_NAMES cugraph-ops++
INCLUDE_SUFFIXES cugraph-ops
)

rapids_find_package(cugraphops REQUIRED)

endfunction()

find_and_configure_cugraphops()

0 comments on commit 18ac2c2

Please sign in to comment.