Merge branch 'branch-0.10' into fea_asymmetric_graph_tests

CHANGELOG.md

@@ -15,6 +15,7 @@
 - PR #481 Run bfs on unweighted graphs when calling sssp 
 - PR #491 Use YYMMDD tag in nightly build
 - PR #487 Add woverlap test, add namespace in snmg COO2CSR
+- PR #531 Use new rmm python package
 
 ## Bug Fixes
 - PR #458 Fix potential race condition in SSSP

python/cugraph/centrality/katz_centrality_wrapper.pyx

@@ -26,7 +26,7 @@ from libc.float cimport FLT_MAX_EXP
 
 import cudf
 import cudf._lib as libcudf
-from librmm_cffi import librmm as rmm
+import rmm
 import numpy as np
 
 

python/cugraph/community/louvain_wrapper.pyx

@@ -25,7 +25,7 @@ from libc.stdlib cimport calloc, malloc, free
 
 import cudf
 import cudf._lib as libcudf
-from librmm_cffi import librmm as rmm
+import rmm
 import numpy as np
 
 

python/cugraph/community/spectral_clustering_wrapper.pyx

@@ -26,7 +26,7 @@ from libc.float cimport FLT_MAX_EXP
 
 import cudf
 import cudf._lib as libcudf
-from librmm_cffi import librmm as rmm
+import rmm
 import numpy as np
 
 

python/cugraph/community/subgraph_extraction_wrapper.pyx

@@ -26,7 +26,7 @@ from libc.float cimport FLT_MAX_EXP
 
 import cudf
 import cudf._lib as libcudf
-from librmm_cffi import librmm as rmm
+import rmm
 import numpy as np
 
 

python/cugraph/community/triangle_count_wrapper.pyx

@@ -23,7 +23,7 @@ from libc.stdint cimport uintptr_t
 
 import cudf
 import cudf._lib as libcudf
-from librmm_cffi import librmm as rmm
+import rmm
 
 
 def triangles(graph_ptr):

python/cugraph/link_analysis/pagerank_wrapper.pyx

@@ -25,7 +25,7 @@ from libc.stdlib cimport calloc, malloc, free
 
 import cudf
 import cudf._lib as libcudf
-from librmm_cffi import librmm as rmm
+import rmm
 import numpy as np
 
 

python/cugraph/link_prediction/jaccard_wrapper.pyx

@@ -26,7 +26,7 @@ from cython cimport floating
 
 import cudf
 import cudf._lib as libcudf
-from librmm_cffi import librmm as rmm
+import rmm
 import numpy as np
 
 

python/cugraph/link_prediction/overlap_wrapper.pyx

@@ -26,7 +26,7 @@ from cython cimport floating
 
 import cudf
 import cudf._lib as libcudf
-from librmm_cffi import librmm as rmm
+import rmm
 import numpy as np
 
 

python/cugraph/link_prediction/wjaccard_wrapper.pyx

@@ -25,7 +25,7 @@ from libc.stdlib cimport calloc, malloc, free
 
 import cudf
 import cudf._lib as libcudf
-from librmm_cffi import librmm as rmm
+import rmm
 import numpy as np
 from numpy.core.numeric import result_type
 

python/cugraph/link_prediction/woverlap_wrapper.pyx

@@ -25,7 +25,7 @@ from libc.stdlib cimport calloc, malloc, free
 
 import cudf
 import cudf._lib as libcudf
-from librmm_cffi import librmm as rmm
+import rmm
 import numpy as np
 from cython cimport floating
 

python/cugraph/snmg/link_analysis/mg_pagerank_wrapper.pyx

@@ -23,7 +23,7 @@ from libc.stdint cimport uintptr_t
 from libc.stdlib cimport calloc, malloc, free
 
 import cudf
-from librmm_cffi import librmm as rmm
+import rmm
 import numpy as np
 
 

python/cugraph/structure/graph_wrapper.pyx

@@ -25,7 +25,7 @@ from libc.stdlib cimport calloc, malloc, free
 
 import cudf
 import cudf._lib as libcudf
-from librmm_cffi import librmm as rmm
+import rmm
 import numpy as np
 
 

python/cugraph/tests/test_balanced_cut.py

@@ -20,8 +20,8 @@
 import cudf
 import cugraph
 from cugraph.tests import utils
-from librmm_cffi import librmm as rmm
-from librmm_cffi import librmm_config as rmm_cfg
+import rmm
+from rmm import rmm_config
 
 
 def cugraph_call(G, partitions):
@@ -58,9 +58,9 @@ def test_modularity_clustering(managed, pool, graph_file, partitions):
     gc.collect()
 
     rmm.finalize()
-    rmm_cfg.use_managed_memory = managed
-    rmm_cfg.use_pool_allocator = pool
-    rmm_cfg.initial_pool_size = 2 << 27
+    rmm_config.use_managed_memory = managed
+    rmm_config.use_pool_allocator = pool
+    rmm_config.initial_pool_size = 2 << 27
     rmm.initialize()
 
     assert(rmm.is_initialized())

python/cugraph/tests/test_bfs.py

