Skip to content

Commit

Permalink
Merge pull request #232 from seunghwak/bug_ext_create_column
Browse files Browse the repository at this point in the history
[REVIEW] Bug ext create column
  • Loading branch information
afender authored Apr 22, 2019
2 parents 09345aa + 65a6310 commit e008ba3
Show file tree
Hide file tree
Showing 14 changed files with 412 additions and 408 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
- PR #218 Update c_graph.pyx
- PR #224 Update erroneous comments in overlap_wrapper.pyx, woverlap_wrapper.pyx, test_louvain.py, and spectral_clustering.pyx
- PR #220 Fixed bugs in Nvgraph triangle counting
- PR #232 Fixed memory leaks in managing cudf columns.

# cuGraph 0.6.0 (22 Mar 2019)

Expand Down
46 changes: 23 additions & 23 deletions cpp/include/algorithms.h
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,11 @@
*/
/* ----------------------------------------------------------------------------*/
gdf_error gdf_pagerank(gdf_graph *graph,
gdf_column *pagerank,
float alpha,
float tolerance,
int max_iter,
bool has_guess);
gdf_column *pagerank,
float alpha,
float tolerance,
int max_iter,
bool has_guess);

/**
* @Synopsis Creates source, destination and value columns based on the specified R-MAT model
Expand Down Expand Up @@ -78,11 +78,11 @@ gdf_error gdf_pagerank(gdf_graph *graph,
*/
/* ----------------------------------------------------------------------------*/
gdf_error gdf_grmat_gen(const char* argv,
size_t &vertices,
size_t &edges,
gdf_column* src,
gdf_column* dest,
gdf_column* val);
size_t &vertices,
size_t &edges,
gdf_column* src,
gdf_column* dest,
gdf_column* val);

/**
* @Synopsis Performs a breadth first search traversal of a graph starting from a node.
Expand All @@ -101,10 +101,10 @@ gdf_error gdf_grmat_gen(const char* argv,
*/
/* ----------------------------------------------------------------------------*/
gdf_error gdf_bfs(gdf_graph *graph,
gdf_column *distances,
gdf_column *predecessors,
int start_node,
bool directed);
gdf_column *distances,
gdf_column *predecessors,
int start_node,
bool directed);

/**
* Computes the Jaccard similarity coefficient for every pair of vertices in the graph
Expand All @@ -116,8 +116,8 @@ gdf_error gdf_bfs(gdf_graph *graph,
* @return Error code
*/
gdf_error gdf_jaccard(gdf_graph *graph,
gdf_column *weights,
gdf_column *result);
gdf_column *weights,
gdf_column *result);

/**
* Computes the Jaccard similarity coefficient for each pair of specified vertices.
Expand All @@ -131,10 +131,10 @@ gdf_error gdf_jaccard(gdf_graph *graph,
* @return Error code
*/
gdf_error gdf_jaccard_list(gdf_graph *graph,
gdf_column *weights,
gdf_column *first,
gdf_column *second,
gdf_column *result);
gdf_column *weights,
gdf_column *first,
gdf_column *second,
gdf_column *result);

/**
* Computes the Overlap Coefficient for every pair of vertices in the graph which are
Expand Down Expand Up @@ -167,6 +167,6 @@ gdf_error gdf_overlap_list(gdf_graph *graph,
gdf_column *result);

gdf_error gdf_louvain(gdf_graph *graph,
void *final_modularity,
void *num_level,
gdf_column *louvain_parts);
void *final_modularity,
void *num_level,
gdf_column *louvain_parts);
Loading

0 comments on commit e008ba3

Please sign in to comment.