graph_mask_t and separating raft includes for host_span and `devi…

…ce_span` (#2679) This depends on rapidsai/raft#810. Closes #2322 Authors: - Corey J. Nolet (https://github.com/cjnolet) Approvers: - Seunghwa Kang (https://github.com/seunghwak) - Chuck Hastings (https://github.com/ChuckHastings) - Rick Ratzel (https://github.com/rlratzel) - Ray Douglass (https://github.com/raydouglass) - Mark Sadang (https://github.com/msadang) URL: #2679
rapidsai · Sep 22, 2022 · dea38cc · dea38cc
1 parent a291cfe
commit dea38cc
Show file tree

Hide file tree

Showing 35 changed files with 502 additions and 41 deletions.
diff --git a/conda/environments/cugraph_dev_cuda11.2.yml b/conda/environments/cugraph_dev_cuda11.2.yml
@@ -14,7 +14,8 @@ dependencies:
 - rmm=22.10.*
 - librmm=22.10.*
 - libraft-headers=22.10.*
-- pyraft=22.10.*
+- raft-dask=22.10.*
+- pylibraft=22.10.*
 - cuda-python>=11.5,<11.7.1
 - dask>=2022.7.1
 - distributed>=2022.7.1

diff --git a/conda/environments/cugraph_dev_cuda11.4.yml b/conda/environments/cugraph_dev_cuda11.4.yml
@@ -14,7 +14,8 @@ dependencies:
 - rmm=22.10.*
 - librmm=22.10.*
 - libraft-headers=22.10.*
-- pyraft=22.10.*
+- raft-dask=22.10.*
+- pylibraft=22.10.*
 - cuda-python>=11.5,<11.7.1
 - dask>=2022.7.1
 - distributed>=2022.7.1

diff --git a/conda/environments/cugraph_dev_cuda11.5.yml b/conda/environments/cugraph_dev_cuda11.5.yml
@@ -14,7 +14,8 @@ dependencies:
 - rmm=22.10.*
 - librmm=22.10.*
 - libraft-headers=22.10.*
-- pyraft=22.10.*
+- raft-dask=22.10.*
+- pylibraft=22.10.*
 - cuda-python>=11.5,<11.7.1
 - dask>=2022.7.1
 - distributed>=2022.7.1

diff --git a/conda/recipes/cugraph/meta.yaml b/conda/recipes/cugraph/meta.yaml
@@ -36,7 +36,8 @@ requirements:
     - scikit-build>=0.13.1
     - libcugraph={{ version }}
     - libraft-headers {{ minor_version }}
-    - pyraft {{ minor_version }}
+    - raft-dask {{ minor_version }}
+    - pylibraft {{ minor_version}}
     - cudf={{ minor_version }}
     - ucx-py {{ ucx_py_version }}
     - ucx-proc=*=gpu
@@ -49,7 +50,8 @@ requirements:
     - pylibcugraph={{ version }}
     - libcugraph={{ version }}
     - libraft-headers {{ minor_version }}
-    - pyraft {{ minor_version }}
+    - raft-dask {{ minor_version }}
+    - pylibraft {{ minor_version }}
     - cudf={{ minor_version }}
     - dask-cudf {{ minor_version }}
     - dask-cuda {{ minor_version }}

diff --git a/conda/recipes/libcugraph/meta.yaml b/conda/recipes/libcugraph/meta.yaml
@@ -38,8 +38,9 @@ requirements:
   host:
     - doxygen {{ doxygen_version }}
     - cudatoolkit {{ cuda_version }}.*
-    - libraft-headers {{ minor_version }}.*
     - libcugraphops {{ minor_version }}.*
+    - libraft-headers {{ minor_version }}
+    - libraft-distance {{ minor_version }}
     - librmm {{ minor_version }}.*
     - libcudf {{ minor_version }}.*
     - boost-cpp {{ boost_cpp_version }}
@@ -62,7 +63,6 @@ outputs:
         - cmake {{ cmake_version }}
       run:
         - cudatoolkit {{ cuda_spec }}
-        - libraft-headers {{ minor_version }}
         - librmm {{ minor_version }}
         - nccl {{ nccl_version }}
         - ucx-proc=*=gpu
@@ -88,7 +88,6 @@ outputs:
         - {{ pin_subpackage('libcugraph', exact=True) }}
         - cudatoolkit {{ cuda_spec }}
         - libcudf {{ minor_version }}
-        - libraft-headers {{ minor_version }}
         - librmm {{ minor_version }}
     about:
       home: http://rapids.ai/

diff --git a/conda/recipes/pylibcugraph/meta.yaml b/conda/recipes/pylibcugraph/meta.yaml
@@ -35,14 +35,13 @@ requirements:
     - cython>=0.29,<0.30
     - scikit-build>=0.13.1
     - libcugraph={{ version }}
+    - libraft-headers={{ minor_version }}
     - ucx-py {{ ucx_py_version }}
     - ucx-proc=*=gpu
     - cudatoolkit {{ cuda_version }}.*
     - rmm {{ minor_version }}.*
-    - libraft-headers {{ minor_version }}
   run:
     - python x.x
-    - libraft-headers {{ minor_version }}
     - libcugraph={{ version }}
     - {{ pin_compatible('cudatoolkit', max_pin='x', min_pin='x') }}
 

diff --git a/cpp/include/cugraph/algorithms.hpp b/cpp/include/cugraph/algorithms.hpp
@@ -28,9 +28,9 @@
 #include <cugraph-ops/graph/sampling.hpp>
 #endif
 
+#include <raft/core/device_span.hpp>
 #include <raft/handle.hpp>
 #include <raft/random/rng_state.hpp>
-#include <raft/span.hpp>
 
 /** @ingroup cpp_api
  *  @{

diff --git a/cpp/include/cugraph/edge_partition_device_view.cuh b/cpp/include/cugraph/edge_partition_device_view.cuh
@@ -18,7 +18,7 @@
 #include <cugraph/edge_partition_view.hpp>
 #include <cugraph/utilities/error.hpp>
 
-#include <raft/span.hpp>
+#include <raft/core/device_span.hpp>
 #include <rmm/cuda_stream_view.hpp>
 #include <rmm/device_uvector.hpp>
 #include <rmm/exec_policy.hpp>

diff --git a/cpp/include/cugraph/edge_partition_edge_property_device_view.cuh b/cpp/include/cugraph/edge_partition_edge_property_device_view.cuh
@@ -19,7 +19,7 @@
 #include <cugraph/edge_src_dst_property.hpp>
 #include <cugraph/utilities/device_functors.cuh>
 
-#include <raft/span.hpp>
+#include <raft/core/device_span.hpp>
 
 #include <thrust/binary_search.h>
 #include <thrust/distance.h>

diff --git a/cpp/include/cugraph/edge_partition_endpoint_property_device_view.cuh b/cpp/include/cugraph/edge_partition_endpoint_property_device_view.cuh
@@ -19,7 +19,7 @@
 #include <cugraph/edge_src_dst_property.hpp>
 #include <cugraph/utilities/device_functors.cuh>
 
-#include <raft/span.hpp>
+#include <raft/core/device_span.hpp>
 
 #include <thrust/binary_search.h>
 #include <thrust/distance.h>

diff --git a/cpp/include/cugraph/edge_partition_view.hpp b/cpp/include/cugraph/edge_partition_view.hpp
@@ -15,7 +15,7 @@
  */
 #pragma once
 
-#include <raft/span.hpp>
+#include <raft/core/device_span.hpp>
 
 #include <optional>
 #include <type_traits>

diff --git a/cpp/include/cugraph/edge_src_dst_property.hpp b/cpp/include/cugraph/edge_src_dst_property.hpp
@@ -19,8 +19,9 @@
 #include <cugraph/utilities/dataframe_buffer.hpp>
 #include <cugraph/utilities/thrust_tuple_utils.hpp>
 
-#include <raft/handle.hpp>
-#include <raft/span.hpp>
+#include <raft/core/device_span.hpp>
+#include <raft/core/handle.hpp>
+#include <raft/core/host_span.hpp>
 
 #include <thrust/iterator/iterator_traits.h>
 #include <thrust/iterator/zip_iterator.h>

diff --git a/cpp/include/cugraph/graph.hpp b/cpp/include/cugraph/graph.hpp
@@ -18,8 +18,8 @@
 #include <cugraph/graph_view.hpp>
 #include <cugraph/utilities/error.hpp>
 
+#include <raft/core/device_span.hpp>
 #include <raft/handle.hpp>
-#include <raft/span.hpp>
 #include <rmm/device_uvector.hpp>
 
 #include <cstddef>

diff --git a/cpp/include/cugraph/graph_functions.hpp b/cpp/include/cugraph/graph_functions.hpp
@@ -19,8 +19,8 @@
 #include <cugraph/graph.hpp>
 #include <cugraph/graph_view.hpp>
 
+#include <raft/core/device_span.hpp>
 #include <raft/handle.hpp>
-#include <raft/span.hpp>
 #include <rmm/device_uvector.hpp>
 
 #include <memory>