Merge branch 'fea_c_api_mg_implementation' of https://github.com/chuc…

…khastings/cugraph into fea_c_api_mg_implementation
rapidsai · Mar 16, 2022 · 25967b7 · 25967b7
2 parents 87b1279 + b605603
commit 25967b7
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 11 deletions.
diff --git a/cpp/include/cugraph_c/array.h b/cpp/include/cugraph_c/array.h
@@ -23,19 +23,19 @@ extern "C" {
 #endif
 
 typedef struct {
-  int align_;
+  int32_t align_;
 } cugraph_type_erased_device_array_t;
 
 typedef struct {
-  int align_;
+  int32_t align_;
 } cugraph_type_erased_device_array_view_t;
 
 typedef struct {
-  int align_;
+  int32_t align_;
 } cugraph_type_erased_host_array_t;
 
 typedef struct {
-  int align_;
+  int32_t align_;
 } cugraph_type_erased_host_array_view_t;
 
 /**

diff --git a/cpp/include/cugraph_c/error.h b/cpp/include/cugraph_c/error.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, NVIDIA CORPORATION.
+ * Copyright (c) 2021-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.
@@ -16,6 +16,8 @@
 
 #pragma once
 
+#include <stdint.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -31,7 +33,7 @@ typedef enum cugraph_error_code_ {
 } cugraph_error_code_t;
 
 typedef struct cugraph_error_ {
-  int align_;
+  int32_t align_;
 } cugraph_error_t;
 
 /**

diff --git a/cpp/include/cugraph_c/graph.h b/cpp/include/cugraph_c/graph.h
@@ -24,14 +24,15 @@ extern "C" {
 #endif
 
 typedef struct {
-  int align_;
+  int32_t align_;
 } cugraph_graph_t;
 
 typedef struct {
   bool_t is_symmetric;
   bool_t is_multigraph;
 } cugraph_graph_properties_t;
 
+// FIXME: Add support for specifying isloated vertices
 /**
  * @brief     Construct an SG graph
  *
@@ -73,6 +74,7 @@ cugraph_error_code_t cugraph_sg_graph_create(const cugraph_resource_handle_t* ha
 //         but didn't want to confuse with original cugraph_free_graph
 void cugraph_sg_graph_free(cugraph_graph_t* graph);
 
+// FIXME: Add support for specifying isloated vertices
 /**
  * @brief     Construct an MG graph
  *

diff --git a/cpp/include/cugraph_c/resource_handle.h b/cpp/include/cugraph_c/resource_handle.h
@@ -32,12 +32,15 @@ typedef int8_t byte_t;
 typedef enum data_type_id_ { INT32 = 0, INT64, FLOAT32, FLOAT64, NTYPES } data_type_id_t;
 
 /* sizes in Bytes for data_type_id_t*/
-extern int data_type_sz[];
+extern size_t data_type_sz[];
 
 typedef struct cugraph_resource_handle_ {
-  int align_;
+  int32_t align_;
 } cugraph_resource_handle_t;
 
+// FIXME: Don't really want a raft handle here.  We really want to be able to
+//        configure the resource handle ourselves.  But that requires a bunch
+//        of logic that's currently only available in python.
 /**
  * @brief     Construct a resource handle
  *

diff --git a/cpp/src/c_api/cugraph_api.cpp b/cpp/src/c_api/cugraph_api.cpp
@@ -78,7 +78,7 @@ cugraph_error_code_t extract_rw_result(cugraph_rw_ret_t* p_rw_ret, cugraph_devic
 }  // namespace helpers
 
 extern "C" {
-int data_type_sz[] = {4, 8, 4, 8};
+size_t data_type_sz[] = {4, 8, 4, 8};
 }
 
 bool_t runtime_assert(bool_t statement_truth_value, const char* error_msg)

diff --git a/cpp/tests/CMakeLists.txt b/cpp/tests/CMakeLists.txt
@@ -645,9 +645,12 @@ target_link_libraries(cugraph_c_testutil
 )
 
 
+# FIXME: Disabling these tests, they test an older version of the API which
+#        will be deleted in this release.  Leaving them here to help me remember :-)
 #ConfigureCTest(CAPI_CREATE_SG_GRAPH_ENVELOPE_TEST c_api/create_sg_graph_envelope_test.c)
-ConfigureCTest(CAPI_CREATE_GRAPH_TEST c_api/create_graph_test.c)
 #ConfigureCTest(CAPI_RANDOM_WALKS_TEST c_api/random_walks_test.c)
+
+ConfigureCTest(CAPI_CREATE_GRAPH_TEST c_api/create_graph_test.c)
 ConfigureCTest(CAPI_PAGERANK_TEST c_api/pagerank_test.c)
 ConfigureCTest(CAPI_BFS_TEST c_api/bfs_test.c)
 ConfigureCTest(CAPI_SSSP_TEST c_api/sssp_test.c)