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.

Sign up for GitHub

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

Updating a few headers that have been renamed in raft #2090

Merged
merged 8 commits into from
Mar 1, 2022
Merged

Updating a few headers that have been renamed in raft #2090

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a7b31c7
Updating headers that have been renamed in raft
cjnolet Feb 22, 2022
1fb3d7c
Reverting cmakes
cjnolet Feb 27, 2022
690d3e9
Merge branch 'branch-22.04' into imp-2204-update_cugraph_raft_header_…
cjnolet Feb 27, 2022
a83f982
Updating copyright checker / updater
cjnolet Feb 27, 2022
d618beb
Updating copyrights
cjnolet Feb 27, 2022
1ee6302
Removing existing year from gitutils
cjnolet Feb 27, 2022
fa8e02f
Updated extension in cmake file for libcugraphops.
rlratzel Feb 28, 2022
9c04655
Excluding rmm and raft from includes packaged w/ conda package
cjnolet Feb 28, 2022
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
6 changes: 6 additions & 0 deletions cpp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,12 @@
#=============================================================================

cmake_minimum_required(VERSION 3.20.1 FATAL_ERROR)
include(FetchContent)
FetchContent_Declare(
rapids-cmake
GIT_REPOSITORY https://github.com/robertmaynard/rapids-cmake.git
GIT_TAG move_to_cpm_v0.35.0
)
file(DOWNLOAD https://raw.githubusercontent.com/rapidsai/rapids-cmake/branch-22.04/RAPIDS.cmake
${CMAKE_BINARY_DIR}/RAPIDS.cmake)
include(${CMAKE_BINARY_DIR}/RAPIDS.cmake)
Expand Down
6 changes: 4 additions & 2 deletions cpp/cmake/thirdparty/get_raft.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ function(find_and_configure_raft)
set(oneValueArgs VERSION FORK PINNED_TAG)
cmake_parse_arguments(PKG "" "${oneValueArgs}" "" ${ARGN} )

set(CPM_DOWNLOAD_raft ON)

rapids_cpm_find(raft ${PKG_VERSION}
GLOBAL_TARGETS raft::raft
BUILD_EXPORT_SET cugraph-exports
Expand Down Expand Up @@ -48,6 +50,6 @@ set(CUGRAPH_BRANCH_VERSION_raft "${CUGRAPH_VERSION_MAJOR}.${CUGRAPH_VERSION_MINO
# To use a different RAFT locally, set the CMake variable
# RPM_raft_SOURCE=/path/to/local/raft
find_and_configure_raft(VERSION ${CUGRAPH_MIN_VERSION_raft}
FORK rapidsai
PINNED_TAG branch-${CUGRAPH_BRANCH_VERSION_raft}
FORK cjnolet
PINNED_TAG imp-2204-raft_header_cuh_extensions
)
Empty file modified cpp/include/cugraph/visitors/enum_mapping.hpp
100755 → 100644
View file
Open in desktop
Empty file.
Empty file modified cpp/include/cugraph/visitors/graph_enum.hpp
100755 → 100644
View file
Open in desktop
Empty file.
Empty file modified cpp/include/cugraph/visitors/graph_envelope.hpp
100755 → 100644
View file
Open in desktop
Empty file.
4 changes: 2 additions & 2 deletions cpp/src/community/legacy/spectral_clustering.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
#include <cugraph/legacy/graph.hpp>
#include <cugraph/utilities/error.hpp>

#include <raft/spectral/modularity_maximization.hpp>
#include <raft/spectral/partition.hpp>
#include <raft/spectral/modularity_maximization.cuh>
#include <raft/spectral/partition.cuh>

namespace cugraph {

Expand Down
2 changes: 1 addition & 1 deletion cpp/src/detail/utility_wrappers.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/
#include <cugraph/detail/utility_wrappers.hpp>

#include <raft/random/rng.hpp>
#include <raft/random/rng.cuh>

#include <rmm/exec_policy.hpp>
#include <thrust/sequence.h>
Expand Down
2 changes: 1 addition & 1 deletion cpp/src/linear_assignment/hungarian.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#include <cugraph/legacy/graph.hpp>
#include <cugraph/utilities/error.hpp>

#include <raft/lap/lap.hpp>
#include <raft/lap/lap.cuh>

#include <rmm/cuda_stream_view.hpp>
#include <rmm/device_uvector.hpp>
Expand Down
2 changes: 1 addition & 1 deletion cpp/src/sampling/rw_traversals.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

#include <raft/device_atomics.cuh>
#include <raft/handle.hpp>
#include <raft/random/rng.hpp>
#include <raft/random/rng.cuh>

#include <rmm/device_uvector.hpp>

Expand Down
Empty file modified cpp/src/visitors/graph_envelope.cpp
100755 → 100644
View file
Open in desktop
Empty file.
2 changes: 1 addition & 1 deletion cpp/tests/sampling/random_walks_profiling.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#include <sampling/random_walks.cuh>

#include <raft/handle.hpp>
#include <raft/random/rng.hpp>
#include <raft/random/rng.cuh>

#include <rmm/exec_policy.hpp>

Expand Down
2 changes: 1 addition & 1 deletion cpp/tests/sampling/random_walks_test.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
#include <sampling/random_walks.cuh>

#include <raft/handle.hpp>
#include <raft/random/rng.hpp>
#include <raft/random/rng.cuh>

#include "random_walks_utils.cuh"

Expand Down
2 changes: 1 addition & 1 deletion cpp/tests/sampling/rw_low_level_test.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
#include <sampling/random_walks.cuh>

#include <raft/handle.hpp>
#include <raft/random/rng.hpp>
#include <raft/random/rng.cuh>

#include "random_walks_utils.cuh"

Expand Down