@@ -21,8 +21,8 @@
 
 import cugraph
 from cugraph.tests import utils
-from librmm_cffi import librmm as rmm
-from librmm_cffi import librmm_config as rmm_cfg
+import rmm
+from rmm import rmm_config
 
 
 def cugraph_call(cu_M, start_vertex):
@@ -85,9 +85,9 @@ def test_bfs(managed, pool, graph_file):
     gc.collect()
 
     rmm.finalize()
-    rmm_cfg.use_managed_memory = managed
-    rmm_cfg.use_pool_allocator = pool
-    rmm_cfg.initial_pool_size = 2 << 27
+    rmm_config.use_managed_memory = managed
+    rmm_config.use_pool_allocator = pool
+    rmm_config.initial_pool_size = 2 << 27
     rmm.initialize()
 
     assert(rmm.is_initialized())

python/cugraph/tests/test_connectivity.py

@@ -19,8 +19,8 @@
 
 import cugraph
 from cugraph.tests import utils
-from librmm_cffi import librmm as rmm
-from librmm_cffi import librmm_config as rmm_cfg
+import rmm
+from rmm import rmm_config
 
 # Temporarily suppress warnings till networkX fixes deprecation warnings
 # (Using or importing the ABCs from 'collections' instead of from
@@ -159,9 +159,9 @@ def test_weak_cc(managed, pool, graph_file):
     gc.collect()
 
     rmm.finalize()
-    rmm_cfg.use_managed_memory = managed
-    rmm_cfg.use_pool_allocator = pool
-    rmm_cfg.initial_pool_size = 2 << 27
+    rmm_config.use_managed_memory = managed
+    rmm_config.use_pool_allocator = pool
+    rmm_config.initial_pool_size = 2 << 27
     rmm.initialize()
 
     assert(rmm.is_initialized())
@@ -199,9 +199,9 @@ def test_strong_cc(managed, pool, graph_file):
     gc.collect()
 
     rmm.finalize()
-    rmm_cfg.use_managed_memory = managed
-    rmm_cfg.use_pool_allocator = pool
-    rmm_cfg.initial_pool_size = 2 << 27
+    rmm_config.use_managed_memory = managed
+    rmm_config.use_pool_allocator = pool
+    rmm_config.initial_pool_size = 2 << 27
     rmm.initialize()
 
     assert(rmm.is_initialized())

python/cugraph/tests/test_filter_unreachable.py

@@ -20,8 +20,8 @@
 
 import cugraph
 from cugraph.tests import utils
-from librmm_cffi import librmm as rmm
-from librmm_cffi import librmm_config as rmm_cfg
+import rmm
+from rmm import rmm_config
 
 # Temporarily suppress warnings till networkX fixes deprecation warnings
 # (Using or importing the ABCs from 'collections' instead of from
@@ -47,9 +47,9 @@ def test_filter_unreachable(managed, pool, graph_file, source):
     gc.collect()
 
     rmm.finalize()
-    rmm_cfg.use_managed_memory = managed
-    rmm_cfg.use_pool_allocator = pool
-    rmm_cfg.initial_pool_size = 2 << 27
+    rmm_config.use_managed_memory = managed
+    rmm_config.use_pool_allocator = pool
+    rmm_config.initial_pool_size = 2 << 27
     rmm.initialize()
 
     assert(rmm.is_initialized())

python/cugraph/tests/test_graph.py

@@ -24,8 +24,8 @@
 import cudf._lib as libcudf
 import cugraph
 from cugraph.tests import utils
