Fix experimental labels (rapidsai#2331)

Resolves rapidsai#2315 Resolves rapidsai#2303 Authors: - Alex Barghi (https://github.com/alexbarghi-nv) Approvers: - Joseph Nke (https://github.com/jnke2016) - Rick Ratzel (https://github.com/rlratzel) URL: rapidsai#2331
oorliu · Jun 17, 2022 · 78b394c · 78b394c
1 parent ee897c4
commit 78b394c
Show file tree

Hide file tree

Showing 11 changed files with 27 additions and 59 deletions.
diff --git a/python/cugraph/cugraph/__init__.py b/python/cugraph/cugraph/__init__.py
@@ -101,8 +101,8 @@
 
 from cugraph.utilities import utils
 
-from cugraph.proto.components import strong_connected_component
-from cugraph.proto.structure import find_bicliques
+from cugraph.experimental import strong_connected_component
+from cugraph.experimental import find_bicliques
 
 from cugraph.linear_assignment import hungarian, dense_hungarian
 from cugraph.layout import force_atlas2

diff --git a/python/cugraph/cugraph/dask/traversal/bfs.py b/python/cugraph/cugraph/dask/traversal/bfs.py
@@ -13,11 +13,11 @@
 # limitations under the License.
 #
 
-from pylibcugraph.experimental import (MGGraph,
-                                       ResourceHandle,
-                                       GraphProperties,
-                                       )
-from pylibcugraph import bfs as pylibcugraph_bfs
+from pylibcugraph import (MGGraph,
+                          ResourceHandle,
+                          GraphProperties,
+                          bfs as pylibcugraph_bfs
+                          )
 
 from dask.distributed import wait, default_client
 from cugraph.dask.common.input_utils import get_distributed_data

diff --git a/python/cugraph/cugraph/experimental/__init__.py b/python/cugraph/cugraph/experimental/__init__.py
@@ -12,6 +12,7 @@
 # limitations under the License.
 
 from cugraph.utilities.api_tools import experimental_warning_wrapper
+from cugraph.utilities.api_tools import deprecated_warning_wrapper
 
 from cugraph.structure.property_graph import EXPERIMENTAL__PropertyGraph
 PropertyGraph = experimental_warning_wrapper(EXPERIMENTAL__PropertyGraph)
@@ -27,4 +28,14 @@
 
 from cugraph.experimental.community.triangle_count import \
     EXPERIMENTAL__triangle_count
-triangle_count = experimental_warning_wrapper(EXPERIMENTAL__triangle_count)
+triangle_count = experimental_warning_wrapper(EXPERIMENTAL__triangle_count)
+
+from cugraph.experimental.components.scc import \
+    EXPERIMENTAL__strong_connected_component
+strong_connected_component = \
+    experimental_warning_wrapper(EXPERIMENTAL__strong_connected_component)
+
+from cugraph.experimental.structure.bicliques import EXPERIMENTAL__find_bicliques
+find_bicliques = deprecated_warning_wrapper(
+    experimental_warning_wrapper(EXPERIMENTAL__find_bicliques)
+)
diff --git a/python/cugraph/cugraph/experimental/components/__init__.py b/python/cugraph/cugraph/experimental/components/__init__.py
diff --git a/...n/cugraph/cugraph/proto/components/scc.py → ...ph/cugraph/experimental/components/scc.py b/...n/cugraph/cugraph/proto/components/scc.py → ...ph/cugraph/experimental/components/scc.py
@@ -27,7 +27,7 @@
 #   - repeat
 
 
-def strong_connected_component(source, destination):
+def EXPERIMENTAL__strong_connected_component(source, destination):
     """
     Generate the strongly connected components
     using the FW-BW-TRIM approach, but skipping the trimming)

diff --git a/python/cugraph/cugraph/experimental/structure/__init__.py b/python/cugraph/cugraph/experimental/structure/__init__.py
diff --git a/...raph/cugraph/proto/structure/bicliques.py → ...graph/experimental/structure/bicliques.py b/...raph/cugraph/proto/structure/bicliques.py → ...graph/experimental/structure/bicliques.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2019-2021, NVIDIA CORPORATION.
+# Copyright (c) 2019-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.
 # You may obtain a copy of the License at
@@ -17,7 +17,7 @@
 from collections import OrderedDict
 
 
-def find_bicliques(
+def EXPERIMENTAL__find_bicliques(
         df, k,
         offset=0,
         max_iter=-1,

diff --git a/python/cugraph/cugraph/proto/__init__.py b/python/cugraph/cugraph/proto/__init__.py
diff --git a/python/cugraph/cugraph/proto/components/__init__.py b/python/cugraph/cugraph/proto/components/__init__.py
diff --git a/python/cugraph/cugraph/proto/structure/__init__.py b/python/cugraph/cugraph/proto/structure/__init__.py
diff --git a/python/cugraph/cugraph/traversal/bfs.py b/python/cugraph/cugraph/traversal/bfs.py
@@ -14,11 +14,11 @@
 import cudf
 import dask_cudf
 
-from pylibcugraph.experimental import (ResourceHandle,
-                                       GraphProperties,
-                                       SGGraph,
-                                       )
-from pylibcugraph import bfs as pylibcugraph_bfs
+from pylibcugraph import (ResourceHandle,
+                          GraphProperties,
+                          SGGraph,
+                          bfs as pylibcugraph_bfs
+                          )
 
 from cugraph.structure.graph_classes import Graph, DiGraph
 from cugraph.utilities import (ensure_cugraph_obj,