-from librmm_cffi import librmm as rmm
-from librmm_cffi import librmm_config as rmm_cfg
+import rmm
+from rmm import rmm_config
 '''
 import socket
 import struct
@@ -200,9 +200,9 @@ def test_add_edge_list_to_adj_list(managed, pool, graph_file):
     gc.collect()
 
     rmm.finalize()
-    rmm_cfg.use_managed_memory = managed
-    rmm_cfg.use_pool_allocator = pool
-    rmm_cfg.initial_pool_size = 2 << 27
+    rmm_config.use_managed_memory = managed
+    rmm_config.use_pool_allocator = pool
+    rmm_config.initial_pool_size = 2 << 27
     rmm.initialize()
 
     assert(rmm.is_initialized())
@@ -237,9 +237,9 @@ def test_add_adj_list_to_edge_list(managed, pool, graph_file):
     gc.collect()
 
     rmm.finalize()
-    rmm_cfg.use_managed_memory = managed
-    rmm_cfg.use_pool_allocator = pool
-    rmm_cfg.initial_pool_size = 2 << 27
+    rmm_config.use_managed_memory = managed
+    rmm_config.use_pool_allocator = pool
+    rmm_config.initial_pool_size = 2 << 27
     rmm.initialize()
 
     assert(rmm.is_initialized())
@@ -276,9 +276,9 @@ def test_transpose_from_adj_list(managed, pool, graph_file):
     gc.collect()
 
     rmm.finalize()
-    rmm_cfg.use_managed_memory = managed
-    rmm_cfg.use_pool_allocator = pool
-    rmm_cfg.initial_pool_size = 2 << 27
+    rmm_config.use_managed_memory = managed
+    rmm_config.use_pool_allocator = pool
+    rmm_config.initial_pool_size = 2 << 27
     rmm.initialize()
 
     assert(rmm.is_initialized())
@@ -304,9 +304,9 @@ def test_view_edge_list_from_adj_list(managed, pool, graph_file):
     gc.collect()
 
     rmm.finalize()
-    rmm_cfg.use_managed_memory = managed
-    rmm_cfg.use_pool_allocator = pool
-    rmm_cfg.initial_pool_size = 2 << 27
+    rmm_config.use_managed_memory = managed
+    rmm_config.use_pool_allocator = pool
+    rmm_config.initial_pool_size = 2 << 27
     rmm.initialize()
 
     assert(rmm.is_initialized())
@@ -333,9 +333,9 @@ def test_delete_edge_list_delete_adj_list(managed, pool, graph_file):
     gc.collect()
 
     rmm.finalize()
-    rmm_cfg.use_managed_memory = managed
-    rmm_cfg.use_pool_allocator = pool
-    rmm_cfg.initial_pool_size = 2 << 27
+    rmm_config.use_managed_memory = managed
+    rmm_config.use_pool_allocator = pool
+    rmm_config.initial_pool_size = 2 << 27
     rmm.initialize()
 
     assert(rmm.is_initialized())
@@ -377,9 +377,9 @@ def test_add_edge_or_adj_list_after_add_edge_or_adj_list(
     gc.collect()
 
     rmm.finalize()
-    rmm_cfg.use_managed_memory = managed
-    rmm_cfg.use_pool_allocator = pool
-    rmm_cfg.initial_pool_size = 2 << 27
+    rmm_config.use_managed_memory = managed
+    rmm_config.use_pool_allocator = pool
+    rmm_config.initial_pool_size = 2 << 27
     rmm.initialize()
 
     assert(rmm.is_initialized())
@@ -432,9 +432,9 @@ def test_networkx_compatibility(managed, pool, graph_file):
     gc.collect()
 
     rmm.finalize()
-    rmm_cfg.use_managed_memory = managed
-    rmm_cfg.use_pool_allocator = pool
-    rmm_cfg.initial_pool_size = 2 << 27
+    rmm_config.use_managed_memory = managed
+    rmm_config.use_pool_allocator = pool
+    rmm_config.initial_pool_size = 2 << 27
     rmm.initialize()
 
     assert(rmm.is_initialized())
@@ -491,9 +491,9 @@ def test_two_hop_neighbors(managed, pool, graph_file):
     gc.collect()
 
     rmm.finalize()
-    rmm_cfg.use_managed_memory = managed
-    rmm_cfg.use_pool_allocator = pool
-    rmm_cfg.initial_pool_size = 2 << 27
+    rmm_config.use_managed_memory = managed
+    rmm_config.use_pool_allocator = pool
+    rmm_config.initial_pool_size = 2 << 27
     rmm.initialize()
 
     assert(rmm.is_initialized())
@@ -520,9 +520,9 @@ def test_degree_functionality(managed, pool, graph_file):
     gc.collect()
 
     rmm.finalize()
-    rmm_cfg.use_managed_memory = managed
-    rmm_cfg.use_pool_allocator = pool
-    rmm_cfg.initial_pool_size = 2 << 27
+    rmm_config.use_managed_memory = managed
+    rmm_config.use_pool_allocator = pool
+    rmm_config.initial_pool_size = 2 << 27
     rmm.initialize()
 
     assert(rmm.is_initialized())
@@ -569,9 +569,9 @@ def test_degrees_functionality(managed, pool, graph_file):
     gc.collect()
 
     rmm.finalize()
-    rmm_cfg.use_managed_memory = managed
-    rmm_cfg.use_pool_allocator = pool
-    rmm_cfg.initial_pool_size = 2 << 27
+    rmm_config.use_managed_memory = managed
+    rmm_config.use_pool_allocator = pool
+    rmm_config.initial_pool_size = 2 << 27
     rmm.initialize()
 
     assert(rmm.is_initialized())
@@ -669,9 +669,9 @@ def test_renumber_files(managed, pool, graph_file):
     gc.collect()
 
     rmm.finalize()
-    rmm_cfg.use_managed_memory = managed
-    rmm_cfg.use_pool_allocator = pool
-    rmm_cfg.initial_pool_size = 2 << 27
+    rmm_config.use_managed_memory = managed
+    rmm_config.use_pool_allocator = pool
+    rmm_config.initial_pool_size = 2 << 27
     rmm.initialize()
 
     assert(rmm.is_initialized())
@@ -700,9 +700,9 @@ def test_number_of_vertices(managed, pool, graph_file):
     gc.collect()
 
     rmm.finalize()
-    rmm_cfg.use_managed_memory = managed
-    rmm_cfg.use_pool_allocator = pool
-    rmm_cfg.initial_pool_size = 2 << 27
+    rmm_config.use_managed_memory = managed
+    rmm_config.use_pool_allocator = pool
+    rmm_config.initial_pool_size = 2 << 27
     rmm.initialize()
 
     assert(rmm.is_initialized())