diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 66db7254ebb0..e098dd66d7aa 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -35,7 +35,7 @@ jobs: --shm-size 4096m strategy: matrix: - experimental: [ON, OFF] + networkx: [ON, OFF] steps: - name: Install Dependencies @@ -105,7 +105,7 @@ jobs: cd build cmake .. -DCMAKE_PREFIX_PATH=/opt/graphscope \ -DCMAKE_INSTALL_PREFIX=/opt/graphscope \ - -DEXPERIMENTAL_ON=${{ matrix.experimental }} + -DNETWORKX=${{ matrix.networkx }} make -j`nproc` make install cd ${GITHUB_WORKSPACE} @@ -123,7 +123,7 @@ jobs: ../test/app_tests.sh --test_dir ${GITHUB_WORKSPACE}/gstest - name: Upload Artifact - if: matrix.experimental == 'ON' + if: matrix.networkx == 'ON' uses: actions/upload-artifact@v2 with: name: gae-${{ github.sha }} @@ -276,7 +276,7 @@ jobs: --shm-size 4096m strategy: matrix: - experimental: [ON, OFF] + networkx: [ON, OFF] steps: - name: Install Dependencies run: | @@ -310,7 +310,7 @@ jobs: uses: mxschmitt/action-tmate@v2 - name: App Test with Expr Off - if: matrix.experimental == 'OFF' + if: matrix.networkx == 'OFF' run: | # prelaunch the etcd /usr/local/bin/etcd --data-dir=/dev/shm/default.etcd & @@ -323,23 +323,23 @@ jobs: pkill -TERM etcd || true - name: Upload Coverage - if: matrix.experimental == 'OFF' + if: matrix.networkx == 'OFF' uses: codecov/codecov-action@v1 with: file: ./python/coverage.xml fail_ci_if_error: true - name: App Test with Expr On - if: matrix.experimental == 'ON' + if: matrix.networkx == 'ON' run: | # prelaunch the etcd /usr/local/bin/etcd --data-dir=/dev/shm/default.etcd & export GS_TEST_DIR='/root/gstest' - python3 -m pytest --exitfirst -s -v python/graphscope/experimental/nx/tests/classes - python3 -m pytest --exitfirst -s -v python/graphscope/experimental/nx/tests/test_nx.py - python3 -m pytest --exitfirst -s -v python/graphscope/experimental/nx/tests/algorithms/builtin \ - python/graphscope/experimental/nx/tests/test_utils.py + python3 -m pytest --exitfirst -s -v python/graphscope/nx/tests/classes + python3 -m pytest --exitfirst -s -v python/graphscope/nx/tests/test_nx.py + python3 -m pytest --exitfirst -s -v python/graphscope/nx/tests/algorithms/builtin \ + python/graphscope/nx/tests/test_utils.py pkill -TERM etcd || true diff --git a/Makefile b/Makefile index ee704cf415dd..c4727f2af624 100644 --- a/Makefile +++ b/Makefile @@ -1,14 +1,14 @@ MKFILE_PATH := $(abspath $(lastword $(MAKEFILE_LIST))) WORKING_DIR := $(dir $(MKFILE_PATH)) -VERSION ?= 0.1.0 -INSTALL_PREFIX ?= /usr/local +VERSION ?= 0.1.0 +INSTALL_PREFIX ?= /usr/local # GAE build options -EXPERIMENTAL_ON ?= OFF +NETWORKX ?= OFF # client build options -WITH_LEARNING_ENGINE ?= OFF +WITH_LEARNING_ENGINE ?= OFF .PHONY: all all: graphscope @@ -52,7 +52,7 @@ coordinator: client gae: mkdir -p $(WORKING_DIR)/analytical_engine/build cd $(WORKING_DIR)/analytical_engine/build && \ - cmake -DCMAKE_INSTALL_PREFIX=$(INSTALL_PREFIX) -DEXPERIMENTAL_ON=$(EXPERIMENTAL_ON) .. && \ + cmake -DCMAKE_INSTALL_PREFIX=$(INSTALL_PREFIX) -DNETWORKX=$(NETWORKX) .. && \ make -j`nproc` && \ sudo make install diff --git a/analytical_engine/CMakeLists.txt b/analytical_engine/CMakeLists.txt index 31bf9e67dd7a..b7eb9459c3e0 100644 --- a/analytical_engine/CMakeLists.txt +++ b/analytical_engine/CMakeLists.txt @@ -17,10 +17,12 @@ if (POLICY CMP0048) endif () project(analytical_engine LANGUAGES C CXX VERSION ${GRAPHSCOPE_ANALYTICAL_VERSION}) -option(EXPERIMENTAL_ON "experimental on?" OFF) +option(NETWORKX "networkx on?" ON) option(BUILD_TESTS "Build unit test" ON) -if (EXPERIMENTAL_ON) +if (NETWORKX) + add_definitions(-DNETWORKX) + # TODO: need by vineyard, remove when vineyard version update. add_definitions(-DEXPERIMENTAL_ON) endif () @@ -119,7 +121,7 @@ include_directories(${Protobuf_INCLUDE_DIRS}) include("cmake/FindGRPC.cmake") include_directories(${GRPC_INCLUDE_DIR}) -if (EXPERIMENTAL_ON) +if (NETWORKX) include("cmake/FindFolly.cmake") include("cmake/FindDoubleConversion.cmake") if (FOLLY_FOUND) @@ -163,7 +165,7 @@ if (${LIBUNWIND_FOUND}) target_link_libraries(grape_engine PRIVATE ${LIBUNWIND_LIBRARIES}) endif () -if (EXPERIMENTAL_ON) +if (NETWORKX) target_include_directories(grape_engine PUBLIC ${FOLLY_ROOT_DIR}/include) target_link_libraries(grape_engine PRIVATE ${FOLLY_LIBRARIES} ${DOUBLE_CONVERSION_LIBRARY}) endif () @@ -173,7 +175,7 @@ if (BUILD_TESTS) add_executable(run_app test/run_app.cc) target_include_directories(run_app PRIVATE ${LIBGRAPELITE_INCLUDE_DIRS}/grape/analytical_apps utils apps) target_link_libraries(run_app ${LIBGRAPELITE_LIBRARIES} ${GFLAGS_LIBRARIES} ${CMAKE_DL_LIBS} ${Boost_LIBRARIES} ${VINEYARD_LIBRARIES}) - if (EXPERIMENTAL_ON) + if (NETWORKX) target_include_directories(run_app PUBLIC ${FOLLY_ROOT_DIR}/include) target_link_libraries(run_app ${FOLLY_LIBRARIES} ${DOUBLE_CONVERSION_LIBRARY}) endif () @@ -226,7 +228,7 @@ if (BUILD_TESTS) add_vineyard_app(projected_graph_benchmarks SRCS benchmarks/projected_graph_benchmarks.cc) - if (EXPERIMENTAL_ON) + if (NETWORKX) add_vineyard_app(test_convert SRCS test/test_convert.cc) target_include_directories(test_convert PRIVATE ${FOLLY_ROOT_DIR}/include) target_link_libraries(test_convert ${FOLLY_LIBRARIES} ${DOUBLE_CONVERSION_LIBRARY}) diff --git a/analytical_engine/core/app/app_invoker.h b/analytical_engine/core/app/app_invoker.h index c27f7c7f4438..576b691d6527 100644 --- a/analytical_engine/core/app/app_invoker.h +++ b/analytical_engine/core/app/app_invoker.h @@ -21,7 +21,7 @@ #include #include -#ifdef EXPERIMENTAL_ON +#ifdef NETWORKX #include "folly/dynamic.h" #endif #include "glog/logging.h" @@ -112,7 +112,7 @@ struct ArgsUnpacker { } }; -#ifdef EXPERIMENTAL_ON +#ifdef NETWORKX /** * @brief A specialized ArgsUnpacker with folly::dynamic type */ diff --git a/analytical_engine/core/context/tensor_context.h b/analytical_engine/core/context/tensor_context.h index a8d6dd9f7830..8c7f1105fefa 100644 --- a/analytical_engine/core/context/tensor_context.h +++ b/analytical_engine/core/context/tensor_context.h @@ -22,7 +22,7 @@ #include #include -#ifdef EXPERIMENTAL_ON +#ifdef NETWORKX #include "folly/dynamic.h" #endif @@ -54,7 +54,7 @@ inline InArchive& operator<<(InArchive& in_archive, return in_archive; } -#ifdef EXPERIMENTAL_ON +#ifdef NETWORKX inline InArchive& operator<<( InArchive& in_archive, const gs::trivial_tensor_t& tensor) { size_t size = tensor.size(); @@ -471,7 +471,7 @@ class TensorContextWrapper : public ITensorContextWrapper { std::shared_ptr ctx_; }; -#ifdef EXPERIMENTAL_ON +#ifdef NETWORKX /** * @brief This is the specialized TensorContextWrapper for folly::dynamic type * of oid diff --git a/analytical_engine/core/fragment/dynamic_fragment.h b/analytical_engine/core/fragment/dynamic_fragment.h index 45c268ee4632..5d052e69b8bd 100644 --- a/analytical_engine/core/fragment/dynamic_fragment.h +++ b/analytical_engine/core/fragment/dynamic_fragment.h @@ -16,7 +16,7 @@ #ifndef ANALYTICAL_ENGINE_CORE_FRAGMENT_DYNAMIC_FRAGMENT_H_ #define ANALYTICAL_ENGINE_CORE_FRAGMENT_DYNAMIC_FRAGMENT_H_ -#ifdef EXPERIMENTAL_ON +#ifdef NETWORKX #include #include diff --git a/analytical_engine/core/fragment/dynamic_fragment_reporter.h b/analytical_engine/core/fragment/dynamic_fragment_reporter.h index 1f70a6269274..14b2864d171c 100644 --- a/analytical_engine/core/fragment/dynamic_fragment_reporter.h +++ b/analytical_engine/core/fragment/dynamic_fragment_reporter.h @@ -16,7 +16,7 @@ #ifndef ANALYTICAL_ENGINE_CORE_FRAGMENT_DYNAMIC_FRAGMENT_REPORTER_H_ #define ANALYTICAL_ENGINE_CORE_FRAGMENT_DYNAMIC_FRAGMENT_REPORTER_H_ -#ifdef EXPERIMENTAL_ON +#ifdef NETWORKX #include #include @@ -375,5 +375,5 @@ class DynamicGraphReporter : public grape::Communicator { }; } // namespace gs -#endif // EXPERIMENTAL_ON +#endif // NETWORKX #endif // ANALYTICAL_ENGINE_CORE_FRAGMENT_DYNAMIC_FRAGMENT_REPORTER_H_ diff --git a/analytical_engine/core/fragment/dynamic_fragment_view.h b/analytical_engine/core/fragment/dynamic_fragment_view.h index 718500a33860..44191af4159f 100644 --- a/analytical_engine/core/fragment/dynamic_fragment_view.h +++ b/analytical_engine/core/fragment/dynamic_fragment_view.h @@ -16,7 +16,7 @@ #ifndef ANALYTICAL_ENGINE_CORE_FRAGMENT_DYNAMIC_FRAGMENT_VIEW_H_ #define ANALYTICAL_ENGINE_CORE_FRAGMENT_DYNAMIC_FRAGMENT_VIEW_H_ -#ifdef EXPERIMENTAL_ON +#ifdef NETWORKX #include #include @@ -320,5 +320,5 @@ class DynamicFragmentView : public DynamicFragment { }; } // namespace gs -#endif // EXPERIMENTAL_ON +#endif // NETWORKX #endif // ANALYTICAL_ENGINE_CORE_FRAGMENT_DYNAMIC_FRAGMENT_VIEW_H_ diff --git a/analytical_engine/core/fragment/dynamic_projected_fragment.h b/analytical_engine/core/fragment/dynamic_projected_fragment.h index 7ee6256e57a8..4e09b53586f6 100644 --- a/analytical_engine/core/fragment/dynamic_projected_fragment.h +++ b/analytical_engine/core/fragment/dynamic_projected_fragment.h @@ -16,7 +16,7 @@ #ifndef ANALYTICAL_ENGINE_CORE_FRAGMENT_DYNAMIC_PROJECTED_FRAGMENT_H_ #define ANALYTICAL_ENGINE_CORE_FRAGMENT_DYNAMIC_PROJECTED_FRAGMENT_H_ -#ifdef EXPERIMENTAL_ON +#ifdef NETWORKX #include #include diff --git a/analytical_engine/core/grape_instance.cc b/analytical_engine/core/grape_instance.cc index 6ecea5c06334..f6806b2997a1 100644 --- a/analytical_engine/core/grape_instance.cc +++ b/analytical_engine/core/grape_instance.cc @@ -53,7 +53,7 @@ bl::result GrapeInstance::loadGraph( switch (graph_type) { case rpc::DYNAMIC_PROPERTY: { -#ifdef EXPERIMENTAL_ON +#ifdef NETWORKX using fragment_t = DynamicFragment; using vertex_map_t = typename fragment_t::vertex_map_t; BOOST_LEAF_AUTO(directed, params.Get(rpc::DIRECTED)); @@ -93,7 +93,7 @@ bl::result GrapeInstance::loadGraph( return graph_def; #else RETURN_GS_ERROR(vineyard::ErrorCode::kInvalidOperationError, - "GS is built with experimental off"); + "GS is built with networkx off"); #endif } case rpc::ARROW_PROPERTY: { @@ -223,7 +223,7 @@ bl::result GrapeInstance::query(const rpc::GSParams& params, bl::result GrapeInstance::reportGraph( const rpc::GSParams& params) { -#ifdef EXPERIMENTAL_ON +#ifdef NETWORKX BOOST_LEAF_AUTO(graph_name, params.Get(rpc::GRAPH_NAME)); BOOST_LEAF_AUTO(wrapper, object_manager_.GetObject(graph_name)); @@ -241,12 +241,12 @@ bl::result GrapeInstance::reportGraph( #else RETURN_GS_ERROR(vineyard::ErrorCode::kUnimplementedMethod, "GS is compiled without folly"); -#endif // EXPERIMENTAL_ON +#endif // NETWORKX } bl::result GrapeInstance::modifyVertices( const rpc::GSParams& params, const std::vector& vertices) { -#ifdef EXPERIMENTAL_ON +#ifdef NETWORKX BOOST_LEAF_AUTO(modify_type, params.Get(rpc::MODIFY_TYPE)); BOOST_LEAF_AUTO(graph_name, params.Get(rpc::GRAPH_NAME)); BOOST_LEAF_AUTO(wrapper, @@ -271,7 +271,7 @@ bl::result GrapeInstance::modifyVertices( bl::result GrapeInstance::modifyEdges( const rpc::GSParams& params, const std::vector& edges) { -#ifdef EXPERIMENTAL_ON +#ifdef NETWORKX BOOST_LEAF_AUTO(modify_type, params.Get(rpc::MODIFY_TYPE)); BOOST_LEAF_AUTO(graph_name, params.Get(rpc::GRAPH_NAME)); BOOST_LEAF_AUTO(wrapper, @@ -290,7 +290,7 @@ bl::result GrapeInstance::modifyEdges( #else RETURN_GS_ERROR(vineyard::ErrorCode::kUnimplementedMethod, "GS is compiled without folly"); -#endif // EXPERIMENTAL_ON +#endif // NETWORKX return {}; } @@ -618,7 +618,7 @@ bl::result GrapeInstance::copyGraph( bl::result GrapeInstance::toDirected( const rpc::GSParams& params) { -#ifdef EXPERIMENTAL_ON +#ifdef NETWORKX BOOST_LEAF_AUTO(src_graph_name, params.Get(rpc::GRAPH_NAME)); // BOOST_LEAF_AUTO(copy_type, params.Get(rpc::COPY_TYPE)); @@ -633,12 +633,12 @@ bl::result GrapeInstance::toDirected( #else RETURN_GS_ERROR(vineyard::ErrorCode::kUnimplementedMethod, "GS is compiled without folly"); -#endif // EXPERIMENTAL_ON +#endif // NETWORKX } bl::result GrapeInstance::toUnDirected( const rpc::GSParams& params) { -#ifdef EXPERIMENTAL_ON +#ifdef NETWORKX BOOST_LEAF_AUTO(src_graph_name, params.Get(rpc::GRAPH_NAME)); BOOST_LEAF_AUTO(src_wrapper, @@ -652,10 +652,10 @@ bl::result GrapeInstance::toUnDirected( #else RETURN_GS_ERROR(vineyard::ErrorCode::kUnimplementedMethod, "GS is compiled without folly"); -#endif // EXPERIMENTAL_ON +#endif // NETWORKX } -#ifdef EXPERIMENTAL_ON +#ifdef NETWORKX bl::result GrapeInstance::induceSubGraph( const rpc::GSParams& params, const std::unordered_set& induced_vertices, @@ -699,10 +699,10 @@ bl::result GrapeInstance::induceSubGraph( BOOST_LEAF_CHECK(object_manager_.PutObject(wrapper)); return wrapper->graph_def(); } -#endif // EXPERIMENTAL_ON +#endif // NETWORKX bl::result GrapeInstance::clearGraph(const rpc::GSParams& params) { -#ifdef EXPERIMENTAL_ON +#ifdef NETWORKX BOOST_LEAF_AUTO(graph_name, params.Get(rpc::GRAPH_NAME)); BOOST_LEAF_AUTO(wrapper, object_manager_.GetObject(graph_name)); @@ -723,12 +723,12 @@ bl::result GrapeInstance::clearGraph(const rpc::GSParams& params) { #else RETURN_GS_ERROR(vineyard::ErrorCode::kUnimplementedMethod, "GS is compiled without folly"); -#endif // EXPERIMENTAL_ON +#endif // NETWORKX return {}; } bl::result GrapeInstance::clearEdges(const rpc::GSParams& params) { -#ifdef EXPERIMENTAL_ON +#ifdef NETWORKX BOOST_LEAF_AUTO(graph_name, params.Get(rpc::GRAPH_NAME)); BOOST_LEAF_AUTO(wrapper, object_manager_.GetObject(graph_name)); @@ -746,13 +746,13 @@ bl::result GrapeInstance::clearEdges(const rpc::GSParams& params) { #else RETURN_GS_ERROR(vineyard::ErrorCode::kUnimplementedMethod, "GS is compiled without folly"); -#endif // EXPERIMENTAL_ON +#endif // NETWORKX return {}; } bl::result GrapeInstance::createGraphView( const rpc::GSParams& params) { -#ifdef EXPERIMENTAL_ON +#ifdef NETWORKX std::string view_id = "graph_view_" + generateId(); BOOST_LEAF_AUTO(graph_name, params.Get(rpc::GRAPH_NAME)); BOOST_LEAF_AUTO(view_type, params.Get(rpc::VIEW_TYPE)); @@ -770,7 +770,7 @@ bl::result GrapeInstance::createGraphView( #else RETURN_GS_ERROR(vineyard::ErrorCode::kUnimplementedMethod, "GS is compiled without folly"); -#endif // EXPERIMENTAL_ON +#endif // NETWORKX } bl::result GrapeInstance::addLabelsToGraph( @@ -911,7 +911,7 @@ bl::result> GrapeInstance::OnReceive( break; } case rpc::MODIFY_VERTICES: { -#ifdef EXPERIMENTAL_ON +#ifdef NETWORKX std::vector vertices_to_modify; int size = cmd.params.at(rpc::NODES).list().s_size(); vertices_to_modify.reserve(size); @@ -921,12 +921,12 @@ bl::result> GrapeInstance::OnReceive( BOOST_LEAF_CHECK(modifyVertices(params, vertices_to_modify)); #else RETURN_GS_ERROR(vineyard::ErrorCode::kInvalidOperationError, - "GS is built with experimental off"); + "GS is built with networkx off"); #endif break; } case rpc::MODIFY_EDGES: { -#ifdef EXPERIMENTAL_ON +#ifdef NETWORKX std::vector edges_to_modify; int size = cmd.params.at(rpc::EDGES).list().s_size(); edges_to_modify.reserve(size); @@ -936,17 +936,17 @@ bl::result> GrapeInstance::OnReceive( BOOST_LEAF_CHECK(modifyEdges(params, edges_to_modify)); #else RETURN_GS_ERROR(vineyard::ErrorCode::kInvalidOperationError, - "GS is built with experimental off"); + "GS is built with networkx off"); #endif break; } case rpc::TRANSFORM_GRAPH: { -#ifdef EXPERIMENTAL_ON +#ifdef NETWORKX BOOST_LEAF_AUTO(graph_def, convertGraph(params)); r->set_graph_def(graph_def); #else RETURN_GS_ERROR(vineyard::ErrorCode::kInvalidOperationError, - "GS is built with experimental off"); + "GS is built with networkx off"); #endif break; } @@ -956,27 +956,27 @@ bl::result> GrapeInstance::OnReceive( break; } case rpc::TO_DIRECTED: { -#ifdef EXPERIMENTAL_ON +#ifdef NETWORKX BOOST_LEAF_AUTO(graph_def, toDirected(params)); r->set_graph_def(graph_def); #else RETURN_GS_ERROR(vineyard::ErrorCode::kInvalidOperationError, - "GS is built with experimental off"); + "GS is built with networkx off"); #endif break; } case rpc::TO_UNDIRECTED: { -#ifdef EXPERIMENTAL_ON +#ifdef NETWORKX BOOST_LEAF_AUTO(graph_def, toUnDirected(params)); r->set_graph_def(graph_def); #else RETURN_GS_ERROR(vineyard::ErrorCode::kInvalidOperationError, - "GS is built with experimental off"); + "GS is built with networkx off"); #endif break; } case rpc::INDUCE_SUBGRAPH: { -#ifdef EXPERIMENTAL_ON +#ifdef NETWORKX std::unordered_set induced_vertices; std::vector> induced_edges; @@ -1011,35 +1011,35 @@ bl::result> GrapeInstance::OnReceive( r->set_graph_def(graph_def); #else RETURN_GS_ERROR(vineyard::ErrorCode::kInvalidOperationError, - "GS is built with experimental off"); + "GS is built with networkx off"); #endif break; } case rpc::CLEAR_GRAPH: { -#ifdef EXPERIMENTAL_ON +#ifdef NETWORKX BOOST_LEAF_CHECK(clearGraph(params)); #else RETURN_GS_ERROR(vineyard::ErrorCode::kInvalidOperationError, - "GS is built with experimental off"); + "GS is built with networkx off"); #endif break; } case rpc::CLEAR_EDGES: { -#ifdef EXPERIMENTAL_ON +#ifdef NETWORKX BOOST_LEAF_CHECK(clearEdges(params)); #else RETURN_GS_ERROR(vineyard::ErrorCode::kInvalidOperationError, - "GS is built with experimental off"); + "GS is built with networkx off"); #endif break; } case rpc::VIEW_GRAPH: { -#ifdef EXPERIMENTAL_ON +#ifdef NETWORKX BOOST_LEAF_AUTO(graph_def, createGraphView(params)); r->set_graph_def(graph_def); #else RETURN_GS_ERROR(vineyard::ErrorCode::kInvalidOperationError, - "GS is built with experimental off"); + "GS is built with networkx off"); #endif break; } @@ -1089,10 +1089,10 @@ bl::result> GrapeInstance::OnReceive( } case rpc::GET_ENGINE_CONFIG: { EngineConfig conf; -#ifdef EXPERIMENTAL_ON - conf.experimental = "ON"; +#ifdef NETWORKX + conf.networkx = "ON"; #else - conf.experimental = "OFF"; + conf.networkx = "OFF"; #endif conf.vineyard_socket = client_->IPCSocket(); conf.vineyard_rpc_endpoint = client_->RPCEndpoint(); diff --git a/analytical_engine/core/grape_instance.h b/analytical_engine/core/grape_instance.h index b8061e3e5c3c..afcb106b6640 100644 --- a/analytical_engine/core/grape_instance.h +++ b/analytical_engine/core/grape_instance.h @@ -45,17 +45,17 @@ namespace gs { /** * @brief EngineConfig contains configurations about the analytical engine, such - * as experimental features in enabled or not, vineyard socket, and vineyard rpc + * as networkx features in enabled or not, vineyard socket, and vineyard rpc * endpoint. */ struct EngineConfig { - std::string experimental; + std::string networkx; std::string vineyard_socket; std::string vineyard_rpc_endpoint; std::string ToJsonString() const { boost::property_tree::ptree pt; - pt.put("experimental", experimental); + pt.put("networkx", networkx); pt.put("vineyard_socket", vineyard_socket); pt.put("vineyard_rpc_endpoint", vineyard_rpc_endpoint); std::stringstream ss; @@ -130,7 +130,7 @@ class GrapeInstance : public Subscriber { bl::result createGraphView(const rpc::GSParams& params); -#ifdef EXPERIMENTAL_ON +#ifdef NETWORKX bl::result induceSubGraph( const rpc::GSParams& params, const std::unordered_set& @@ -138,7 +138,7 @@ class GrapeInstance : public Subscriber { const std::vector>& induced_edges); -#endif // EXPERIMENTAL_ON +#endif // NETWORKX bl::result addLabelsToGraph(const rpc::GSParams& params); diff --git a/analytical_engine/core/io/dynamic_line_parser.h b/analytical_engine/core/io/dynamic_line_parser.h index ad8e05553818..cc2e01b21d30 100644 --- a/analytical_engine/core/io/dynamic_line_parser.h +++ b/analytical_engine/core/io/dynamic_line_parser.h @@ -16,7 +16,7 @@ #ifndef ANALYTICAL_ENGINE_CORE_IO_DYNAMIC_LINE_PARSER_H_ #define ANALYTICAL_ENGINE_CORE_IO_DYNAMIC_LINE_PARSER_H_ -#ifdef EXPERIMENTAL_ON +#ifdef NETWORKX #include @@ -70,5 +70,5 @@ class DynamicLineParser }; } // namespace gs -#endif // EXPERIMENTAL_ON +#endif // NETWORKX #endif // ANALYTICAL_ENGINE_CORE_IO_DYNAMIC_LINE_PARSER_H_ diff --git a/analytical_engine/core/loader/arrow_to_dynamic_converter.h b/analytical_engine/core/loader/arrow_to_dynamic_converter.h index f24226e9ff77..e9d5d2548309 100644 --- a/analytical_engine/core/loader/arrow_to_dynamic_converter.h +++ b/analytical_engine/core/loader/arrow_to_dynamic_converter.h @@ -16,7 +16,7 @@ #ifndef ANALYTICAL_ENGINE_CORE_LOADER_ARROW_TO_DYNAMIC_CONVERTER_H_ #define ANALYTICAL_ENGINE_CORE_LOADER_ARROW_TO_DYNAMIC_CONVERTER_H_ -#ifdef EXPERIMENTAL_ON +#ifdef NETWORKX #include #include diff --git a/analytical_engine/core/loader/dynamic_to_arrow_converter.h b/analytical_engine/core/loader/dynamic_to_arrow_converter.h index 23dceceb8537..bac9d2f06947 100644 --- a/analytical_engine/core/loader/dynamic_to_arrow_converter.h +++ b/analytical_engine/core/loader/dynamic_to_arrow_converter.h @@ -16,7 +16,7 @@ #ifndef ANALYTICAL_ENGINE_CORE_LOADER_DYNAMIC_TO_ARROW_CONVERTER_H_ #define ANALYTICAL_ENGINE_CORE_LOADER_DYNAMIC_TO_ARROW_CONVERTER_H_ -#ifdef EXPERIMENTAL_ON +#ifdef NETWORKX #include #include diff --git a/analytical_engine/core/object/fragment_wrapper.h b/analytical_engine/core/object/fragment_wrapper.h index 5761cd165a7f..95aab4aecbc4 100644 --- a/analytical_engine/core/object/fragment_wrapper.h +++ b/analytical_engine/core/object/fragment_wrapper.h @@ -487,7 +487,7 @@ class FragmentWrapper> std::shared_ptr fragment_; }; -#ifdef EXPERIMENTAL_ON +#ifdef NETWORKX /** * @brief A specialized FragmentWrapper for DynamicFragment. * @tparam OID_T OID type diff --git a/analytical_engine/core/object/graph_utils.h b/analytical_engine/core/object/graph_utils.h index cfbb745e13a1..60db682646e5 100644 --- a/analytical_engine/core/object/graph_utils.h +++ b/analytical_engine/core/object/graph_utils.h @@ -119,14 +119,14 @@ class PropertyGraphUtils : public GSObject { vineyard::Client& client, const grape::CommSpec& comm_spec, std::shared_ptr& wrapper_in, const std::string& dst_graph_name) { -#ifdef EXPERIMENTAL_ON +#ifdef NETWORKX bl::result> wrapper; to_arrow_fragment_(client, comm_spec, wrapper_in, dst_graph_name, wrapper); return wrapper; #else RETURN_GS_ERROR(vineyard::ErrorCode::kUnsupportedOperationError, - "GS is compiled with EXPERIMENTAL_ON=OFF"); + "GS is compiled with NETWORKX=OFF"); #endif } @@ -134,14 +134,14 @@ class PropertyGraphUtils : public GSObject { const grape::CommSpec& comm_spec, std::shared_ptr& wrapper_in, const std::string& dst_graph_name) { -#ifdef EXPERIMENTAL_ON +#ifdef NETWORKX bl::result> wrapper; to_dynamic_fragment_(comm_spec, wrapper_in, dst_graph_name, wrapper); return wrapper; #else RETURN_GS_ERROR(vineyard::ErrorCode::kUnsupportedOperationError, - "GS is compiled with EXPERIMENTAL_ON=OFF"); + "GS is compiled with NETWORKX=OFF"); #endif } diff --git a/analytical_engine/core/utils/transform_utils.h b/analytical_engine/core/utils/transform_utils.h index 0ff3a543241b..5f445ee40793 100644 --- a/analytical_engine/core/utils/transform_utils.h +++ b/analytical_engine/core/utils/transform_utils.h @@ -21,7 +21,7 @@ limitations under the License. #include #include -#ifdef EXPERIMENTAL_ON +#ifdef NETWORKX #include "folly/dynamic.h" #endif #include "boost/foreach.hpp" @@ -32,7 +32,7 @@ limitations under the License. #include "core/context/column.h" -#ifdef EXPERIMENTAL_ON +#ifdef NETWORKX namespace grape { inline grape::InArchive& operator<<(grape::InArchive& archive, const folly::dynamic& d) { @@ -49,7 +49,7 @@ inline grape::InArchive& operator<<(grape::InArchive& archive, namespace gs { -#ifdef EXPERIMENTAL_ON +#ifdef NETWORKX template struct is_dynamic { constexpr static bool value = std::is_same::value; @@ -143,7 +143,7 @@ typename std::enable_if::value, OID_T>::type string_to_oid( return boost::lexical_cast(s_oid); } -#ifdef EXPERIMENTAL_ON +#ifdef NETWORKX template typename std::enable_if::value, OID_T>::type string_to_oid( const std::string& s_oid) { @@ -825,7 +825,7 @@ class TransformUtils< const FRAG_T& frag_; }; -#ifdef EXPERIMENTAL_ON +#ifdef NETWORKX /** * A transform utils for the non-labeled fragment but the type of oid is * dynamic, like DynamicFragment, DynamicProjectedFragment. This utility diff --git a/analytical_engine/frame/project_frame.cc b/analytical_engine/frame/project_frame.cc index 2469a00b50b4..49ff66c447e2 100644 --- a/analytical_engine/frame/project_frame.cc +++ b/analytical_engine/frame/project_frame.cc @@ -122,7 +122,7 @@ class ProjectSimpleFrame< } }; -#ifdef EXPERIMENTAL_ON +#ifdef NETWORKX template class ProjectSimpleFrame> { using fragment_t = gs::DynamicFragment; diff --git a/analytical_engine/frame/property_graph_frame.cc b/analytical_engine/frame/property_graph_frame.cc index 2b338f23ceea..8d6253577be5 100644 --- a/analytical_engine/frame/property_graph_frame.cc +++ b/analytical_engine/frame/property_graph_frame.cc @@ -128,7 +128,7 @@ void ToArrowFragment( std::shared_ptr& wrapper_in, const std::string& dst_graph_name, gs::bl::result>& wrapper_out) { -#ifdef EXPERIMENTAL_ON +#ifdef NETWORKX using oid_t = typename _GRAPH_TYPE::oid_t; using vid_t = typename _GRAPH_TYPE::vid_t; static_assert(std::is_same::value, @@ -138,7 +138,7 @@ void ToArrowFragment( wrapper_out = gs::bl::try_handle_some( [&]() -> gs::bl::result> { -#ifdef EXPERIMENTAL_ON +#ifdef NETWORKX if (wrapper_in->graph_def().graph_type() != gs::rpc::DYNAMIC_PROPERTY) { RETURN_GS_ERROR(vineyard::ErrorCode::kInvalidValueError, "Source fragment it not DynamicFragment."); @@ -194,7 +194,7 @@ void ToDynamicFragment( gs::bl::result>& wrapper_out) { wrapper_out = gs::bl::try_handle_some( [&]() -> gs::bl::result> { -#ifdef EXPERIMENTAL_ON +#ifdef NETWORKX if (wrapper_in->graph_def().graph_type() != gs::rpc::ARROW_PROPERTY) { RETURN_GS_ERROR(vineyard::ErrorCode::kInvalidValueError, "Source fragment it not ArrowFragment."); diff --git a/coordinator/gscoordinator/coordinator.py b/coordinator/gscoordinator/coordinator.py index 028437790a09..75838385cd00 100644 --- a/coordinator/gscoordinator/coordinator.py +++ b/coordinator/gscoordinator/coordinator.py @@ -699,7 +699,7 @@ def _get_engine_config(self): def _compile_lib_and_distribute(self, compile_func, lib_name, op): if self._analytical_engine_config is None: - # fetch experimental_on compile option from engine + # fetch NETWORKX compile option from engine self._analytical_engine_config = self._get_engine_config() space = self._builtin_workspace if types_pb2.GAR in op.attr: diff --git a/coordinator/gscoordinator/template/CMakeLists.template b/coordinator/gscoordinator/template/CMakeLists.template index 0da68347ee98..e314ee3db254 100644 --- a/coordinator/gscoordinator/template/CMakeLists.template +++ b/coordinator/gscoordinator/template/CMakeLists.template @@ -12,7 +12,9 @@ option(PROJECT_FRAME "Whether to build project frame" False) option(ENABLE_PREGEL_COMBINE "Whether enable combinator in pregel app." False) -if (EXPERIMENTAL_ON) +if (NETWORKX) + add_definitions(-DNETWORKX) + # TODO: need by vineyard, remove when vineyard version update. add_definitions(-DEXPERIMENTAL_ON) endif () diff --git a/coordinator/gscoordinator/utils.py b/coordinator/gscoordinator/utils.py index d7d41066239c..56e32b9068b8 100644 --- a/coordinator/gscoordinator/utils.py +++ b/coordinator/gscoordinator/utils.py @@ -134,7 +134,7 @@ def compile_app(workspace: str, library_name, attr, engine_config: dict): workspace (str): working dir. library_name (str): name of library attr (`AttrValue`): All information needed to compile an app. - engine_config (dict): for options of experimental_on + engine_config (dict): for options of NETWORKX Returns: str: Path of the built library. @@ -172,7 +172,7 @@ def compile_app(workspace: str, library_name, attr, engine_config: dict): cmake_commands = [ "cmake", ".", - "-DEXPERIMENTAL_ON=" + engine_config["experimental"], + "-DNETWORKX=" + engine_config["networkx"], ] if app_type != "cpp_pie": if app_type == "cython_pregel": @@ -252,7 +252,7 @@ def compile_graph_frame(workspace: str, library_name, attr: dict, engine_config: workspace (str): Working dir. library_name (str): name of library attr (`AttrValue`): All information needed to compile a graph library. - engine_config (dict): for options of experimental_on + engine_config (dict): for options of NETWORKX Raises: ValueError: When graph_type is not supported. @@ -275,7 +275,7 @@ def compile_graph_frame(workspace: str, library_name, attr: dict, engine_config: cmake_commands = [ "cmake", ".", - "-DEXPERIMENTAL_ON=" + engine_config["experimental"], + "-DNETWORKX=" + engine_config["networkx"], ] if graph_type == types_pb2.ARROW_PROPERTY: cmake_commands += ["-DPROPERTY_GRAPH_FRAME=True"] diff --git a/docs/reference/networkx/builtin.rst b/docs/reference/networkx/builtin.rst index 8a7b4e661cd0..f93f036a30d3 100644 --- a/docs/reference/networkx/builtin.rst +++ b/docs/reference/networkx/builtin.rst @@ -3,17 +3,17 @@ Builtin algorithms --------------------- -.. autofunction:: graphscope.experimental.nx.builtin.hits -.. autofunction:: graphscope.experimental.nx.builtin.degree_centrality -.. autofunction:: graphscope.experimental.nx.builtin.in_degree_centrality -.. autofunction:: graphscope.experimental.nx.builtin.out_degree_centrality -.. autofunction:: graphscope.experimental.nx.builtin.eigenvector_centrality -.. autofunction:: graphscope.experimental.nx.builtin.katz_centrality -.. autofunction:: graphscope.experimental.nx.builtin.has_path -.. autofunction:: graphscope.experimental.nx.builtin.shortest_path_length -.. autofunction:: graphscope.experimental.nx.builtin.average_shortest_path_length -.. autofunction:: graphscope.experimental.nx.builtin.bfs_edges -.. autofunction:: graphscope.experimental.nx.builtin.k_core -.. autofunction:: graphscope.experimental.nx.builtin.clustering -.. autofunction:: graphscope.experimental.nx.builtin.triangles -.. autofunction:: graphscope.experimental.nx.builtin.average_clustering \ No newline at end of file +.. autofunction:: graphscope.nx.builtin.hits +.. autofunction:: graphscope.nx.builtin.degree_centrality +.. autofunction:: graphscope.nx.builtin.in_degree_centrality +.. autofunction:: graphscope.nx.builtin.out_degree_centrality +.. autofunction:: graphscope.nx.builtin.eigenvector_centrality +.. autofunction:: graphscope.nx.builtin.katz_centrality +.. autofunction:: graphscope.nx.builtin.has_path +.. autofunction:: graphscope.nx.builtin.shortest_path_length +.. autofunction:: graphscope.nx.builtin.average_shortest_path_length +.. autofunction:: graphscope.nx.builtin.bfs_edges +.. autofunction:: graphscope.nx.builtin.k_core +.. autofunction:: graphscope.nx.builtin.clustering +.. autofunction:: graphscope.nx.builtin.triangles +.. autofunction:: graphscope.nx.builtin.average_clustering \ No newline at end of file diff --git a/docs/reference/networkx/functions.rst b/docs/reference/networkx/functions.rst index 916094cb87d0..5bef9f1b210a 100644 --- a/docs/reference/networkx/functions.rst +++ b/docs/reference/networkx/functions.rst @@ -4,7 +4,7 @@ Functions ********* -.. automodule:: graphscope.experimental.nx.classes.function +.. automodule:: graphscope.nx.classes.function Graph ----- diff --git a/docs/reference/networkx/generators.rst b/docs/reference/networkx/generators.rst index 614c0f6aef2d..a8e83d20122d 100644 --- a/docs/reference/networkx/generators.rst +++ b/docs/reference/networkx/generators.rst @@ -3,11 +3,11 @@ Graph generators **************** -.. currentmodule:: graphscope.experimental.nx +.. currentmodule:: graphscope.nx Classic ------- -.. automodule:: graphscope.experimental.nx.generators.classic +.. automodule:: graphscope.nx.generators.classic .. autosummary:: :toctree: generated/ @@ -20,7 +20,7 @@ Classic Social Networks --------------- -.. automodule:: graphscope.experimental.nx.generators.social +.. automodule:: graphscope.nx.generators.social .. autosummary:: :toctree: generated/ diff --git a/docs/reference/networkx/graphs.rst b/docs/reference/networkx/graphs.rst index 390f66a168b7..a246981296b3 100644 --- a/docs/reference/networkx/graphs.rst +++ b/docs/reference/networkx/graphs.rst @@ -17,7 +17,7 @@ Graph ^^^^^^^ Undirected graphs with self loops -.. currentmodule:: graphscope.experimental.nx +.. currentmodule:: graphscope.nx .. autoclass:: Graph :special-members: :members: @@ -28,7 +28,7 @@ DiGraph ^^^^^^^ Directed graphs with self loops -.. currentmodule:: graphscope.experimental.nx +.. currentmodule:: graphscope.nx .. autoclass:: DiGraph :special-members: :inherited-members: @@ -41,10 +41,11 @@ transformation In GraphScope, the immutable graphscope.Graph and the mutable graphscope.nx.Graph can be transformed into each other. We define the transformation in each Graph class -constructor. +constructors. .. autofunction:: graphscope.framework.graph.Graph.__init__ -.. autofunction:: graphscope.experimental.nx.Graph.__init__ +.. autofunction:: graphscope.nx.Graph.__init__ +.. autofunction:: graphscope.nx.convert.from_gs_graph diff --git a/docs/reference/networkx/io.rst b/docs/reference/networkx/io.rst index 143c2178bebc..3c8902931e08 100644 --- a/docs/reference/networkx/io.rst +++ b/docs/reference/networkx/io.rst @@ -5,8 +5,8 @@ Reading graphs Edge List ^^^^^^^^^ -.. autofunction:: graphscope.experimental.nx.read_edgelist +.. autofunction:: graphscope.nx.read_edgelist Adjacency List ^^^^^^^^^^^^^^ -.. autofunction:: graphscope.experimental.nx.read_adjlist \ No newline at end of file +.. autofunction:: graphscope.nx.read_adjlist \ No newline at end of file diff --git a/k8s/graphscope.Dockerfile b/k8s/graphscope.Dockerfile index bd973eb63267..6a1d82ea497c 100644 --- a/k8s/graphscope.Dockerfile +++ b/k8s/graphscope.Dockerfile @@ -10,8 +10,8 @@ FROM registry.cn-hongkong.aliyuncs.com/graphscope/graphscope-vineyard:$BASE_VERS ARG CI=true ENV CI=$CI -ARG EXPERIMENTAL_ON=ON -ENV EXPERIMENTAL_ON=$EXPERIMENTAL_ON +ARG NETWORKX=ON +ENV NETWORKX=$NETWORKX ARG profile=release ENV profile=$profile @@ -39,7 +39,7 @@ RUN export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/graphscope/lib:/opt/graphscope/ cd build && \ cmake .. -DCMAKE_PREFIX_PATH=/opt/graphscope \ -DCMAKE_INSTALL_PREFIX=/opt/graphscope \ - -DEXPERIMENTAL_ON=$EXPERIMENTAL_ON && \ + -DNETWORKX=$NETWORKX && \ make gsa_cpplint && \ make -j`nproc` && \ make install && \ diff --git a/k8s/precompile.py b/k8s/precompile.py index 28de0dd96e2c..e60ecee3b7c7 100755 --- a/k8s/precompile.py +++ b/k8s/precompile.py @@ -17,7 +17,7 @@ def compute_sig(s): return hashlib.sha256(s.encode("utf-8")).hexdigest() -EXPERIMENTAL_ON = os.environ.get("EXPERIMENTAL_ON", "ON") +NETWORKX = os.environ.get("NETWORKX", "ON") try: import gscoordinator @@ -62,7 +62,7 @@ def cmake_graph(graph_class): ) with open(cmakelists_file, mode="w") as f: f.write(content) - cmake_commands = ["cmake", ".", "-DEXPERIMENTAL_ON=" + EXPERIMENTAL_ON] + cmake_commands = ["cmake", ".", "-DNETWORKX=" + NETWORKX] if "ArrowFragment" in graph_class: cmake_commands.append("-DPROPERTY_GRAPH_FRAME=True") else: @@ -101,7 +101,7 @@ def cmake_app(app): ) with open(cmakelists_file, mode="w") as f: f.write(content) - cmake_commands = ["cmake", ".", "-DEXPERIMENTAL_ON=" + EXPERIMENTAL_ON] + cmake_commands = ["cmake", ".", "-DNETWORKX=" + NETWORKX] cmake_and_make(cmake_commands) print("Finished compiling", app_class, graph_class) diff --git a/python/.coveragerc b/python/.coveragerc index e9471029e65e..fc987ecb9dfd 100644 --- a/python/.coveragerc +++ b/python/.coveragerc @@ -1,5 +1,5 @@ [run] omit = - graphscope/experimental/* + graphscope/nx/* jupyter/graphscope/node_modules/.* /usr/* diff --git a/python/.pylintrc b/python/.pylintrc index 5a37190822cd..acfd4a225244 100644 --- a/python/.pylintrc +++ b/python/.pylintrc @@ -16,7 +16,7 @@ ignore=CVS # regex matches against base names, not paths. ignore-patterns=.*_pb2, .*_pb2_grpc, - graphscope/experimental/.* + graphscope/nx/.* jupyter/graphscope/node_modules/.* # Python code to execute, usually for sys.path manipulation such as diff --git a/python/graphscope/__init__.py b/python/graphscope/__init__.py index 5b4410efbfe1..26ae9002283c 100644 --- a/python/graphscope/__init__.py +++ b/python/graphscope/__init__.py @@ -38,7 +38,7 @@ operations on a cluster of computers through a user-friendly Python interface. GraphScope makes multi-staged processing of large-scale graph data on compute clusters simple by combining several important pieces of Alibaba technology: -including GRAPE, MaxGraph, and Graph-Learn (GL) for analytics, interactive, +including GRAPE, MaxGraph, and Graph-Learn (GL) for analytics, interactive, and graph neural networks (GNN) computation, respectively, and the vineyard store that offers efficient in-memory data transfers. diff --git a/python/graphscope/experimental/nx/generators/__init__.py b/python/graphscope/experimental/nx/generators/__init__.py deleted file mode 100644 index 977cc93cb3d2..000000000000 --- a/python/graphscope/experimental/nx/generators/__init__.py +++ /dev/null @@ -1,28 +0,0 @@ -#!/usr/bin/env python3 -# -*- coding: utf-8 -*- -# -# Copyright 2020 Alibaba Group Holding Limited. All Rights Reserved. -# -# 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 -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -from graphscope.experimental.nx.generators.classic import * -from graphscope.experimental.nx.generators.community import * -from graphscope.experimental.nx.generators.degree_seq import * -from graphscope.experimental.nx.generators.directed import * -from graphscope.experimental.nx.generators.lattice import * -from graphscope.experimental.nx.generators.line import * -from graphscope.experimental.nx.generators.random_graphs import * -from graphscope.experimental.nx.generators.small import * -from graphscope.experimental.nx.generators.social import * -from graphscope.experimental.nx.generators.trees import * diff --git a/python/graphscope/framework/app.py b/python/graphscope/framework/app.py index 447ebe1c5fa1..67bf5b0a7c66 100644 --- a/python/graphscope/framework/app.py +++ b/python/graphscope/framework/app.py @@ -210,8 +210,8 @@ def is_compatible(self, graph): graph, ( graphscope.framework.graph.Graph, - graphscope.experimental.nx.classes.graph.Graph, - graphscope.experimental.nx.classes.digraph.DiGraph, + graphscope.nx.classes.graph.Graph, + graphscope.nx.classes.digraph.DiGraph, ), ): raise InvalidArgumentError("Wrong type of graph.") diff --git a/python/graphscope/framework/graph.py b/python/graphscope/framework/graph.py index f99fde4e76ab..ae30f8fe93bf 100644 --- a/python/graphscope/framework/graph.py +++ b/python/graphscope/framework/graph.py @@ -123,7 +123,7 @@ def __init__( if incoming_data is not None: # Don't import the :code:`NXGraph` in top-level statements to improve the # performance of :code:`import graphscope`. - from graphscope.experimental import nx + from graphscope import nx if isinstance(incoming_data, Operation): self._pending_op = incoming_data diff --git a/python/graphscope/framework/graph_builder.py b/python/graphscope/framework/graph_builder.py index b0b76934d21f..cf16bd2db0bc 100644 --- a/python/graphscope/framework/graph_builder.py +++ b/python/graphscope/framework/graph_builder.py @@ -170,7 +170,7 @@ def load_from( # Don't import the :code:`nx` in top-level statments to improve the # performance of :code:`import graphscope`. - from graphscope.experimental import nx + from graphscope import nx sess = get_default_session() if sess is None: diff --git a/python/graphscope/experimental/nx/__init__.py b/python/graphscope/nx/__init__.py similarity index 65% rename from python/graphscope/experimental/nx/__init__.py rename to python/graphscope/nx/__init__.py index 3cff7a335f8e..5f6da942c45d 100644 --- a/python/graphscope/experimental/nx/__init__.py +++ b/python/graphscope/nx/__init__.py @@ -21,11 +21,11 @@ import networkx.testing as testing from networkx.exception import * -from graphscope.experimental.nx.algorithms import * -from graphscope.experimental.nx.classes import * -from graphscope.experimental.nx.convert import * -from graphscope.experimental.nx.convert_matrix import * -from graphscope.experimental.nx.generators import * -from graphscope.experimental.nx.readwrite import * -from graphscope.experimental.nx.relabel import * -from graphscope.experimental.nx.utils import * +from graphscope.nx.algorithms import * +from graphscope.nx.classes import * +from graphscope.nx.convert import * +from graphscope.nx.convert_matrix import * +from graphscope.nx.generators import * +from graphscope.nx.readwrite import * +from graphscope.nx.relabel import * +from graphscope.nx.utils import * diff --git a/python/graphscope/experimental/nx/algorithms/__init__.py b/python/graphscope/nx/algorithms/__init__.py similarity index 87% rename from python/graphscope/experimental/nx/algorithms/__init__.py rename to python/graphscope/nx/algorithms/__init__.py index b2f1493e9205..48242c255898 100644 --- a/python/graphscope/experimental/nx/algorithms/__init__.py +++ b/python/graphscope/nx/algorithms/__init__.py @@ -21,7 +21,7 @@ import networkx -from graphscope.experimental.nx.algorithms import builtin +from graphscope.nx.algorithms import builtin # NB: currently we don't what to make "builtin" in precedence to network's # pure python implementation. @@ -29,8 +29,8 @@ # After our built-in is ready, you just need to uncomment the following line. # # from python.grape.nx.algorithms.builtin import * -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx -from graphscope.experimental.nx.utils.compat import internal_name +from graphscope.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import internal_name existing_names = set( k for k, _ in inspect.getmembers(sys.modules[__name__]) if not internal_name(k) diff --git a/python/graphscope/experimental/nx/algorithms/builtin.py b/python/graphscope/nx/algorithms/builtin.py similarity index 99% rename from python/graphscope/experimental/nx/algorithms/builtin.py rename to python/graphscope/nx/algorithms/builtin.py index 41c0f31a766e..25473759fdc1 100644 --- a/python/graphscope/experimental/nx/algorithms/builtin.py +++ b/python/graphscope/nx/algorithms/builtin.py @@ -23,10 +23,10 @@ from networkx.utils.decorators import not_implemented_for import graphscope -from graphscope.experimental import nx -from graphscope.experimental.nx.utils.compat import patch_docstring +from graphscope import nx from graphscope.framework.app import AppAssets from graphscope.framework.errors import InvalidArgumentError +from graphscope.nx.utils.compat import patch_docstring from graphscope.proto import types_pb2 diff --git a/python/graphscope/experimental/nx/classes/__init__.py b/python/graphscope/nx/classes/__init__.py similarity index 81% rename from python/graphscope/experimental/nx/classes/__init__.py rename to python/graphscope/nx/classes/__init__.py index af973214c9b5..0f4e7f017b4c 100644 --- a/python/graphscope/experimental/nx/classes/__init__.py +++ b/python/graphscope/nx/classes/__init__.py @@ -20,6 +20,6 @@ import networkx.classes.graphviews import networkx.classes.reportviews -from graphscope.experimental.nx.classes.digraph import DiGraph -from graphscope.experimental.nx.classes.function import * -from graphscope.experimental.nx.classes.graph import Graph +from graphscope.nx.classes.digraph import DiGraph +from graphscope.nx.classes.function import * +from graphscope.nx.classes.graph import Graph diff --git a/python/graphscope/experimental/nx/classes/dicts.py b/python/graphscope/nx/classes/dicts.py similarity index 100% rename from python/graphscope/experimental/nx/classes/dicts.py rename to python/graphscope/nx/classes/dicts.py diff --git a/python/graphscope/experimental/nx/classes/digraph.py b/python/graphscope/nx/classes/digraph.py similarity index 96% rename from python/graphscope/experimental/nx/classes/digraph.py rename to python/graphscope/nx/classes/digraph.py index 39ed6dd9f1f2..139c097bb1f2 100644 --- a/python/graphscope/experimental/nx/classes/digraph.py +++ b/python/graphscope/nx/classes/digraph.py @@ -31,21 +31,21 @@ from networkx.classes.reportviews import OutEdgeView from graphscope.client.session import get_default_session -from graphscope.experimental.nx import NetworkXError -from graphscope.experimental.nx.classes.graph import Graph -from graphscope.experimental.nx.convert import from_gs_graph -from graphscope.experimental.nx.convert import to_nx_graph -from graphscope.experimental.nx.utils.compat import patch_docstring -from graphscope.experimental.nx.utils.other import empty_graph_in_engine from graphscope.framework import dag_utils from graphscope.framework.dag_utils import copy_graph from graphscope.framework.graph_schema import GraphSchema +from graphscope.nx import NetworkXError +from graphscope.nx.classes.graph import Graph +from graphscope.nx.convert import from_gs_graph +from graphscope.nx.convert import to_nx_graph +from graphscope.nx.utils.compat import patch_docstring +from graphscope.nx.utils.other import empty_graph_in_engine from graphscope.proto import types_pb2 class DiGraph(Graph): """ - Base class for undirected graphs in graphscope.nx. + Base class for directed graphs in graphscope.nx. A DiGraph that hold the metadata of a graph, and provide NetworkX-like DiGraph APIs. @@ -57,7 +57,8 @@ class DiGraph(Graph): DiGraphs support directed edges. Self loops are allowed but multiple (parallel) edges are not. - Nodes can be some hashable objects including int/float/tuple/bool with optional key/value attributes. + Nodes can be some hashable objects including int/str/float/tuple/bool object + with optional key/value attributes. Edges are represented as links between nodes with optional key/value attributes. @@ -206,13 +207,18 @@ def __init__(self, incoming_graph_data=None, **attr): self._key = None self._op = None + self._session_id = None self._graph_type = self._graph_type self._schema = GraphSchema() self._schema.init_nx_schema() + create_empty_in_engine = attr.pop( + "create_empty_in_engine", True + ) # a hidden parameter + if self._is_gs_graph(incoming_graph_data): self._session_id = incoming_graph_data.session_id - else: + elif create_empty_in_engine: sess = get_default_session() if sess is None: raise ValueError( @@ -221,9 +227,6 @@ def __init__(self, incoming_graph_data=None, **attr): ) self._session_id = sess.session_id - create_empty_in_engine = attr.pop( - "create_empty_in_engine", True - ) # a hidden parameter if not self._is_gs_graph(incoming_graph_data) and create_empty_in_engine: graph_def = empty_graph_in_engine(self, self.is_directed()) self._key = graph_def.key diff --git a/python/graphscope/experimental/nx/classes/function.py b/python/graphscope/nx/classes/function.py similarity index 100% rename from python/graphscope/experimental/nx/classes/function.py rename to python/graphscope/nx/classes/function.py diff --git a/python/graphscope/experimental/nx/classes/graph.py b/python/graphscope/nx/classes/graph.py similarity index 97% rename from python/graphscope/experimental/nx/classes/graph.py rename to python/graphscope/nx/classes/graph.py index a214d039477b..c3c8bce2e31f 100644 --- a/python/graphscope/experimental/nx/classes/graph.py +++ b/python/graphscope/nx/classes/graph.py @@ -29,25 +29,22 @@ from networkx.classes.reportviews import DegreeView from networkx.classes.reportviews import EdgeView from networkx.classes.reportviews import NodeView -from networkx.generators.classic import path_graph -from graphscope.client.session import default_session +from graphscope import nx from graphscope.client.session import get_default_session -from graphscope.client.session import get_session_by_id -from graphscope.experimental import nx -from graphscope.experimental.nx import NetworkXError -from graphscope.experimental.nx.classes.dicts import AdjDict -from graphscope.experimental.nx.classes.dicts import NodeDict -from graphscope.experimental.nx.convert import from_gs_graph -from graphscope.experimental.nx.convert import to_nx_graph -from graphscope.experimental.nx.utils.compat import patch_docstring -from graphscope.experimental.nx.utils.other import empty_graph_in_engine -from graphscope.experimental.nx.utils.other import parse_ret_as_dict from graphscope.framework import dag_utils from graphscope.framework import utils from graphscope.framework.errors import InvalidArgumentError from graphscope.framework.errors import check_argument from graphscope.framework.graph_schema import GraphSchema +from graphscope.nx import NetworkXError +from graphscope.nx.classes.dicts import AdjDict +from graphscope.nx.classes.dicts import NodeDict +from graphscope.nx.convert import from_gs_graph +from graphscope.nx.convert import to_nx_graph +from graphscope.nx.utils.compat import patch_docstring +from graphscope.nx.utils.other import empty_graph_in_engine +from graphscope.nx.utils.other import parse_ret_as_dict from graphscope.proto import types_pb2 @@ -65,7 +62,8 @@ class Graph(object): Graphs support undirected edges. Self loops are allowed but multiple (parallel) edges are not. - Nodes can be many hashable objects including int/float/tuple/bool with optional key/value attributes. + Nodes can be many hashable objects including int/str/float/tuple/bool object + with optional key/value attributes. Edges are represented as links between nodes with optional key/value attributes @@ -227,13 +225,6 @@ def __init__(self, incoming_graph_data=None, **attr): attr : keyword arguments, optional (default= no attributes) Attributes to add to graph as key=value pairs. - Raises - ------ - AnalyticalEngineInternalError - if incomming_graph_data is graphscope.Graph and it contain same node id - in different node label or contain parallel edge in defferent edge label. - or directed of graphscope.Graph not match to graphscope.nx Graph. - Examples -------- @@ -514,7 +505,7 @@ def add_node(self, node_for_adding, **attr): Notes ----- - nx.Graph support int, float, string, tuple or bool object of nodes. + nx.Graph support int, float, str, tuple or bool object of nodes. """ return self.add_nodes_from([node_for_adding], **attr) @@ -616,7 +607,7 @@ def remove_nodes_from(self, nodes_for_removing): Parameters ---------- - nodes : iterable container + nodes_for_removing : iterable container A container of nodes (list, dict, set, etc.). If a node in the container is not in the graph it is silently ignored. @@ -695,7 +686,7 @@ def number_of_nodes(self): See Also -------- - order, __len__ which are identical + order, __len__ which are identical Examples -------- @@ -949,7 +940,7 @@ def set_edge_data(self, u, v, data): Parameters ---------- u, v : nodes - Nodes can be int/string/float/tuple/bool hashable Python objects. + Nodes can be int, str, float, tuple, bool hashable Python objects. data: dict Edge data to set to edge (u, v) @@ -981,7 +972,7 @@ def set_node_data(self, n, data): Parameters ---------- n : node - node can be int/string/float/tuple/bool hashable Python object which is existed in graph. + node can be int, str, float, tuple, bool hashable Python object which is existed in graph. data : dict data to set to n @@ -1136,7 +1127,7 @@ def has_edge(self, u, v): ---------- u, v : nodes Nodes can be, for example, strings or numbers. - Nodes must be int/string/float/tuple/bool hashable Python objects. + Nodes must be int, str, float, tuple, bool hashable Python objects. Returns ------- diff --git a/python/graphscope/experimental/nx/convert.py b/python/graphscope/nx/convert.py similarity index 90% rename from python/graphscope/experimental/nx/convert.py rename to python/graphscope/nx/convert.py index 729f03e08148..a9bf97ab0009 100644 --- a/python/graphscope/experimental/nx/convert.py +++ b/python/graphscope/nx/convert.py @@ -26,9 +26,9 @@ from networkx.convert import from_dict_of_lists from networkx.convert import from_edgelist -from graphscope.experimental import nx -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx +from graphscope import nx from graphscope.framework.dag_utils import arrow_to_dynamic +from graphscope.nx.utils.compat import import_as_graphscope_nx import_as_graphscope_nx(networkx.convert) @@ -166,20 +166,31 @@ def from_gs_graph(gs_graph, dst_nx_graph): Parameters ---------- graph: gs graph - A gs graph that contains graph data. + A gs graph that contains graph data. the gs graph shoube be nodes id unique + in all labels and not has parallel edge between edge label. dst_nx_graph: nx graph the nx graph convert to. - Return; + Returns + ------- graph_def: GraphDef graph definition contains meta data and schema. + Raises + ------- + TypeError + if directed of gs graph not match to dst_nx_graph + AnalyticalEngineInternalError + if gs graph contain same node id between labels or has parallel edges + between edge labels. + Examples -------- - >>> import graphscope as gs - >>> from graphscope.experimental import nx - >>> gs_g = gs.Graph() + >>> import graphscope + >>> from graphscope import nx + >>> gs_g = graphscope.g(directed=False) + >>> gs_g = gs_g.add_vertices(...).add_edges(...) >>> nx_g = nx.Graph(gs_g) """ if dst_nx_graph.is_directed() != gs_graph.is_directed(): diff --git a/python/graphscope/experimental/nx/convert_matrix.py b/python/graphscope/nx/convert_matrix.py similarity index 90% rename from python/graphscope/experimental/nx/convert_matrix.py rename to python/graphscope/nx/convert_matrix.py index 97a4c7945f0e..8adef4972449 100644 --- a/python/graphscope/experimental/nx/convert_matrix.py +++ b/python/graphscope/nx/convert_matrix.py @@ -22,9 +22,9 @@ import networkx.convert_matrix from networkx.convert_matrix import from_pandas_edgelist as _from_pandas_edgelist -from graphscope.experimental import nx -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx -from graphscope.experimental.nx.utils.compat import patch_docstring +from graphscope import nx +from graphscope.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import patch_docstring import_as_graphscope_nx(networkx.convert_matrix) diff --git a/python/graphscope/experimental/nx/tests/__init__.py b/python/graphscope/nx/generators/__init__.py similarity index 58% rename from python/graphscope/experimental/nx/tests/__init__.py rename to python/graphscope/nx/generators/__init__.py index 618dda69a7be..65f0b11a6e65 100644 --- a/python/graphscope/experimental/nx/tests/__init__.py +++ b/python/graphscope/nx/generators/__init__.py @@ -15,3 +15,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # + +from graphscope.nx.generators.classic import * +from graphscope.nx.generators.community import * +from graphscope.nx.generators.degree_seq import * +from graphscope.nx.generators.directed import * +from graphscope.nx.generators.lattice import * +from graphscope.nx.generators.line import * +from graphscope.nx.generators.random_graphs import * +from graphscope.nx.generators.small import * +from graphscope.nx.generators.social import * +from graphscope.nx.generators.trees import * diff --git a/python/graphscope/experimental/nx/generators/classic.py b/python/graphscope/nx/generators/classic.py similarity index 98% rename from python/graphscope/experimental/nx/generators/classic.py rename to python/graphscope/nx/generators/classic.py index 0245a3b77778..1f438958a0df 100644 --- a/python/graphscope/experimental/nx/generators/classic.py +++ b/python/graphscope/nx/generators/classic.py @@ -26,10 +26,10 @@ from networkx.utils import nodes_or_number from networkx.utils import pairwise -from graphscope.experimental import nx -from graphscope.experimental.nx import NetworkXError -from graphscope.experimental.nx.classes.graph import Graph -from graphscope.experimental.nx.utils.compat import patch_docstring +from graphscope import nx +from graphscope.nx import NetworkXError +from graphscope.nx.classes.graph import Graph +from graphscope.nx.utils.compat import patch_docstring __all__ = [ "balanced_tree", diff --git a/python/graphscope/experimental/nx/generators/community.py b/python/graphscope/nx/generators/community.py similarity index 90% rename from python/graphscope/experimental/nx/generators/community.py rename to python/graphscope/nx/generators/community.py index a8d80307da41..15846ad53dc0 100644 --- a/python/graphscope/experimental/nx/generators/community.py +++ b/python/graphscope/nx/generators/community.py @@ -18,6 +18,6 @@ import networkx.generators.community -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import import_as_graphscope_nx import_as_graphscope_nx(networkx.generators.community) diff --git a/python/graphscope/experimental/nx/generators/degree_seq.py b/python/graphscope/nx/generators/degree_seq.py similarity index 90% rename from python/graphscope/experimental/nx/generators/degree_seq.py rename to python/graphscope/nx/generators/degree_seq.py index b66183226395..ce8de3503319 100644 --- a/python/graphscope/experimental/nx/generators/degree_seq.py +++ b/python/graphscope/nx/generators/degree_seq.py @@ -18,6 +18,6 @@ import networkx.generators.degree_seq -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import import_as_graphscope_nx import_as_graphscope_nx(networkx.generators.degree_seq) diff --git a/python/graphscope/experimental/nx/generators/directed.py b/python/graphscope/nx/generators/directed.py similarity index 99% rename from python/graphscope/experimental/nx/generators/directed.py rename to python/graphscope/nx/generators/directed.py index 1241d4e7fc07..1255c2e24b8f 100644 --- a/python/graphscope/experimental/nx/generators/directed.py +++ b/python/graphscope/nx/generators/directed.py @@ -29,8 +29,8 @@ from networkx.utils import py_random_state from networkx.utils import weighted_choice -from graphscope.experimental import nx -from graphscope.experimental.nx.generators.classic import empty_graph +from graphscope import nx +from graphscope.nx.generators.classic import empty_graph __all__ = [ "gn_graph", diff --git a/python/graphscope/experimental/nx/generators/lattice.py b/python/graphscope/nx/generators/lattice.py similarity index 90% rename from python/graphscope/experimental/nx/generators/lattice.py rename to python/graphscope/nx/generators/lattice.py index c582585b954d..cc00a5c3705b 100644 --- a/python/graphscope/experimental/nx/generators/lattice.py +++ b/python/graphscope/nx/generators/lattice.py @@ -18,6 +18,6 @@ import networkx.generators.lattice -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import import_as_graphscope_nx import_as_graphscope_nx(networkx.generators.lattice) diff --git a/python/graphscope/experimental/nx/generators/line.py b/python/graphscope/nx/generators/line.py similarity index 90% rename from python/graphscope/experimental/nx/generators/line.py rename to python/graphscope/nx/generators/line.py index fa892c8f29d3..0fcf606c7e7a 100644 --- a/python/graphscope/experimental/nx/generators/line.py +++ b/python/graphscope/nx/generators/line.py @@ -18,6 +18,6 @@ import networkx.generators.line -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import import_as_graphscope_nx import_as_graphscope_nx(networkx.generators.line) diff --git a/python/graphscope/experimental/nx/generators/random_graphs.py b/python/graphscope/nx/generators/random_graphs.py similarity index 99% rename from python/graphscope/experimental/nx/generators/random_graphs.py rename to python/graphscope/nx/generators/random_graphs.py index cf543d21f4e0..155050e5ecc8 100644 --- a/python/graphscope/experimental/nx/generators/random_graphs.py +++ b/python/graphscope/nx/generators/random_graphs.py @@ -29,7 +29,7 @@ from networkx.utils import powerlaw_sequence from networkx.utils import py_random_state -from graphscope.experimental import nx +from graphscope import nx from .classic import complete_graph from .classic import empty_graph diff --git a/python/graphscope/experimental/nx/generators/small.py b/python/graphscope/nx/generators/small.py similarity index 90% rename from python/graphscope/experimental/nx/generators/small.py rename to python/graphscope/nx/generators/small.py index 0198db33ae9d..b8d869a41ed1 100644 --- a/python/graphscope/experimental/nx/generators/small.py +++ b/python/graphscope/nx/generators/small.py @@ -18,6 +18,6 @@ import networkx.generators.small -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import import_as_graphscope_nx import_as_graphscope_nx(networkx.generators.small) diff --git a/python/graphscope/experimental/nx/generators/social.py b/python/graphscope/nx/generators/social.py similarity index 90% rename from python/graphscope/experimental/nx/generators/social.py rename to python/graphscope/nx/generators/social.py index 2438bc93e4d2..b9fa043b23c6 100644 --- a/python/graphscope/experimental/nx/generators/social.py +++ b/python/graphscope/nx/generators/social.py @@ -18,6 +18,6 @@ import networkx.generators.social -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import import_as_graphscope_nx import_as_graphscope_nx(networkx.generators.social) diff --git a/python/graphscope/experimental/nx/generators/trees.py b/python/graphscope/nx/generators/trees.py similarity index 90% rename from python/graphscope/experimental/nx/generators/trees.py rename to python/graphscope/nx/generators/trees.py index 38bd38296b3c..484ec0d79c9a 100644 --- a/python/graphscope/experimental/nx/generators/trees.py +++ b/python/graphscope/nx/generators/trees.py @@ -18,6 +18,6 @@ import networkx.generators.trees -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import import_as_graphscope_nx import_as_graphscope_nx(networkx.generators.trees) diff --git a/python/graphscope/experimental/nx/readwrite/__init__.py b/python/graphscope/nx/readwrite/__init__.py similarity index 100% rename from python/graphscope/experimental/nx/readwrite/__init__.py rename to python/graphscope/nx/readwrite/__init__.py diff --git a/python/graphscope/experimental/nx/readwrite/adjlist.py b/python/graphscope/nx/readwrite/adjlist.py similarity index 94% rename from python/graphscope/experimental/nx/readwrite/adjlist.py rename to python/graphscope/nx/readwrite/adjlist.py index 037c87b41162..75d0dd56d2d7 100644 --- a/python/graphscope/experimental/nx/readwrite/adjlist.py +++ b/python/graphscope/nx/readwrite/adjlist.py @@ -24,9 +24,9 @@ from networkx.readwrite.adjlist import read_adjlist as _read_adjlist from networkx.utils.decorators import open_file -from graphscope.experimental import nx -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx -from graphscope.experimental.nx.utils.compat import patch_docstring +from graphscope import nx +from graphscope.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import patch_docstring import_as_graphscope_nx(networkx.readwrite.adjlist) diff --git a/python/graphscope/experimental/nx/readwrite/edgelist.py b/python/graphscope/nx/readwrite/edgelist.py similarity index 96% rename from python/graphscope/experimental/nx/readwrite/edgelist.py rename to python/graphscope/nx/readwrite/edgelist.py index 799074e6f3a7..fbf590ec8856 100644 --- a/python/graphscope/experimental/nx/readwrite/edgelist.py +++ b/python/graphscope/nx/readwrite/edgelist.py @@ -24,9 +24,9 @@ from networkx.readwrite.edgelist import read_edgelist as _read_edgelist from networkx.utils.decorators import open_file -from graphscope.experimental import nx -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx -from graphscope.experimental.nx.utils.compat import patch_docstring +from graphscope import nx +from graphscope.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import patch_docstring import_as_graphscope_nx(networkx.readwrite.edgelist) diff --git a/python/graphscope/experimental/nx/relabel.py b/python/graphscope/nx/relabel.py similarity index 87% rename from python/graphscope/experimental/nx/relabel.py rename to python/graphscope/nx/relabel.py index 6201c441224b..767edff0a075 100644 --- a/python/graphscope/experimental/nx/relabel.py +++ b/python/graphscope/nx/relabel.py @@ -22,7 +22,7 @@ import networkx.relabel -from graphscope.experimental import nx -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx +from graphscope import nx +from graphscope.nx.utils.compat import import_as_graphscope_nx import_as_graphscope_nx(networkx.relabel) diff --git a/python/graphscope/experimental/nx/tests/README b/python/graphscope/nx/tests/README similarity index 100% rename from python/graphscope/experimental/nx/tests/README rename to python/graphscope/nx/tests/README diff --git a/python/graphscope/experimental/__init__.py b/python/graphscope/nx/tests/__init__.py similarity index 100% rename from python/graphscope/experimental/__init__.py rename to python/graphscope/nx/tests/__init__.py diff --git a/python/graphscope/experimental/nx/tests/algorithms/builtin/test_bfs.py b/python/graphscope/nx/tests/algorithms/builtin/test_bfs.py similarity index 99% rename from python/graphscope/experimental/nx/tests/algorithms/builtin/test_bfs.py rename to python/graphscope/nx/tests/algorithms/builtin/test_bfs.py index 0da2478603de..78096cd5ec4e 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/builtin/test_bfs.py +++ b/python/graphscope/nx/tests/algorithms/builtin/test_bfs.py @@ -16,7 +16,7 @@ # import pytest -from graphscope.experimental import nx +from graphscope import nx @pytest.mark.usefixtures("graphscope_session") diff --git a/python/graphscope/experimental/nx/tests/algorithms/builtin/test_cluster.py b/python/graphscope/nx/tests/algorithms/builtin/test_cluster.py similarity index 99% rename from python/graphscope/experimental/nx/tests/algorithms/builtin/test_cluster.py rename to python/graphscope/nx/tests/algorithms/builtin/test_cluster.py index cce25fcaf4c0..d7c1a20d8797 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/builtin/test_cluster.py +++ b/python/graphscope/nx/tests/algorithms/builtin/test_cluster.py @@ -18,7 +18,7 @@ import pytest -from graphscope.experimental import nx +from graphscope import nx @pytest.mark.usefixtures("graphscope_session") diff --git a/python/graphscope/experimental/nx/tests/algorithms/builtin/test_core.py b/python/graphscope/nx/tests/algorithms/builtin/test_core.py similarity index 98% rename from python/graphscope/experimental/nx/tests/algorithms/builtin/test_core.py rename to python/graphscope/nx/tests/algorithms/builtin/test_core.py index 079865c3d855..fe0b59d2a42d 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/builtin/test_core.py +++ b/python/graphscope/nx/tests/algorithms/builtin/test_core.py @@ -18,8 +18,8 @@ import pytest -from graphscope.experimental import nx -from graphscope.experimental.nx.tests.utils import * +from graphscope import nx +from graphscope.nx.tests.utils import * class TestRunCore: diff --git a/python/graphscope/experimental/nx/tests/algorithms/builtin/test_ctx_builtin.py b/python/graphscope/nx/tests/algorithms/builtin/test_ctx_builtin.py similarity index 97% rename from python/graphscope/experimental/nx/tests/algorithms/builtin/test_ctx_builtin.py rename to python/graphscope/nx/tests/algorithms/builtin/test_ctx_builtin.py index 7ed97f94e2bc..3cfc8969f313 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/builtin/test_ctx_builtin.py +++ b/python/graphscope/nx/tests/algorithms/builtin/test_ctx_builtin.py @@ -5,9 +5,9 @@ import pytest import graphscope -from graphscope.experimental import nx -from graphscope.experimental.nx.tests.utils import almost_equal -from graphscope.experimental.nx.tests.utils import replace_with_inf +from graphscope import nx +from graphscope.nx.tests.utils import almost_equal +from graphscope.nx.tests.utils import replace_with_inf @pytest.mark.usefixtures("graphscope_session") diff --git a/python/graphscope/experimental/nx/tests/algorithms/builtin/test_degree_centrality.py b/python/graphscope/nx/tests/algorithms/builtin/test_degree_centrality.py similarity index 98% rename from python/graphscope/experimental/nx/tests/algorithms/builtin/test_degree_centrality.py rename to python/graphscope/nx/tests/algorithms/builtin/test_degree_centrality.py index 762aa0f12036..3b704001ee75 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/builtin/test_degree_centrality.py +++ b/python/graphscope/nx/tests/algorithms/builtin/test_degree_centrality.py @@ -19,8 +19,8 @@ """ import pytest -from graphscope.experimental import nx -from graphscope.experimental.nx.tests.utils import almost_equal +from graphscope import nx +from graphscope.nx.tests.utils import almost_equal @pytest.mark.usefixtures("graphscope_session") diff --git a/python/graphscope/experimental/nx/tests/algorithms/builtin/test_dfs.py b/python/graphscope/nx/tests/algorithms/builtin/test_dfs.py similarity index 99% rename from python/graphscope/experimental/nx/tests/algorithms/builtin/test_dfs.py rename to python/graphscope/nx/tests/algorithms/builtin/test_dfs.py index 1ab4ddb1cb98..9922133b19d3 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/builtin/test_dfs.py +++ b/python/graphscope/nx/tests/algorithms/builtin/test_dfs.py @@ -18,7 +18,7 @@ import pytest -from graphscope.experimental import nx +from graphscope import nx @pytest.mark.usefixtures("graphscope_session") diff --git a/python/graphscope/experimental/nx/tests/algorithms/builtin/test_eigenvector_centrality.py b/python/graphscope/nx/tests/algorithms/builtin/test_eigenvector_centrality.py similarity index 98% rename from python/graphscope/experimental/nx/tests/algorithms/builtin/test_eigenvector_centrality.py rename to python/graphscope/nx/tests/algorithms/builtin/test_eigenvector_centrality.py index 91957e4f7fe1..7886a2906899 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/builtin/test_eigenvector_centrality.py +++ b/python/graphscope/nx/tests/algorithms/builtin/test_eigenvector_centrality.py @@ -22,8 +22,8 @@ np = pytest.importorskip("numpy") scipy = pytest.importorskip("scipy") -from graphscope.experimental import nx -from graphscope.experimental.nx.tests.utils import almost_equal +from graphscope import nx +from graphscope.nx.tests.utils import almost_equal @pytest.mark.usefixtures("graphscope_session") diff --git a/python/graphscope/experimental/nx/tests/algorithms/builtin/test_hits.py b/python/graphscope/nx/tests/algorithms/builtin/test_hits.py similarity index 96% rename from python/graphscope/experimental/nx/tests/algorithms/builtin/test_hits.py rename to python/graphscope/nx/tests/algorithms/builtin/test_hits.py index 2f7e216f51ce..b6072eb19465 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/builtin/test_hits.py +++ b/python/graphscope/nx/tests/algorithms/builtin/test_hits.py @@ -17,8 +17,8 @@ # import pytest -from graphscope.experimental import nx -from graphscope.experimental.nx.tests.utils import almost_equal +from graphscope import nx +from graphscope.nx.tests.utils import almost_equal # Example from # A. Langville and C. Meyer, "A survey of eigenvector methods of web diff --git a/python/graphscope/experimental/nx/tests/algorithms/builtin/test_katz_centrality.py b/python/graphscope/nx/tests/algorithms/builtin/test_katz_centrality.py similarity index 99% rename from python/graphscope/experimental/nx/tests/algorithms/builtin/test_katz_centrality.py rename to python/graphscope/nx/tests/algorithms/builtin/test_katz_centrality.py index 778a8aaed111..82eaaecc0dbb 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/builtin/test_katz_centrality.py +++ b/python/graphscope/nx/tests/algorithms/builtin/test_katz_centrality.py @@ -19,8 +19,8 @@ import pytest -from graphscope.experimental import nx -from graphscope.experimental.nx.tests.utils import almost_equal +from graphscope import nx +from graphscope.nx.tests.utils import almost_equal @pytest.mark.usefixtures("graphscope_session") diff --git a/python/graphscope/experimental/nx/tests/algorithms/builtin/test_pagerank.py b/python/graphscope/nx/tests/algorithms/builtin/test_pagerank.py similarity index 98% rename from python/graphscope/experimental/nx/tests/algorithms/builtin/test_pagerank.py rename to python/graphscope/nx/tests/algorithms/builtin/test_pagerank.py index e2ff843d6a70..9ba547257815 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/builtin/test_pagerank.py +++ b/python/graphscope/nx/tests/algorithms/builtin/test_pagerank.py @@ -20,12 +20,12 @@ import pytest -from graphscope.experimental import nx +from graphscope import nx numpy = pytest.importorskip("numpy") scipy = pytest.importorskip("scipy") -from graphscope.experimental.nx.tests.utils import almost_equal +from graphscope.nx.tests.utils import almost_equal # Example from # A. Langville and C. Meyer, "A survey of eigenvector methods of web diff --git a/python/graphscope/experimental/nx/tests/algorithms/builtin/test_shortest_paths.py b/python/graphscope/nx/tests/algorithms/builtin/test_shortest_paths.py similarity index 95% rename from python/graphscope/experimental/nx/tests/algorithms/builtin/test_shortest_paths.py rename to python/graphscope/nx/tests/algorithms/builtin/test_shortest_paths.py index bcf4f2c24e6b..134c0fd8297b 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/builtin/test_shortest_paths.py +++ b/python/graphscope/nx/tests/algorithms/builtin/test_shortest_paths.py @@ -1,7 +1,7 @@ import pytest -from graphscope.experimental import nx -from graphscope.experimental.nx.tests.utils import replace_with_inf +from graphscope import nx +from graphscope.nx.tests.utils import replace_with_inf class TestRunGenericPath: diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/__init__.py b/python/graphscope/nx/tests/algorithms/forward/__init__.py similarity index 100% rename from python/graphscope/experimental/nx/tests/algorithms/forward/__init__.py rename to python/graphscope/nx/tests/algorithms/forward/__init__.py diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/approximation/__init__.py b/python/graphscope/nx/tests/algorithms/forward/approximation/__init__.py similarity index 100% rename from python/graphscope/experimental/nx/tests/algorithms/forward/approximation/__init__.py rename to python/graphscope/nx/tests/algorithms/forward/approximation/__init__.py diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/approximation/test_approx_clust_coeff.py b/python/graphscope/nx/tests/algorithms/forward/approximation/test_approx_clust_coeff.py similarity index 77% rename from python/graphscope/experimental/nx/tests/algorithms/forward/approximation/test_approx_clust_coeff.py rename to python/graphscope/nx/tests/algorithms/forward/approximation/test_approx_clust_coeff.py index e2d13431372e..d3ca4cb7d3a3 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/approximation/test_approx_clust_coeff.py +++ b/python/graphscope/nx/tests/algorithms/forward/approximation/test_approx_clust_coeff.py @@ -1,7 +1,7 @@ import networkx.algorithms.approximation.tests.test_approx_clust_coeff import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import import_as_graphscope_nx import_as_graphscope_nx(networkx.algorithms.approximation.tests.test_approx_clust_coeff, decorators=pytest.mark.usefixtures("graphscope_session")) diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/approximation/test_clique.py b/python/graphscope/nx/tests/algorithms/forward/approximation/test_clique.py similarity index 75% rename from python/graphscope/experimental/nx/tests/algorithms/forward/approximation/test_clique.py rename to python/graphscope/nx/tests/algorithms/forward/approximation/test_clique.py index 7b474e3fcf62..3003b25cddcf 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/approximation/test_clique.py +++ b/python/graphscope/nx/tests/algorithms/forward/approximation/test_clique.py @@ -1,7 +1,7 @@ import networkx.algorithms.approximation.tests.test_clique import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import import_as_graphscope_nx import_as_graphscope_nx(networkx.algorithms.approximation.tests.test_clique, decorators=pytest.mark.usefixtures("graphscope_session")) diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/approximation/test_connectivity.py b/python/graphscope/nx/tests/algorithms/forward/approximation/test_connectivity.py similarity index 76% rename from python/graphscope/experimental/nx/tests/algorithms/forward/approximation/test_connectivity.py rename to python/graphscope/nx/tests/algorithms/forward/approximation/test_connectivity.py index 7d6d9e0fc628..692c6958edf0 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/approximation/test_connectivity.py +++ b/python/graphscope/nx/tests/algorithms/forward/approximation/test_connectivity.py @@ -1,7 +1,7 @@ import networkx.algorithms.approximation.tests.test_connectivity import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import import_as_graphscope_nx import_as_graphscope_nx(networkx.algorithms.approximation.tests.test_connectivity, decorators=pytest.mark.usefixtures("graphscope_session")) diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/approximation/test_dominating_set.py b/python/graphscope/nx/tests/algorithms/forward/approximation/test_dominating_set.py similarity index 76% rename from python/graphscope/experimental/nx/tests/algorithms/forward/approximation/test_dominating_set.py rename to python/graphscope/nx/tests/algorithms/forward/approximation/test_dominating_set.py index a1cc0a199e46..c3dd37e3df4b 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/approximation/test_dominating_set.py +++ b/python/graphscope/nx/tests/algorithms/forward/approximation/test_dominating_set.py @@ -1,7 +1,7 @@ import networkx.algorithms.approximation.tests.test_dominating_set import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import import_as_graphscope_nx import_as_graphscope_nx(networkx.algorithms.approximation.tests.test_dominating_set, decorators=pytest.mark.usefixtures("graphscope_session")) diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/approximation/test_independent_set.py b/python/graphscope/nx/tests/algorithms/forward/approximation/test_independent_set.py similarity index 76% rename from python/graphscope/experimental/nx/tests/algorithms/forward/approximation/test_independent_set.py rename to python/graphscope/nx/tests/algorithms/forward/approximation/test_independent_set.py index 44a8f9fb485b..f48e6ca4ad1e 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/approximation/test_independent_set.py +++ b/python/graphscope/nx/tests/algorithms/forward/approximation/test_independent_set.py @@ -1,7 +1,7 @@ import networkx.algorithms.approximation.tests.test_independent_set import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import import_as_graphscope_nx import_as_graphscope_nx(networkx.algorithms.approximation.tests.test_independent_set, decorators=pytest.mark.usefixtures("graphscope_session")) diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/approximation/test_kcomponents.py b/python/graphscope/nx/tests/algorithms/forward/approximation/test_kcomponents.py similarity index 76% rename from python/graphscope/experimental/nx/tests/algorithms/forward/approximation/test_kcomponents.py rename to python/graphscope/nx/tests/algorithms/forward/approximation/test_kcomponents.py index 81aa7d51b944..34914c98e74a 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/approximation/test_kcomponents.py +++ b/python/graphscope/nx/tests/algorithms/forward/approximation/test_kcomponents.py @@ -1,7 +1,7 @@ import networkx.algorithms.approximation.tests.test_kcomponents import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import import_as_graphscope_nx import_as_graphscope_nx(networkx.algorithms.approximation.tests.test_kcomponents, decorators=pytest.mark.usefixtures("graphscope_session")) diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/approximation/test_matching.py b/python/graphscope/nx/tests/algorithms/forward/approximation/test_matching.py similarity index 75% rename from python/graphscope/experimental/nx/tests/algorithms/forward/approximation/test_matching.py rename to python/graphscope/nx/tests/algorithms/forward/approximation/test_matching.py index 2f7efc0c20bc..faf124763a59 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/approximation/test_matching.py +++ b/python/graphscope/nx/tests/algorithms/forward/approximation/test_matching.py @@ -1,7 +1,7 @@ import networkx.algorithms.approximation.tests.test_matching import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import import_as_graphscope_nx import_as_graphscope_nx(networkx.algorithms.approximation.tests.test_matching, decorators=pytest.mark.usefixtures("graphscope_session")) diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/approximation/test_ramsey.py b/python/graphscope/nx/tests/algorithms/forward/approximation/test_ramsey.py similarity index 75% rename from python/graphscope/experimental/nx/tests/algorithms/forward/approximation/test_ramsey.py rename to python/graphscope/nx/tests/algorithms/forward/approximation/test_ramsey.py index 5eb8529f3359..4c66e7e19517 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/approximation/test_ramsey.py +++ b/python/graphscope/nx/tests/algorithms/forward/approximation/test_ramsey.py @@ -1,7 +1,7 @@ import networkx.algorithms.approximation.tests.test_ramsey import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import import_as_graphscope_nx import_as_graphscope_nx(networkx.algorithms.approximation.tests.test_ramsey, decorators=pytest.mark.usefixtures("graphscope_session")) diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/approximation/test_steinertree.py b/python/graphscope/nx/tests/algorithms/forward/approximation/test_steinertree.py similarity index 78% rename from python/graphscope/experimental/nx/tests/algorithms/forward/approximation/test_steinertree.py rename to python/graphscope/nx/tests/algorithms/forward/approximation/test_steinertree.py index 2779f9c4feb9..1bad88be6597 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/approximation/test_steinertree.py +++ b/python/graphscope/nx/tests/algorithms/forward/approximation/test_steinertree.py @@ -1,8 +1,8 @@ import networkx.algorithms.approximation.tests.test_steinertree import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx -from graphscope.experimental.nx.utils.compat import with_graphscope_nx_context +from graphscope.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import with_graphscope_nx_context import_as_graphscope_nx(networkx.algorithms.approximation.tests.test_steinertree, decorators=pytest.mark.usefixtures("graphscope_session")) diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/approximation/test_treewidth.py b/python/graphscope/nx/tests/algorithms/forward/approximation/test_treewidth.py similarity index 75% rename from python/graphscope/experimental/nx/tests/algorithms/forward/approximation/test_treewidth.py rename to python/graphscope/nx/tests/algorithms/forward/approximation/test_treewidth.py index ad7c454cb10d..7e75cd867570 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/approximation/test_treewidth.py +++ b/python/graphscope/nx/tests/algorithms/forward/approximation/test_treewidth.py @@ -1,7 +1,7 @@ import networkx.algorithms.approximation.tests.test_treewidth import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import import_as_graphscope_nx import_as_graphscope_nx(networkx.algorithms.approximation.tests.test_treewidth, decorators=pytest.mark.usefixtures("graphscope_session")) diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/approximation/test_vertex_cover.py b/python/graphscope/nx/tests/algorithms/forward/approximation/test_vertex_cover.py similarity index 76% rename from python/graphscope/experimental/nx/tests/algorithms/forward/approximation/test_vertex_cover.py rename to python/graphscope/nx/tests/algorithms/forward/approximation/test_vertex_cover.py index 54882d105042..4af998c5d96e 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/approximation/test_vertex_cover.py +++ b/python/graphscope/nx/tests/algorithms/forward/approximation/test_vertex_cover.py @@ -1,7 +1,7 @@ import networkx.algorithms.approximation.tests.test_vertex_cover import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import import_as_graphscope_nx import_as_graphscope_nx(networkx.algorithms.approximation.tests.test_vertex_cover, decorators=pytest.mark.usefixtures("graphscope_session")) diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/assortativity/__init__.py b/python/graphscope/nx/tests/algorithms/forward/assortativity/__init__.py similarity index 100% rename from python/graphscope/experimental/nx/tests/algorithms/forward/assortativity/__init__.py rename to python/graphscope/nx/tests/algorithms/forward/assortativity/__init__.py diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/assortativity/base_test.py b/python/graphscope/nx/tests/algorithms/forward/assortativity/base_test.py similarity index 97% rename from python/graphscope/experimental/nx/tests/algorithms/forward/assortativity/base_test.py rename to python/graphscope/nx/tests/algorithms/forward/assortativity/base_test.py index 84d767bbf0a6..9fd89404fae7 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/assortativity/base_test.py +++ b/python/graphscope/nx/tests/algorithms/forward/assortativity/base_test.py @@ -18,7 +18,7 @@ import pytest -import graphscope.experimental.nx as nx +import graphscope.nx as nx class BaseTestAttributeMixing: diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/assortativity/test_connectivity.py b/python/graphscope/nx/tests/algorithms/forward/assortativity/test_connectivity.py similarity index 76% rename from python/graphscope/experimental/nx/tests/algorithms/forward/assortativity/test_connectivity.py rename to python/graphscope/nx/tests/algorithms/forward/assortativity/test_connectivity.py index 3bf2bbab4d67..5b211addeb38 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/assortativity/test_connectivity.py +++ b/python/graphscope/nx/tests/algorithms/forward/assortativity/test_connectivity.py @@ -1,7 +1,7 @@ import networkx.algorithms.assortativity.tests.test_connectivity import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import import_as_graphscope_nx import_as_graphscope_nx(networkx.algorithms.assortativity.tests.test_connectivity, decorators=pytest.mark.usefixtures("graphscope_session")) diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/assortativity/test_correlation.py b/python/graphscope/nx/tests/algorithms/forward/assortativity/test_correlation.py similarity index 88% rename from python/graphscope/experimental/nx/tests/algorithms/forward/assortativity/test_correlation.py rename to python/graphscope/nx/tests/algorithms/forward/assortativity/test_correlation.py index ef6bc478c2ae..262ad37c3336 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/assortativity/test_correlation.py +++ b/python/graphscope/nx/tests/algorithms/forward/assortativity/test_correlation.py @@ -1,8 +1,8 @@ import networkx.algorithms.assortativity.tests.test_correlation import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx -from graphscope.experimental.nx.utils.compat import with_graphscope_nx_context +from graphscope.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import with_graphscope_nx_context import_as_graphscope_nx(networkx.algorithms.assortativity.tests.test_correlation, decorators=pytest.mark.usefixtures("graphscope_session")) diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/assortativity/test_mixing.py b/python/graphscope/nx/tests/algorithms/forward/assortativity/test_mixing.py similarity index 90% rename from python/graphscope/experimental/nx/tests/algorithms/forward/assortativity/test_mixing.py rename to python/graphscope/nx/tests/algorithms/forward/assortativity/test_mixing.py index 51fa62c3a8bb..426d7f099ae9 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/assortativity/test_mixing.py +++ b/python/graphscope/nx/tests/algorithms/forward/assortativity/test_mixing.py @@ -1,8 +1,8 @@ import networkx.algorithms.assortativity.tests.test_mixing import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx -from graphscope.experimental.nx.utils.compat import with_graphscope_nx_context +from graphscope.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import with_graphscope_nx_context import_as_graphscope_nx(networkx.algorithms.assortativity.tests.test_mixing, decorators=pytest.mark.usefixtures("graphscope_session")) diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/assortativity/test_neighbor_degree.py b/python/graphscope/nx/tests/algorithms/forward/assortativity/test_neighbor_degree.py similarity index 76% rename from python/graphscope/experimental/nx/tests/algorithms/forward/assortativity/test_neighbor_degree.py rename to python/graphscope/nx/tests/algorithms/forward/assortativity/test_neighbor_degree.py index 66ab27566d23..169c390eaa14 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/assortativity/test_neighbor_degree.py +++ b/python/graphscope/nx/tests/algorithms/forward/assortativity/test_neighbor_degree.py @@ -1,7 +1,7 @@ import networkx.algorithms.assortativity.tests.test_neighbor_degree import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import import_as_graphscope_nx import_as_graphscope_nx(networkx.algorithms.assortativity.tests.test_neighbor_degree, decorators=pytest.mark.usefixtures("graphscope_session")) diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/assortativity/test_pairs.py b/python/graphscope/nx/tests/algorithms/forward/assortativity/test_pairs.py similarity index 86% rename from python/graphscope/experimental/nx/tests/algorithms/forward/assortativity/test_pairs.py rename to python/graphscope/nx/tests/algorithms/forward/assortativity/test_pairs.py index 89f4823fdb26..64bc7fc3dc14 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/assortativity/test_pairs.py +++ b/python/graphscope/nx/tests/algorithms/forward/assortativity/test_pairs.py @@ -1,8 +1,8 @@ import networkx.algorithms.assortativity.tests.test_pairs import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx -from graphscope.experimental.nx.utils.compat import with_graphscope_nx_context +from graphscope.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import with_graphscope_nx_context import_as_graphscope_nx(networkx.algorithms.assortativity.tests.test_pairs, decorators=pytest.mark.usefixtures("graphscope_session")) diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/bipartite/__init__.py b/python/graphscope/nx/tests/algorithms/forward/bipartite/__init__.py similarity index 100% rename from python/graphscope/experimental/nx/tests/algorithms/forward/bipartite/__init__.py rename to python/graphscope/nx/tests/algorithms/forward/bipartite/__init__.py diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/bipartite/test_basic.py b/python/graphscope/nx/tests/algorithms/forward/bipartite/test_basic.py similarity index 74% rename from python/graphscope/experimental/nx/tests/algorithms/forward/bipartite/test_basic.py rename to python/graphscope/nx/tests/algorithms/forward/bipartite/test_basic.py index 440fae29c1be..ce5ee81775e0 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/bipartite/test_basic.py +++ b/python/graphscope/nx/tests/algorithms/forward/bipartite/test_basic.py @@ -1,7 +1,7 @@ import networkx.algorithms.bipartite.tests.test_basic import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import import_as_graphscope_nx import_as_graphscope_nx(networkx.algorithms.bipartite.tests.test_basic, decorators=pytest.mark.usefixtures("graphscope_session")) diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/bipartite/test_centrality.py b/python/graphscope/nx/tests/algorithms/forward/bipartite/test_centrality.py similarity index 75% rename from python/graphscope/experimental/nx/tests/algorithms/forward/bipartite/test_centrality.py rename to python/graphscope/nx/tests/algorithms/forward/bipartite/test_centrality.py index 7679e31d55ef..1dc330b982ce 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/bipartite/test_centrality.py +++ b/python/graphscope/nx/tests/algorithms/forward/bipartite/test_centrality.py @@ -1,7 +1,7 @@ import networkx.algorithms.bipartite.tests.test_centrality import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import import_as_graphscope_nx import_as_graphscope_nx(networkx.algorithms.bipartite.tests.test_centrality, decorators=pytest.mark.usefixtures("graphscope_session")) diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/bipartite/test_cluster.py b/python/graphscope/nx/tests/algorithms/forward/bipartite/test_cluster.py similarity index 75% rename from python/graphscope/experimental/nx/tests/algorithms/forward/bipartite/test_cluster.py rename to python/graphscope/nx/tests/algorithms/forward/bipartite/test_cluster.py index 3ee6aa953e31..6caeea5db09b 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/bipartite/test_cluster.py +++ b/python/graphscope/nx/tests/algorithms/forward/bipartite/test_cluster.py @@ -1,7 +1,7 @@ import networkx.algorithms.bipartite.tests.test_cluster import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import import_as_graphscope_nx import_as_graphscope_nx(networkx.algorithms.bipartite.tests.test_cluster, decorators=pytest.mark.usefixtures("graphscope_session")) diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/bipartite/test_covering.py b/python/graphscope/nx/tests/algorithms/forward/bipartite/test_covering.py similarity index 75% rename from python/graphscope/experimental/nx/tests/algorithms/forward/bipartite/test_covering.py rename to python/graphscope/nx/tests/algorithms/forward/bipartite/test_covering.py index 68b7519a616e..f7aabe0e5272 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/bipartite/test_covering.py +++ b/python/graphscope/nx/tests/algorithms/forward/bipartite/test_covering.py @@ -1,7 +1,7 @@ import networkx.algorithms.bipartite.tests.test_covering import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import import_as_graphscope_nx import_as_graphscope_nx(networkx.algorithms.bipartite.tests.test_covering, decorators=pytest.mark.usefixtures("graphscope_session")) diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/bipartite/test_edgelist.py b/python/graphscope/nx/tests/algorithms/forward/bipartite/test_edgelist.py similarity index 88% rename from python/graphscope/experimental/nx/tests/algorithms/forward/bipartite/test_edgelist.py rename to python/graphscope/nx/tests/algorithms/forward/bipartite/test_edgelist.py index d4163ee8d974..019595327ed4 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/bipartite/test_edgelist.py +++ b/python/graphscope/nx/tests/algorithms/forward/bipartite/test_edgelist.py @@ -1,8 +1,8 @@ import networkx.algorithms.bipartite.tests.test_edgelist import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx -from graphscope.experimental.nx.utils.compat import with_graphscope_nx_context +from graphscope.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import with_graphscope_nx_context import_as_graphscope_nx(networkx.algorithms.bipartite.tests.test_edgelist, decorators=pytest.mark.usefixtures("graphscope_session")) diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/bipartite/test_generators.py b/python/graphscope/nx/tests/algorithms/forward/bipartite/test_generators.py similarity index 97% rename from python/graphscope/experimental/nx/tests/algorithms/forward/bipartite/test_generators.py rename to python/graphscope/nx/tests/algorithms/forward/bipartite/test_generators.py index 7936bd19a2db..bbf97ebfdc37 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/bipartite/test_generators.py +++ b/python/graphscope/nx/tests/algorithms/forward/bipartite/test_generators.py @@ -17,8 +17,8 @@ import networkx.algorithms.bipartite.tests.test_generators import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx -from graphscope.experimental.nx.utils.compat import with_graphscope_nx_context +from graphscope.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import with_graphscope_nx_context import_as_graphscope_nx(networkx.algorithms.bipartite.tests.test_generators, decorators=pytest.mark.usefixtures("graphscope_session")) diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/bipartite/test_matching.py b/python/graphscope/nx/tests/algorithms/forward/bipartite/test_matching.py similarity index 85% rename from python/graphscope/experimental/nx/tests/algorithms/forward/bipartite/test_matching.py rename to python/graphscope/nx/tests/algorithms/forward/bipartite/test_matching.py index b0060221a7f4..9e982ff4b6db 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/bipartite/test_matching.py +++ b/python/graphscope/nx/tests/algorithms/forward/bipartite/test_matching.py @@ -1,8 +1,8 @@ import networkx.algorithms.bipartite.tests.test_matching import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx -from graphscope.experimental.nx.utils.compat import with_graphscope_nx_context +from graphscope.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import with_graphscope_nx_context import_as_graphscope_nx(networkx.algorithms.bipartite.tests.test_matching, decorators=pytest.mark.usefixtures("graphscope_session")) diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/bipartite/test_matrix.py b/python/graphscope/nx/tests/algorithms/forward/bipartite/test_matrix.py similarity index 78% rename from python/graphscope/experimental/nx/tests/algorithms/forward/bipartite/test_matrix.py rename to python/graphscope/nx/tests/algorithms/forward/bipartite/test_matrix.py index 8ca59c6e72f3..800da18cdde7 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/bipartite/test_matrix.py +++ b/python/graphscope/nx/tests/algorithms/forward/bipartite/test_matrix.py @@ -1,8 +1,8 @@ import networkx.algorithms.bipartite.tests.test_matrix import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx -from graphscope.experimental.nx.utils.compat import with_graphscope_nx_context +from graphscope.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import with_graphscope_nx_context import_as_graphscope_nx(networkx.algorithms.bipartite.tests.test_matrix, decorators=pytest.mark.usefixtures("graphscope_session")) diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/bipartite/test_project.py b/python/graphscope/nx/tests/algorithms/forward/bipartite/test_project.py similarity index 75% rename from python/graphscope/experimental/nx/tests/algorithms/forward/bipartite/test_project.py rename to python/graphscope/nx/tests/algorithms/forward/bipartite/test_project.py index f270896629cf..6fea36450887 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/bipartite/test_project.py +++ b/python/graphscope/nx/tests/algorithms/forward/bipartite/test_project.py @@ -1,7 +1,7 @@ import networkx.algorithms.bipartite.tests.test_project import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import import_as_graphscope_nx import_as_graphscope_nx(networkx.algorithms.bipartite.tests.test_project, decorators=pytest.mark.usefixtures("graphscope_session")) diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/bipartite/test_redundancy.py b/python/graphscope/nx/tests/algorithms/forward/bipartite/test_redundancy.py similarity index 75% rename from python/graphscope/experimental/nx/tests/algorithms/forward/bipartite/test_redundancy.py rename to python/graphscope/nx/tests/algorithms/forward/bipartite/test_redundancy.py index 67af026aef56..c0a70024ded0 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/bipartite/test_redundancy.py +++ b/python/graphscope/nx/tests/algorithms/forward/bipartite/test_redundancy.py @@ -1,7 +1,7 @@ import networkx.algorithms.bipartite.tests.test_redundancy import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import import_as_graphscope_nx import_as_graphscope_nx(networkx.algorithms.bipartite.tests.test_redundancy, decorators=pytest.mark.usefixtures("graphscope_session")) diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/bipartite/test_spectral_bipartivity.py b/python/graphscope/nx/tests/algorithms/forward/bipartite/test_spectral_bipartivity.py similarity index 76% rename from python/graphscope/experimental/nx/tests/algorithms/forward/bipartite/test_spectral_bipartivity.py rename to python/graphscope/nx/tests/algorithms/forward/bipartite/test_spectral_bipartivity.py index 60fe1539583f..e4c1e35aa8c4 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/bipartite/test_spectral_bipartivity.py +++ b/python/graphscope/nx/tests/algorithms/forward/bipartite/test_spectral_bipartivity.py @@ -1,7 +1,7 @@ import networkx.algorithms.bipartite.tests.test_spectral_bipartivity import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import import_as_graphscope_nx import_as_graphscope_nx(networkx.algorithms.bipartite.tests.test_spectral_bipartivity, decorators=pytest.mark.usefixtures("graphscope_session")) diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/centrality/__init__.py b/python/graphscope/nx/tests/algorithms/forward/centrality/__init__.py similarity index 100% rename from python/graphscope/experimental/nx/tests/algorithms/forward/centrality/__init__.py rename to python/graphscope/nx/tests/algorithms/forward/centrality/__init__.py diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/centrality/test_betweenness_centrality.py b/python/graphscope/nx/tests/algorithms/forward/centrality/test_betweenness_centrality.py similarity index 76% rename from python/graphscope/experimental/nx/tests/algorithms/forward/centrality/test_betweenness_centrality.py rename to python/graphscope/nx/tests/algorithms/forward/centrality/test_betweenness_centrality.py index 596106ab557d..310bd5928c7d 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/centrality/test_betweenness_centrality.py +++ b/python/graphscope/nx/tests/algorithms/forward/centrality/test_betweenness_centrality.py @@ -1,7 +1,7 @@ import networkx.algorithms.centrality.tests.test_betweenness_centrality import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import import_as_graphscope_nx import_as_graphscope_nx( networkx.algorithms.centrality.tests.test_betweenness_centrality, diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/centrality/test_betweenness_centrality_subset.py b/python/graphscope/nx/tests/algorithms/forward/centrality/test_betweenness_centrality_subset.py similarity index 77% rename from python/graphscope/experimental/nx/tests/algorithms/forward/centrality/test_betweenness_centrality_subset.py rename to python/graphscope/nx/tests/algorithms/forward/centrality/test_betweenness_centrality_subset.py index 4eb788331e5e..2a05f5f90edc 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/centrality/test_betweenness_centrality_subset.py +++ b/python/graphscope/nx/tests/algorithms/forward/centrality/test_betweenness_centrality_subset.py @@ -1,7 +1,7 @@ import networkx.algorithms.centrality.tests.test_betweenness_centrality_subset import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import import_as_graphscope_nx import_as_graphscope_nx( networkx.algorithms.centrality.tests.test_betweenness_centrality_subset, diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/centrality/test_closeness_centrality.py b/python/graphscope/nx/tests/algorithms/forward/centrality/test_closeness_centrality.py similarity index 77% rename from python/graphscope/experimental/nx/tests/algorithms/forward/centrality/test_closeness_centrality.py rename to python/graphscope/nx/tests/algorithms/forward/centrality/test_closeness_centrality.py index 1db8c4f1b8ea..514c70c0cae1 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/centrality/test_closeness_centrality.py +++ b/python/graphscope/nx/tests/algorithms/forward/centrality/test_closeness_centrality.py @@ -1,7 +1,7 @@ import networkx.algorithms.centrality.tests.test_closeness_centrality import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import import_as_graphscope_nx import_as_graphscope_nx(networkx.algorithms.centrality.tests.test_closeness_centrality, decorators=pytest.mark.usefixtures("graphscope_session")) diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/centrality/test_current_flow_betweenness_centrality.py b/python/graphscope/nx/tests/algorithms/forward/centrality/test_current_flow_betweenness_centrality.py similarity index 78% rename from python/graphscope/experimental/nx/tests/algorithms/forward/centrality/test_current_flow_betweenness_centrality.py rename to python/graphscope/nx/tests/algorithms/forward/centrality/test_current_flow_betweenness_centrality.py index 13b1f4579f50..78ab8b421368 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/centrality/test_current_flow_betweenness_centrality.py +++ b/python/graphscope/nx/tests/algorithms/forward/centrality/test_current_flow_betweenness_centrality.py @@ -1,7 +1,7 @@ import networkx.algorithms.centrality.tests.test_current_flow_betweenness_centrality import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import import_as_graphscope_nx import_as_graphscope_nx( networkx.algorithms.centrality.tests.test_current_flow_betweenness_centrality, diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/centrality/test_current_flow_betweenness_centrality_subset.py b/python/graphscope/nx/tests/algorithms/forward/centrality/test_current_flow_betweenness_centrality_subset.py similarity index 81% rename from python/graphscope/experimental/nx/tests/algorithms/forward/centrality/test_current_flow_betweenness_centrality_subset.py rename to python/graphscope/nx/tests/algorithms/forward/centrality/test_current_flow_betweenness_centrality_subset.py index 167a1905012a..81163f09f46c 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/centrality/test_current_flow_betweenness_centrality_subset.py +++ b/python/graphscope/nx/tests/algorithms/forward/centrality/test_current_flow_betweenness_centrality_subset.py @@ -1,7 +1,7 @@ import networkx.algorithms.centrality.tests.test_current_flow_betweenness_centrality_subset import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import import_as_graphscope_nx import_as_graphscope_nx(networkx.algorithms.centrality.tests. test_current_flow_betweenness_centrality_subset, diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/centrality/test_current_flow_closeness.py b/python/graphscope/nx/tests/algorithms/forward/centrality/test_current_flow_closeness.py similarity index 76% rename from python/graphscope/experimental/nx/tests/algorithms/forward/centrality/test_current_flow_closeness.py rename to python/graphscope/nx/tests/algorithms/forward/centrality/test_current_flow_closeness.py index 19e25f780b9d..83debedbcc76 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/centrality/test_current_flow_closeness.py +++ b/python/graphscope/nx/tests/algorithms/forward/centrality/test_current_flow_closeness.py @@ -1,7 +1,7 @@ import networkx.algorithms.centrality.tests.test_current_flow_closeness import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import import_as_graphscope_nx import_as_graphscope_nx( networkx.algorithms.centrality.tests.test_current_flow_closeness, diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/centrality/test_degree_centrality.py b/python/graphscope/nx/tests/algorithms/forward/centrality/test_degree_centrality.py similarity index 76% rename from python/graphscope/experimental/nx/tests/algorithms/forward/centrality/test_degree_centrality.py rename to python/graphscope/nx/tests/algorithms/forward/centrality/test_degree_centrality.py index a79268058e30..b8360e6723da 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/centrality/test_degree_centrality.py +++ b/python/graphscope/nx/tests/algorithms/forward/centrality/test_degree_centrality.py @@ -1,7 +1,7 @@ import networkx.algorithms.centrality.tests.test_degree_centrality import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import import_as_graphscope_nx import_as_graphscope_nx(networkx.algorithms.centrality.tests.test_degree_centrality, decorators=pytest.mark.usefixtures("graphscope_session")) diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/centrality/test_dispersion.py b/python/graphscope/nx/tests/algorithms/forward/centrality/test_dispersion.py similarity index 75% rename from python/graphscope/experimental/nx/tests/algorithms/forward/centrality/test_dispersion.py rename to python/graphscope/nx/tests/algorithms/forward/centrality/test_dispersion.py index d025b50c51ec..cf96426b4ae6 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/centrality/test_dispersion.py +++ b/python/graphscope/nx/tests/algorithms/forward/centrality/test_dispersion.py @@ -1,7 +1,7 @@ import networkx.algorithms.centrality.tests.test_dispersion import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import import_as_graphscope_nx import_as_graphscope_nx(networkx.algorithms.centrality.tests.test_dispersion, decorators=pytest.mark.usefixtures("graphscope_session")) diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/centrality/test_eigenvector_centrality.py b/python/graphscope/nx/tests/algorithms/forward/centrality/test_eigenvector_centrality.py similarity index 82% rename from python/graphscope/experimental/nx/tests/algorithms/forward/centrality/test_eigenvector_centrality.py rename to python/graphscope/nx/tests/algorithms/forward/centrality/test_eigenvector_centrality.py index 2e6314537d7f..1efb145f4364 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/centrality/test_eigenvector_centrality.py +++ b/python/graphscope/nx/tests/algorithms/forward/centrality/test_eigenvector_centrality.py @@ -1,8 +1,8 @@ import networkx.algorithms.centrality.tests.test_eigenvector_centrality import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx -from graphscope.experimental.nx.utils.compat import with_graphscope_nx_context +from graphscope.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import with_graphscope_nx_context import_as_graphscope_nx( networkx.algorithms.centrality.tests.test_eigenvector_centrality, diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/centrality/test_group.py b/python/graphscope/nx/tests/algorithms/forward/centrality/test_group.py similarity index 74% rename from python/graphscope/experimental/nx/tests/algorithms/forward/centrality/test_group.py rename to python/graphscope/nx/tests/algorithms/forward/centrality/test_group.py index 5654355833df..70a87647e36f 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/centrality/test_group.py +++ b/python/graphscope/nx/tests/algorithms/forward/centrality/test_group.py @@ -1,7 +1,7 @@ import networkx.algorithms.centrality.tests.test_group import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import import_as_graphscope_nx import_as_graphscope_nx(networkx.algorithms.centrality.tests.test_group, decorators=pytest.mark.usefixtures("graphscope_session")) diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/centrality/test_harmonic_centrality.py b/python/graphscope/nx/tests/algorithms/forward/centrality/test_harmonic_centrality.py similarity index 76% rename from python/graphscope/experimental/nx/tests/algorithms/forward/centrality/test_harmonic_centrality.py rename to python/graphscope/nx/tests/algorithms/forward/centrality/test_harmonic_centrality.py index 3e1d04690860..2093f24461c3 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/centrality/test_harmonic_centrality.py +++ b/python/graphscope/nx/tests/algorithms/forward/centrality/test_harmonic_centrality.py @@ -1,7 +1,7 @@ import networkx.algorithms.centrality.tests.test_harmonic_centrality import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import import_as_graphscope_nx import_as_graphscope_nx(networkx.algorithms.centrality.tests.test_harmonic_centrality, decorators=pytest.mark.usefixtures("graphscope_session")) diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/centrality/test_katz_centrality.py b/python/graphscope/nx/tests/algorithms/forward/centrality/test_katz_centrality.py similarity index 95% rename from python/graphscope/experimental/nx/tests/algorithms/forward/centrality/test_katz_centrality.py rename to python/graphscope/nx/tests/algorithms/forward/centrality/test_katz_centrality.py index 68aee8f8f5dd..d105219f34a6 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/centrality/test_katz_centrality.py +++ b/python/graphscope/nx/tests/algorithms/forward/centrality/test_katz_centrality.py @@ -18,8 +18,8 @@ import networkx.algorithms.centrality.tests.test_katz_centrality import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx -from graphscope.experimental.nx.utils.compat import with_graphscope_nx_context +from graphscope.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import with_graphscope_nx_context import_as_graphscope_nx(networkx.algorithms.centrality.tests.test_katz_centrality, decorators=pytest.mark.usefixtures("graphscope_session")) diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/centrality/test_load_centrality.py b/python/graphscope/nx/tests/algorithms/forward/centrality/test_load_centrality.py similarity index 76% rename from python/graphscope/experimental/nx/tests/algorithms/forward/centrality/test_load_centrality.py rename to python/graphscope/nx/tests/algorithms/forward/centrality/test_load_centrality.py index c7f131e36ea5..63ac1055e092 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/centrality/test_load_centrality.py +++ b/python/graphscope/nx/tests/algorithms/forward/centrality/test_load_centrality.py @@ -1,7 +1,7 @@ import networkx.algorithms.centrality.tests.test_load_centrality import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import import_as_graphscope_nx import_as_graphscope_nx(networkx.algorithms.centrality.tests.test_load_centrality, decorators=pytest.mark.usefixtures("graphscope_session")) diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/centrality/test_percolation_centrality.py b/python/graphscope/nx/tests/algorithms/forward/centrality/test_percolation_centrality.py similarity index 76% rename from python/graphscope/experimental/nx/tests/algorithms/forward/centrality/test_percolation_centrality.py rename to python/graphscope/nx/tests/algorithms/forward/centrality/test_percolation_centrality.py index 3dba0df248f1..7ae11f350271 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/centrality/test_percolation_centrality.py +++ b/python/graphscope/nx/tests/algorithms/forward/centrality/test_percolation_centrality.py @@ -1,7 +1,7 @@ import networkx.algorithms.centrality.tests.test_percolation_centrality import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import import_as_graphscope_nx import_as_graphscope_nx( networkx.algorithms.centrality.tests.test_percolation_centrality, diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/centrality/test_reaching.py b/python/graphscope/nx/tests/algorithms/forward/centrality/test_reaching.py similarity index 75% rename from python/graphscope/experimental/nx/tests/algorithms/forward/centrality/test_reaching.py rename to python/graphscope/nx/tests/algorithms/forward/centrality/test_reaching.py index ff8e52c2a7eb..6e47d9182b88 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/centrality/test_reaching.py +++ b/python/graphscope/nx/tests/algorithms/forward/centrality/test_reaching.py @@ -1,7 +1,7 @@ import networkx.algorithms.centrality.tests.test_reaching import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import import_as_graphscope_nx import_as_graphscope_nx(networkx.algorithms.centrality.tests.test_reaching, decorators=pytest.mark.usefixtures("graphscope_session")) diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/centrality/test_second_order_centrality.py b/python/graphscope/nx/tests/algorithms/forward/centrality/test_second_order_centrality.py similarity index 76% rename from python/graphscope/experimental/nx/tests/algorithms/forward/centrality/test_second_order_centrality.py rename to python/graphscope/nx/tests/algorithms/forward/centrality/test_second_order_centrality.py index 9d61f2b47013..91ca282114ca 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/centrality/test_second_order_centrality.py +++ b/python/graphscope/nx/tests/algorithms/forward/centrality/test_second_order_centrality.py @@ -1,7 +1,7 @@ import networkx.algorithms.centrality.tests.test_second_order_centrality import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import import_as_graphscope_nx import_as_graphscope_nx( networkx.algorithms.centrality.tests.test_second_order_centrality, diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/centrality/test_subgraph.py b/python/graphscope/nx/tests/algorithms/forward/centrality/test_subgraph.py similarity index 75% rename from python/graphscope/experimental/nx/tests/algorithms/forward/centrality/test_subgraph.py rename to python/graphscope/nx/tests/algorithms/forward/centrality/test_subgraph.py index 3f8b77d62f0e..06b47ebcdbab 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/centrality/test_subgraph.py +++ b/python/graphscope/nx/tests/algorithms/forward/centrality/test_subgraph.py @@ -1,7 +1,7 @@ import networkx.algorithms.centrality.tests.test_subgraph import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import import_as_graphscope_nx import_as_graphscope_nx(networkx.algorithms.centrality.tests.test_subgraph, decorators=pytest.mark.usefixtures("graphscope_session")) diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/centrality/test_voterank.py b/python/graphscope/nx/tests/algorithms/forward/centrality/test_voterank.py similarity index 94% rename from python/graphscope/experimental/nx/tests/algorithms/forward/centrality/test_voterank.py rename to python/graphscope/nx/tests/algorithms/forward/centrality/test_voterank.py index 61cb17e3f3b4..650cad0530b4 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/centrality/test_voterank.py +++ b/python/graphscope/nx/tests/algorithms/forward/centrality/test_voterank.py @@ -1,6 +1,6 @@ import pytest -import graphscope.experimental.nx as nx +import graphscope.nx as nx class TestVoteRankCentrality: diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/coloring/__init__.py b/python/graphscope/nx/tests/algorithms/forward/coloring/__init__.py similarity index 100% rename from python/graphscope/experimental/nx/tests/algorithms/forward/coloring/__init__.py rename to python/graphscope/nx/tests/algorithms/forward/coloring/__init__.py diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/coloring/test_coloring.py b/python/graphscope/nx/tests/algorithms/forward/coloring/test_coloring.py similarity index 75% rename from python/graphscope/experimental/nx/tests/algorithms/forward/coloring/test_coloring.py rename to python/graphscope/nx/tests/algorithms/forward/coloring/test_coloring.py index db8b3c2de5e3..91fe92d41e0e 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/coloring/test_coloring.py +++ b/python/graphscope/nx/tests/algorithms/forward/coloring/test_coloring.py @@ -1,7 +1,7 @@ import networkx.algorithms.coloring.tests.test_coloring import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import import_as_graphscope_nx import_as_graphscope_nx(networkx.algorithms.coloring.tests.test_coloring, decorators=pytest.mark.usefixtures("graphscope_session")) diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/community/__init__.py b/python/graphscope/nx/tests/algorithms/forward/community/__init__.py similarity index 100% rename from python/graphscope/experimental/nx/tests/algorithms/forward/community/__init__.py rename to python/graphscope/nx/tests/algorithms/forward/community/__init__.py diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/community/test_asyn_fluid.py b/python/graphscope/nx/tests/algorithms/forward/community/test_asyn_fluid.py similarity index 75% rename from python/graphscope/experimental/nx/tests/algorithms/forward/community/test_asyn_fluid.py rename to python/graphscope/nx/tests/algorithms/forward/community/test_asyn_fluid.py index ff7dfe02cd7b..8b9052c576f4 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/community/test_asyn_fluid.py +++ b/python/graphscope/nx/tests/algorithms/forward/community/test_asyn_fluid.py @@ -1,7 +1,7 @@ import networkx.algorithms.community.tests.test_asyn_fluid import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import import_as_graphscope_nx import_as_graphscope_nx(networkx.algorithms.community.tests.test_asyn_fluid, decorators=pytest.mark.usefixtures("graphscope_session")) diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/community/test_centrality.py b/python/graphscope/nx/tests/algorithms/forward/community/test_centrality.py similarity index 75% rename from python/graphscope/experimental/nx/tests/algorithms/forward/community/test_centrality.py rename to python/graphscope/nx/tests/algorithms/forward/community/test_centrality.py index 639f6ef823d1..6f4cfcbee819 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/community/test_centrality.py +++ b/python/graphscope/nx/tests/algorithms/forward/community/test_centrality.py @@ -1,7 +1,7 @@ import networkx.algorithms.community.tests.test_centrality import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import import_as_graphscope_nx import_as_graphscope_nx(networkx.algorithms.community.tests.test_centrality, decorators=pytest.mark.usefixtures("graphscope_session")) diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/community/test_kclique.py b/python/graphscope/nx/tests/algorithms/forward/community/test_kclique.py similarity index 75% rename from python/graphscope/experimental/nx/tests/algorithms/forward/community/test_kclique.py rename to python/graphscope/nx/tests/algorithms/forward/community/test_kclique.py index ca210c194af3..e012f25c07bf 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/community/test_kclique.py +++ b/python/graphscope/nx/tests/algorithms/forward/community/test_kclique.py @@ -1,7 +1,7 @@ import networkx.algorithms.community.tests.test_kclique import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import import_as_graphscope_nx import_as_graphscope_nx(networkx.algorithms.community.tests.test_kclique, decorators=pytest.mark.usefixtures("graphscope_session")) diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/community/test_kernighan_lin.py b/python/graphscope/nx/tests/algorithms/forward/community/test_kernighan_lin.py similarity index 81% rename from python/graphscope/experimental/nx/tests/algorithms/forward/community/test_kernighan_lin.py rename to python/graphscope/nx/tests/algorithms/forward/community/test_kernighan_lin.py index f516db4e9a71..ae8a10166e42 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/community/test_kernighan_lin.py +++ b/python/graphscope/nx/tests/algorithms/forward/community/test_kernighan_lin.py @@ -1,7 +1,7 @@ import networkx.algorithms.community.tests.test_kernighan_lin import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import import_as_graphscope_nx import_as_graphscope_nx(networkx.algorithms.community.tests.test_kernighan_lin, decorators=pytest.mark.usefixtures("graphscope_session")) diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/community/test_label_propagation.py b/python/graphscope/nx/tests/algorithms/forward/community/test_label_propagation.py similarity index 76% rename from python/graphscope/experimental/nx/tests/algorithms/forward/community/test_label_propagation.py rename to python/graphscope/nx/tests/algorithms/forward/community/test_label_propagation.py index c853a3bd8062..3ebd3fc73111 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/community/test_label_propagation.py +++ b/python/graphscope/nx/tests/algorithms/forward/community/test_label_propagation.py @@ -1,7 +1,7 @@ import networkx.algorithms.community.tests.test_label_propagation import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import import_as_graphscope_nx import_as_graphscope_nx(networkx.algorithms.community.tests.test_label_propagation, decorators=pytest.mark.usefixtures("graphscope_session")) diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/community/test_modularity_max.py b/python/graphscope/nx/tests/algorithms/forward/community/test_modularity_max.py similarity index 83% rename from python/graphscope/experimental/nx/tests/algorithms/forward/community/test_modularity_max.py rename to python/graphscope/nx/tests/algorithms/forward/community/test_modularity_max.py index 890076722020..db38e8c8da58 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/community/test_modularity_max.py +++ b/python/graphscope/nx/tests/algorithms/forward/community/test_modularity_max.py @@ -1,8 +1,8 @@ import networkx.algorithms.community.tests.test_modularity_max import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx -from graphscope.experimental.nx.utils.compat import with_graphscope_nx_context +from graphscope.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import with_graphscope_nx_context import_as_graphscope_nx(networkx.algorithms.community.tests.test_modularity_max, decorators=pytest.mark.usefixtures("graphscope_session")) diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/community/test_quality.py b/python/graphscope/nx/tests/algorithms/forward/community/test_quality.py similarity index 75% rename from python/graphscope/experimental/nx/tests/algorithms/forward/community/test_quality.py rename to python/graphscope/nx/tests/algorithms/forward/community/test_quality.py index aaa632e2c4d7..679ca4917d61 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/community/test_quality.py +++ b/python/graphscope/nx/tests/algorithms/forward/community/test_quality.py @@ -1,7 +1,7 @@ import networkx.algorithms.community.tests.test_quality import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import import_as_graphscope_nx import_as_graphscope_nx(networkx.algorithms.community.tests.test_quality, decorators=pytest.mark.usefixtures("graphscope_session")) diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/community/test_utils.py b/python/graphscope/nx/tests/algorithms/forward/community/test_utils.py similarity index 74% rename from python/graphscope/experimental/nx/tests/algorithms/forward/community/test_utils.py rename to python/graphscope/nx/tests/algorithms/forward/community/test_utils.py index 5d7936bab9f3..0b0b0f262d7b 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/community/test_utils.py +++ b/python/graphscope/nx/tests/algorithms/forward/community/test_utils.py @@ -1,7 +1,7 @@ import networkx.algorithms.community.tests.test_utils import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import import_as_graphscope_nx import_as_graphscope_nx(networkx.algorithms.community.tests.test_utils, decorators=pytest.mark.usefixtures("graphscope_session")) diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/components/__init__.py b/python/graphscope/nx/tests/algorithms/forward/components/__init__.py similarity index 100% rename from python/graphscope/experimental/nx/tests/algorithms/forward/components/__init__.py rename to python/graphscope/nx/tests/algorithms/forward/components/__init__.py diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/components/test_attracting.py b/python/graphscope/nx/tests/algorithms/forward/components/test_attracting.py similarity index 75% rename from python/graphscope/experimental/nx/tests/algorithms/forward/components/test_attracting.py rename to python/graphscope/nx/tests/algorithms/forward/components/test_attracting.py index 9d1f9f775f4d..28253b7875c7 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/components/test_attracting.py +++ b/python/graphscope/nx/tests/algorithms/forward/components/test_attracting.py @@ -1,7 +1,7 @@ import networkx.algorithms.components.tests.test_attracting import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import import_as_graphscope_nx import_as_graphscope_nx(networkx.algorithms.components.tests.test_attracting, decorators=pytest.mark.usefixtures("graphscope_session")) diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/components/test_biconnected.py b/python/graphscope/nx/tests/algorithms/forward/components/test_biconnected.py similarity index 75% rename from python/graphscope/experimental/nx/tests/algorithms/forward/components/test_biconnected.py rename to python/graphscope/nx/tests/algorithms/forward/components/test_biconnected.py index 98be85f9e07f..8c6c4d462090 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/components/test_biconnected.py +++ b/python/graphscope/nx/tests/algorithms/forward/components/test_biconnected.py @@ -1,7 +1,7 @@ import networkx.algorithms.components.tests.test_biconnected import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import import_as_graphscope_nx import_as_graphscope_nx(networkx.algorithms.components.tests.test_biconnected, decorators=pytest.mark.usefixtures("graphscope_session")) diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/components/test_connected.py b/python/graphscope/nx/tests/algorithms/forward/components/test_connected.py similarity index 75% rename from python/graphscope/experimental/nx/tests/algorithms/forward/components/test_connected.py rename to python/graphscope/nx/tests/algorithms/forward/components/test_connected.py index ccef230c5361..383a59df3be6 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/components/test_connected.py +++ b/python/graphscope/nx/tests/algorithms/forward/components/test_connected.py @@ -1,7 +1,7 @@ import networkx.algorithms.components.tests.test_connected import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import import_as_graphscope_nx import_as_graphscope_nx(networkx.algorithms.components.tests.test_connected, decorators=pytest.mark.usefixtures("graphscope_session")) diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/components/test_semiconnected.py b/python/graphscope/nx/tests/algorithms/forward/components/test_semiconnected.py similarity index 81% rename from python/graphscope/experimental/nx/tests/algorithms/forward/components/test_semiconnected.py rename to python/graphscope/nx/tests/algorithms/forward/components/test_semiconnected.py index 961e1b5a529f..67062d4b1f28 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/components/test_semiconnected.py +++ b/python/graphscope/nx/tests/algorithms/forward/components/test_semiconnected.py @@ -1,8 +1,8 @@ import networkx.algorithms.components.tests.test_semiconnected import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx -from graphscope.experimental.nx.utils.compat import with_graphscope_nx_context +from graphscope.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import with_graphscope_nx_context import_as_graphscope_nx(networkx.algorithms.components.tests.test_semiconnected, decorators=pytest.mark.usefixtures("graphscope_session")) diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/components/test_strongly_connected.py b/python/graphscope/nx/tests/algorithms/forward/components/test_strongly_connected.py similarity index 76% rename from python/graphscope/experimental/nx/tests/algorithms/forward/components/test_strongly_connected.py rename to python/graphscope/nx/tests/algorithms/forward/components/test_strongly_connected.py index 69b8006f4f2b..787542ff3c1a 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/components/test_strongly_connected.py +++ b/python/graphscope/nx/tests/algorithms/forward/components/test_strongly_connected.py @@ -1,7 +1,7 @@ import networkx.algorithms.components.tests.test_strongly_connected import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import import_as_graphscope_nx import_as_graphscope_nx(networkx.algorithms.components.tests.test_strongly_connected, decorators=pytest.mark.usefixtures("graphscope_session")) diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/components/test_weakly_connected.py b/python/graphscope/nx/tests/algorithms/forward/components/test_weakly_connected.py similarity index 76% rename from python/graphscope/experimental/nx/tests/algorithms/forward/components/test_weakly_connected.py rename to python/graphscope/nx/tests/algorithms/forward/components/test_weakly_connected.py index 9e1be08549dc..ca81cad28831 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/components/test_weakly_connected.py +++ b/python/graphscope/nx/tests/algorithms/forward/components/test_weakly_connected.py @@ -1,7 +1,7 @@ import networkx.algorithms.components.tests.test_weakly_connected import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import import_as_graphscope_nx import_as_graphscope_nx(networkx.algorithms.components.tests.test_weakly_connected, decorators=pytest.mark.usefixtures("graphscope_session")) diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/conftest.py b/python/graphscope/nx/tests/algorithms/forward/conftest.py similarity index 100% rename from python/graphscope/experimental/nx/tests/algorithms/forward/conftest.py rename to python/graphscope/nx/tests/algorithms/forward/conftest.py diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/connectivity/__init__.py b/python/graphscope/nx/tests/algorithms/forward/connectivity/__init__.py similarity index 100% rename from python/graphscope/experimental/nx/tests/algorithms/forward/connectivity/__init__.py rename to python/graphscope/nx/tests/algorithms/forward/connectivity/__init__.py diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/connectivity/test_connectivity.py b/python/graphscope/nx/tests/algorithms/forward/connectivity/test_connectivity.py similarity index 75% rename from python/graphscope/experimental/nx/tests/algorithms/forward/connectivity/test_connectivity.py rename to python/graphscope/nx/tests/algorithms/forward/connectivity/test_connectivity.py index 936ee6f325d9..92fb44ae11d7 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/connectivity/test_connectivity.py +++ b/python/graphscope/nx/tests/algorithms/forward/connectivity/test_connectivity.py @@ -2,7 +2,7 @@ #import networkx.algorithms.connectivity.tests.test_connectivity -#from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx +#from graphscope.nx.utils.compat import import_as_graphscope_nx #import_as_graphscope_nx( # networkx.algorithms.connectivity.tests.test_connectivity, diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/connectivity/test_cuts.py b/python/graphscope/nx/tests/algorithms/forward/connectivity/test_cuts.py similarity index 74% rename from python/graphscope/experimental/nx/tests/algorithms/forward/connectivity/test_cuts.py rename to python/graphscope/nx/tests/algorithms/forward/connectivity/test_cuts.py index 17f65a27be5f..3e676263c933 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/connectivity/test_cuts.py +++ b/python/graphscope/nx/tests/algorithms/forward/connectivity/test_cuts.py @@ -2,7 +2,7 @@ #import networkx.algorithms.connectivity.tests.test_cuts -#from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx +#from graphscope.nx.utils.compat import import_as_graphscope_nx #import_as_graphscope_nx( # networkx.algorithms.connectivity.tests.test_cuts, diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/connectivity/test_disjoint_paths.py b/python/graphscope/nx/tests/algorithms/forward/connectivity/test_disjoint_paths.py similarity index 75% rename from python/graphscope/experimental/nx/tests/algorithms/forward/connectivity/test_disjoint_paths.py rename to python/graphscope/nx/tests/algorithms/forward/connectivity/test_disjoint_paths.py index 10320676f784..804ad49bb672 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/connectivity/test_disjoint_paths.py +++ b/python/graphscope/nx/tests/algorithms/forward/connectivity/test_disjoint_paths.py @@ -2,7 +2,7 @@ #import networkx.algorithms.connectivity.tests.test_disjoint_paths -#from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx +#from graphscope.nx.utils.compat import import_as_graphscope_nx #import_as_graphscope_nx( # networkx.algorithms.connectivity.tests.test_disjoint_paths, diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/connectivity/test_edge_augmentation.py b/python/graphscope/nx/tests/algorithms/forward/connectivity/test_edge_augmentation.py similarity index 91% rename from python/graphscope/experimental/nx/tests/algorithms/forward/connectivity/test_edge_augmentation.py rename to python/graphscope/nx/tests/algorithms/forward/connectivity/test_edge_augmentation.py index f1bccf507070..64b409c2080b 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/connectivity/test_edge_augmentation.py +++ b/python/graphscope/nx/tests/algorithms/forward/connectivity/test_edge_augmentation.py @@ -2,7 +2,7 @@ #import networkx.algorithms.connectivity.tests.test_edge_augmentation -#from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx +#from graphscope.nx.utils.compat import import_as_graphscope_nx #import_as_graphscope_nx( # networkx.algorithms.connectivity.tests.test_edge_augmentation, diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/connectivity/test_edge_kcomponents.py b/python/graphscope/nx/tests/algorithms/forward/connectivity/test_edge_kcomponents.py similarity index 90% rename from python/graphscope/experimental/nx/tests/algorithms/forward/connectivity/test_edge_kcomponents.py rename to python/graphscope/nx/tests/algorithms/forward/connectivity/test_edge_kcomponents.py index 66feeddbf288..d7ecb4da7dd9 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/connectivity/test_edge_kcomponents.py +++ b/python/graphscope/nx/tests/algorithms/forward/connectivity/test_edge_kcomponents.py @@ -2,7 +2,7 @@ #import networkx.algorithms.connectivity.tests.test_edge_kcomponents -#from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx +#from graphscope.nx.utils.compat import import_as_graphscope_nx #import_as_graphscope_nx( # networkx.algorithms.connectivity.tests.test_edge_kcomponents, diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/connectivity/test_kcomponents.py b/python/graphscope/nx/tests/algorithms/forward/connectivity/test_kcomponents.py similarity index 75% rename from python/graphscope/experimental/nx/tests/algorithms/forward/connectivity/test_kcomponents.py rename to python/graphscope/nx/tests/algorithms/forward/connectivity/test_kcomponents.py index c84ba8d709ce..7f8cb6751ca0 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/connectivity/test_kcomponents.py +++ b/python/graphscope/nx/tests/algorithms/forward/connectivity/test_kcomponents.py @@ -2,7 +2,7 @@ #import networkx.algorithms.connectivity.tests.test_kcomponents -#from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx +#from graphscope.nx.utils.compat import import_as_graphscope_nx #import_as_graphscope_nx( # networkx.algorithms.connectivity.tests.test_kcomponents, diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/connectivity/test_kcutsets.py b/python/graphscope/nx/tests/algorithms/forward/connectivity/test_kcutsets.py similarity index 74% rename from python/graphscope/experimental/nx/tests/algorithms/forward/connectivity/test_kcutsets.py rename to python/graphscope/nx/tests/algorithms/forward/connectivity/test_kcutsets.py index 4e61834d8a73..48854018518b 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/connectivity/test_kcutsets.py +++ b/python/graphscope/nx/tests/algorithms/forward/connectivity/test_kcutsets.py @@ -2,7 +2,7 @@ #import networkx.algorithms.connectivity.tests.test_kcutsets -#from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx +#from graphscope.nx.utils.compat import import_as_graphscope_nx #import_as_graphscope_nx( # networkx.algorithms.connectivity.tests.test_kcutsets, diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/connectivity/test_stoer_wagner.py b/python/graphscope/nx/tests/algorithms/forward/connectivity/test_stoer_wagner.py similarity index 90% rename from python/graphscope/experimental/nx/tests/algorithms/forward/connectivity/test_stoer_wagner.py rename to python/graphscope/nx/tests/algorithms/forward/connectivity/test_stoer_wagner.py index 8d1acc6e579a..3912f2306cfb 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/connectivity/test_stoer_wagner.py +++ b/python/graphscope/nx/tests/algorithms/forward/connectivity/test_stoer_wagner.py @@ -2,7 +2,7 @@ #import networkx.algorithms.connectivity.tests.test_stoer_wagner -#from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx +#from graphscope.nx.utils.compat import import_as_graphscope_nx #import_as_graphscope_nx( # networkx.algorithms.connectivity.tests.test_stoer_wagner, diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/flow/__init__.py b/python/graphscope/nx/tests/algorithms/forward/flow/__init__.py similarity index 100% rename from python/graphscope/experimental/nx/tests/algorithms/forward/flow/__init__.py rename to python/graphscope/nx/tests/algorithms/forward/flow/__init__.py diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/flow/test_gomory_hu.py b/python/graphscope/nx/tests/algorithms/forward/flow/test_gomory_hu.py similarity index 74% rename from python/graphscope/experimental/nx/tests/algorithms/forward/flow/test_gomory_hu.py rename to python/graphscope/nx/tests/algorithms/forward/flow/test_gomory_hu.py index 85590bab0092..21011f4c6533 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/flow/test_gomory_hu.py +++ b/python/graphscope/nx/tests/algorithms/forward/flow/test_gomory_hu.py @@ -1,7 +1,7 @@ import networkx.algorithms.flow.tests.test_gomory_hu import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import import_as_graphscope_nx import_as_graphscope_nx(networkx.algorithms.flow.tests.test_gomory_hu, decorators=pytest.mark.usefixtures("graphscope_session")) diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/flow/test_maxflow.py b/python/graphscope/nx/tests/algorithms/forward/flow/test_maxflow.py similarity index 92% rename from python/graphscope/experimental/nx/tests/algorithms/forward/flow/test_maxflow.py rename to python/graphscope/nx/tests/algorithms/forward/flow/test_maxflow.py index f1071a46ff77..697cce7c844f 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/flow/test_maxflow.py +++ b/python/graphscope/nx/tests/algorithms/forward/flow/test_maxflow.py @@ -1,8 +1,8 @@ import networkx.algorithms.flow.tests.test_maxflow import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx -from graphscope.experimental.nx.utils.compat import with_graphscope_nx_context +from graphscope.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import with_graphscope_nx_context import_as_graphscope_nx(networkx.algorithms.flow.tests.test_maxflow, decorators=pytest.mark.usefixtures("graphscope_session")) diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/flow/test_maxflow_large_graph.py b/python/graphscope/nx/tests/algorithms/forward/flow/test_maxflow_large_graph.py similarity index 86% rename from python/graphscope/experimental/nx/tests/algorithms/forward/flow/test_maxflow_large_graph.py rename to python/graphscope/nx/tests/algorithms/forward/flow/test_maxflow_large_graph.py index 192b4569ed7e..fc8ef817b62d 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/flow/test_maxflow_large_graph.py +++ b/python/graphscope/nx/tests/algorithms/forward/flow/test_maxflow_large_graph.py @@ -1,8 +1,8 @@ import networkx.algorithms.flow.tests.test_maxflow_large_graph import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx -from graphscope.experimental.nx.utils.compat import with_graphscope_nx_context +from graphscope.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import with_graphscope_nx_context import_as_graphscope_nx(networkx.algorithms.flow.tests.test_maxflow_large_graph, decorators=pytest.mark.usefixtures("graphscope_session")) diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/flow/test_mincost.py b/python/graphscope/nx/tests/algorithms/forward/flow/test_mincost.py similarity index 95% rename from python/graphscope/experimental/nx/tests/algorithms/forward/flow/test_mincost.py rename to python/graphscope/nx/tests/algorithms/forward/flow/test_mincost.py index 59247c0244cb..02f113bbc9e2 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/flow/test_mincost.py +++ b/python/graphscope/nx/tests/algorithms/forward/flow/test_mincost.py @@ -20,8 +20,8 @@ import networkx.algorithms.flow.tests.test_mincost import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx -from graphscope.experimental.nx.utils.compat import with_graphscope_nx_context +from graphscope.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import with_graphscope_nx_context import_as_graphscope_nx(networkx.algorithms.flow.tests.test_mincost, decorators=pytest.mark.usefixtures("graphscope_session")) diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/isomorphism/__init__.py b/python/graphscope/nx/tests/algorithms/forward/isomorphism/__init__.py similarity index 100% rename from python/graphscope/experimental/nx/tests/algorithms/forward/isomorphism/__init__.py rename to python/graphscope/nx/tests/algorithms/forward/isomorphism/__init__.py diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/isomorphism/test_ismags.py b/python/graphscope/nx/tests/algorithms/forward/isomorphism/test_ismags.py similarity index 75% rename from python/graphscope/experimental/nx/tests/algorithms/forward/isomorphism/test_ismags.py rename to python/graphscope/nx/tests/algorithms/forward/isomorphism/test_ismags.py index 58385d55a761..7c1ab344c877 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/isomorphism/test_ismags.py +++ b/python/graphscope/nx/tests/algorithms/forward/isomorphism/test_ismags.py @@ -1,7 +1,7 @@ import networkx.algorithms.isomorphism.tests.test_ismags import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import import_as_graphscope_nx import_as_graphscope_nx(networkx.algorithms.isomorphism.tests.test_ismags, decorators=pytest.mark.usefixtures("graphscope_session")) diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/isomorphism/test_isomorphism.py b/python/graphscope/nx/tests/algorithms/forward/isomorphism/test_isomorphism.py similarity index 75% rename from python/graphscope/experimental/nx/tests/algorithms/forward/isomorphism/test_isomorphism.py rename to python/graphscope/nx/tests/algorithms/forward/isomorphism/test_isomorphism.py index bec513b0750f..0ee53a0dfcba 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/isomorphism/test_isomorphism.py +++ b/python/graphscope/nx/tests/algorithms/forward/isomorphism/test_isomorphism.py @@ -1,7 +1,7 @@ import networkx.algorithms.isomorphism.tests.test_isomorphism import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import import_as_graphscope_nx import_as_graphscope_nx(networkx.algorithms.isomorphism.tests.test_isomorphism, decorators=pytest.mark.usefixtures("graphscope_session")) diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/isomorphism/test_isomorphvf2.py b/python/graphscope/nx/tests/algorithms/forward/isomorphism/test_isomorphvf2.py similarity index 85% rename from python/graphscope/experimental/nx/tests/algorithms/forward/isomorphism/test_isomorphvf2.py rename to python/graphscope/nx/tests/algorithms/forward/isomorphism/test_isomorphvf2.py index 8629a5642e16..a575d3215ee4 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/isomorphism/test_isomorphvf2.py +++ b/python/graphscope/nx/tests/algorithms/forward/isomorphism/test_isomorphvf2.py @@ -1,7 +1,7 @@ import networkx.algorithms.isomorphism.tests.test_isomorphvf2 import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import import_as_graphscope_nx import_as_graphscope_nx(networkx.algorithms.isomorphism.tests.test_isomorphvf2, decorators=pytest.mark.usefixtures("graphscope_session")) diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/isomorphism/test_match_helpers.py b/python/graphscope/nx/tests/algorithms/forward/isomorphism/test_match_helpers.py similarity index 81% rename from python/graphscope/experimental/nx/tests/algorithms/forward/isomorphism/test_match_helpers.py rename to python/graphscope/nx/tests/algorithms/forward/isomorphism/test_match_helpers.py index b887554eb342..7bd9403593cd 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/isomorphism/test_match_helpers.py +++ b/python/graphscope/nx/tests/algorithms/forward/isomorphism/test_match_helpers.py @@ -1,7 +1,7 @@ import networkx.algorithms.isomorphism.tests.test_match_helpers import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import import_as_graphscope_nx import_as_graphscope_nx(networkx.algorithms.isomorphism.tests.test_match_helpers, decorators=pytest.mark.usefixtures("graphscope_session")) diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/isomorphism/test_temporalisomorphvf2.py b/python/graphscope/nx/tests/algorithms/forward/isomorphism/test_temporalisomorphvf2.py similarity index 86% rename from python/graphscope/experimental/nx/tests/algorithms/forward/isomorphism/test_temporalisomorphvf2.py rename to python/graphscope/nx/tests/algorithms/forward/isomorphism/test_temporalisomorphvf2.py index 21e46c405ada..2d6e48a546e9 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/isomorphism/test_temporalisomorphvf2.py +++ b/python/graphscope/nx/tests/algorithms/forward/isomorphism/test_temporalisomorphvf2.py @@ -1,7 +1,7 @@ import networkx.algorithms.isomorphism.tests.test_temporalisomorphvf2 import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import import_as_graphscope_nx import_as_graphscope_nx(networkx.algorithms.isomorphism.tests.test_temporalisomorphvf2, decorators=pytest.mark.usefixtures("graphscope_session")) diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/isomorphism/test_vf2userfunc.py b/python/graphscope/nx/tests/algorithms/forward/isomorphism/test_vf2userfunc.py similarity index 96% rename from python/graphscope/experimental/nx/tests/algorithms/forward/isomorphism/test_vf2userfunc.py rename to python/graphscope/nx/tests/algorithms/forward/isomorphism/test_vf2userfunc.py index 6166487c5f9b..7f0b304e4ac8 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/isomorphism/test_vf2userfunc.py +++ b/python/graphscope/nx/tests/algorithms/forward/isomorphism/test_vf2userfunc.py @@ -17,7 +17,7 @@ import networkx.algorithms.isomorphism.tests.test_vf2userfunc import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import import_as_graphscope_nx import_as_graphscope_nx(networkx.algorithms.isomorphism.tests.test_vf2userfunc, decorators=pytest.mark.usefixtures("graphscope_session")) diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/link_analysis/__init__.py b/python/graphscope/nx/tests/algorithms/forward/link_analysis/__init__.py similarity index 100% rename from python/graphscope/experimental/nx/tests/algorithms/forward/link_analysis/__init__.py rename to python/graphscope/nx/tests/algorithms/forward/link_analysis/__init__.py diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/link_analysis/test_hits.py b/python/graphscope/nx/tests/algorithms/forward/link_analysis/test_hits.py similarity index 75% rename from python/graphscope/experimental/nx/tests/algorithms/forward/link_analysis/test_hits.py rename to python/graphscope/nx/tests/algorithms/forward/link_analysis/test_hits.py index e63bfdbf2968..e0af890bf792 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/link_analysis/test_hits.py +++ b/python/graphscope/nx/tests/algorithms/forward/link_analysis/test_hits.py @@ -1,7 +1,7 @@ import networkx.algorithms.link_analysis.tests.test_hits import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import import_as_graphscope_nx import_as_graphscope_nx(networkx.algorithms.link_analysis.tests.test_hits, decorators=pytest.mark.usefixtures("graphscope_session")) diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/link_analysis/test_pagerank.py b/python/graphscope/nx/tests/algorithms/forward/link_analysis/test_pagerank.py similarity index 75% rename from python/graphscope/experimental/nx/tests/algorithms/forward/link_analysis/test_pagerank.py rename to python/graphscope/nx/tests/algorithms/forward/link_analysis/test_pagerank.py index 2db081475ab7..7876ae10dbb7 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/link_analysis/test_pagerank.py +++ b/python/graphscope/nx/tests/algorithms/forward/link_analysis/test_pagerank.py @@ -1,7 +1,7 @@ import networkx.algorithms.link_analysis.tests.test_pagerank import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import import_as_graphscope_nx import_as_graphscope_nx(networkx.algorithms.link_analysis.tests.test_pagerank, decorators=pytest.mark.usefixtures("graphscope_session")) diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/node_classification/__init__.py b/python/graphscope/nx/tests/algorithms/forward/node_classification/__init__.py similarity index 100% rename from python/graphscope/experimental/nx/tests/algorithms/forward/node_classification/__init__.py rename to python/graphscope/nx/tests/algorithms/forward/node_classification/__init__.py diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/node_classification/test_harmonic_function.py b/python/graphscope/nx/tests/algorithms/forward/node_classification/test_harmonic_function.py similarity index 76% rename from python/graphscope/experimental/nx/tests/algorithms/forward/node_classification/test_harmonic_function.py rename to python/graphscope/nx/tests/algorithms/forward/node_classification/test_harmonic_function.py index dc731757b1b7..0b1dee4214ff 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/node_classification/test_harmonic_function.py +++ b/python/graphscope/nx/tests/algorithms/forward/node_classification/test_harmonic_function.py @@ -1,7 +1,7 @@ import networkx.algorithms.node_classification.tests.test_harmonic_function import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import import_as_graphscope_nx import_as_graphscope_nx( networkx.algorithms.node_classification.tests.test_harmonic_function, diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/node_classification/test_local_and_global_consistency.py b/python/graphscope/nx/tests/algorithms/forward/node_classification/test_local_and_global_consistency.py similarity index 78% rename from python/graphscope/experimental/nx/tests/algorithms/forward/node_classification/test_local_and_global_consistency.py rename to python/graphscope/nx/tests/algorithms/forward/node_classification/test_local_and_global_consistency.py index b38678c73eda..0cf106923460 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/node_classification/test_local_and_global_consistency.py +++ b/python/graphscope/nx/tests/algorithms/forward/node_classification/test_local_and_global_consistency.py @@ -1,7 +1,7 @@ import networkx.algorithms.node_classification.tests.test_local_and_global_consistency import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import import_as_graphscope_nx import_as_graphscope_nx( networkx.algorithms.node_classification.tests.test_local_and_global_consistency, diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/operators/__init__.py b/python/graphscope/nx/tests/algorithms/forward/operators/__init__.py similarity index 100% rename from python/graphscope/experimental/nx/tests/algorithms/forward/operators/__init__.py rename to python/graphscope/nx/tests/algorithms/forward/operators/__init__.py diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/operators/test_all.py b/python/graphscope/nx/tests/algorithms/forward/operators/test_all.py similarity index 91% rename from python/graphscope/experimental/nx/tests/algorithms/forward/operators/test_all.py rename to python/graphscope/nx/tests/algorithms/forward/operators/test_all.py index c20087d62467..7ea446547a30 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/operators/test_all.py +++ b/python/graphscope/nx/tests/algorithms/forward/operators/test_all.py @@ -1,7 +1,7 @@ import networkx.algorithms.operators.tests.test_all import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import import_as_graphscope_nx import_as_graphscope_nx(networkx.algorithms.operators.tests.test_all, decorators=pytest.mark.usefixtures("graphscope_session")) diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/operators/test_binary.py b/python/graphscope/nx/tests/algorithms/forward/operators/test_binary.py similarity index 93% rename from python/graphscope/experimental/nx/tests/algorithms/forward/operators/test_binary.py rename to python/graphscope/nx/tests/algorithms/forward/operators/test_binary.py index 3e67c06ee281..69b492a992a4 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/operators/test_binary.py +++ b/python/graphscope/nx/tests/algorithms/forward/operators/test_binary.py @@ -1,7 +1,7 @@ import networkx.algorithms.operators.tests.test_binary import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import import_as_graphscope_nx import_as_graphscope_nx(networkx.algorithms.operators.tests.test_binary, decorators=pytest.mark.usefixtures("graphscope_session")) diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/operators/test_product.py b/python/graphscope/nx/tests/algorithms/forward/operators/test_product.py similarity index 93% rename from python/graphscope/experimental/nx/tests/algorithms/forward/operators/test_product.py rename to python/graphscope/nx/tests/algorithms/forward/operators/test_product.py index 1c28644cccaa..5b09c0470375 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/operators/test_product.py +++ b/python/graphscope/nx/tests/algorithms/forward/operators/test_product.py @@ -1,7 +1,7 @@ import networkx.algorithms.operators.tests.test_product import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import import_as_graphscope_nx import_as_graphscope_nx(networkx.algorithms.operators.tests.test_product, decorators=pytest.mark.usefixtures("graphscope_session")) diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/operators/test_unary.py b/python/graphscope/nx/tests/algorithms/forward/operators/test_unary.py similarity index 74% rename from python/graphscope/experimental/nx/tests/algorithms/forward/operators/test_unary.py rename to python/graphscope/nx/tests/algorithms/forward/operators/test_unary.py index 92082efd5531..1747b4a5aa74 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/operators/test_unary.py +++ b/python/graphscope/nx/tests/algorithms/forward/operators/test_unary.py @@ -1,7 +1,7 @@ import networkx.algorithms.operators.tests.test_unary import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import import_as_graphscope_nx import_as_graphscope_nx(networkx.algorithms.operators.tests.test_unary, decorators=pytest.mark.usefixtures("graphscope_session")) diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/shortest_paths/__init__.py b/python/graphscope/nx/tests/algorithms/forward/shortest_paths/__init__.py similarity index 100% rename from python/graphscope/experimental/nx/tests/algorithms/forward/shortest_paths/__init__.py rename to python/graphscope/nx/tests/algorithms/forward/shortest_paths/__init__.py diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/shortest_paths/test_astar.py b/python/graphscope/nx/tests/algorithms/forward/shortest_paths/test_astar.py similarity index 80% rename from python/graphscope/experimental/nx/tests/algorithms/forward/shortest_paths/test_astar.py rename to python/graphscope/nx/tests/algorithms/forward/shortest_paths/test_astar.py index ae0ed74a71a8..1f7fe39a9865 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/shortest_paths/test_astar.py +++ b/python/graphscope/nx/tests/algorithms/forward/shortest_paths/test_astar.py @@ -1,8 +1,8 @@ import networkx.algorithms.shortest_paths.tests.test_astar import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx -from graphscope.experimental.nx.utils.compat import with_graphscope_nx_context +from graphscope.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import with_graphscope_nx_context import_as_graphscope_nx(networkx.algorithms.shortest_paths.tests.test_astar, decorators=pytest.mark.usefixtures("graphscope_session")) diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/shortest_paths/test_dense.py b/python/graphscope/nx/tests/algorithms/forward/shortest_paths/test_dense.py similarity index 81% rename from python/graphscope/experimental/nx/tests/algorithms/forward/shortest_paths/test_dense.py rename to python/graphscope/nx/tests/algorithms/forward/shortest_paths/test_dense.py index 059eaf08a156..d4a96c020b6a 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/shortest_paths/test_dense.py +++ b/python/graphscope/nx/tests/algorithms/forward/shortest_paths/test_dense.py @@ -1,8 +1,8 @@ import networkx.algorithms.shortest_paths.tests.test_dense import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx -from graphscope.experimental.nx.utils.compat import with_graphscope_nx_context +from graphscope.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import with_graphscope_nx_context import_as_graphscope_nx(networkx.algorithms.shortest_paths.tests.test_dense, decorators=pytest.mark.usefixtures("graphscope_session")) diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/shortest_paths/test_dense_numpy.py b/python/graphscope/nx/tests/algorithms/forward/shortest_paths/test_dense_numpy.py similarity index 82% rename from python/graphscope/experimental/nx/tests/algorithms/forward/shortest_paths/test_dense_numpy.py rename to python/graphscope/nx/tests/algorithms/forward/shortest_paths/test_dense_numpy.py index 16b739a080ae..43d7212df56d 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/shortest_paths/test_dense_numpy.py +++ b/python/graphscope/nx/tests/algorithms/forward/shortest_paths/test_dense_numpy.py @@ -1,8 +1,8 @@ import networkx.algorithms.shortest_paths.tests.test_dense_numpy import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx -from graphscope.experimental.nx.utils.compat import with_graphscope_nx_context +from graphscope.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import with_graphscope_nx_context import_as_graphscope_nx(networkx.algorithms.shortest_paths.tests.test_dense_numpy, decorators=pytest.mark.usefixtures("graphscope_session")) diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/shortest_paths/test_generic.py b/python/graphscope/nx/tests/algorithms/forward/shortest_paths/test_generic.py similarity index 75% rename from python/graphscope/experimental/nx/tests/algorithms/forward/shortest_paths/test_generic.py rename to python/graphscope/nx/tests/algorithms/forward/shortest_paths/test_generic.py index ccca2773c7c5..ce7800917ceb 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/shortest_paths/test_generic.py +++ b/python/graphscope/nx/tests/algorithms/forward/shortest_paths/test_generic.py @@ -1,7 +1,7 @@ import networkx.algorithms.shortest_paths.tests.test_generic import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import import_as_graphscope_nx import_as_graphscope_nx(networkx.algorithms.shortest_paths.tests.test_generic, decorators=pytest.mark.usefixtures("graphscope_session")) diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/shortest_paths/test_unweighted.py b/python/graphscope/nx/tests/algorithms/forward/shortest_paths/test_unweighted.py similarity index 76% rename from python/graphscope/experimental/nx/tests/algorithms/forward/shortest_paths/test_unweighted.py rename to python/graphscope/nx/tests/algorithms/forward/shortest_paths/test_unweighted.py index 4cb0e1caee22..d49935bb51c9 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/shortest_paths/test_unweighted.py +++ b/python/graphscope/nx/tests/algorithms/forward/shortest_paths/test_unweighted.py @@ -1,7 +1,7 @@ import networkx.algorithms.shortest_paths.tests.test_unweighted import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import import_as_graphscope_nx import_as_graphscope_nx(networkx.algorithms.shortest_paths.tests.test_unweighted, decorators=pytest.mark.usefixtures("graphscope_session")) diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/shortest_paths/test_weighted.py b/python/graphscope/nx/tests/algorithms/forward/shortest_paths/test_weighted.py similarity index 97% rename from python/graphscope/experimental/nx/tests/algorithms/forward/shortest_paths/test_weighted.py rename to python/graphscope/nx/tests/algorithms/forward/shortest_paths/test_weighted.py index 8098374876d3..b87cb573a539 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/shortest_paths/test_weighted.py +++ b/python/graphscope/nx/tests/algorithms/forward/shortest_paths/test_weighted.py @@ -17,8 +17,8 @@ import networkx.algorithms.shortest_paths.tests.test_weighted import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx -from graphscope.experimental.nx.utils.compat import with_graphscope_nx_context +from graphscope.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import with_graphscope_nx_context import_as_graphscope_nx(networkx.algorithms.shortest_paths.tests.test_weighted, decorators=pytest.mark.usefixtures("graphscope_session")) diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/test_asteroidal.py b/python/graphscope/nx/tests/algorithms/forward/test_asteroidal.py similarity index 93% rename from python/graphscope/experimental/nx/tests/algorithms/forward/test_asteroidal.py rename to python/graphscope/nx/tests/algorithms/forward/test_asteroidal.py index aed6f9ca5aad..8fe6b921456e 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/test_asteroidal.py +++ b/python/graphscope/nx/tests/algorithms/forward/test_asteroidal.py @@ -1,6 +1,6 @@ import pytest -import graphscope.experimental.nx as nx +import graphscope.nx as nx @pytest.mark.usefixtures("graphscope_session") diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/test_boundary.py b/python/graphscope/nx/tests/algorithms/forward/test_boundary.py similarity index 86% rename from python/graphscope/experimental/nx/tests/algorithms/forward/test_boundary.py rename to python/graphscope/nx/tests/algorithms/forward/test_boundary.py index 053f417db963..87e7dceb1d71 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/test_boundary.py +++ b/python/graphscope/nx/tests/algorithms/forward/test_boundary.py @@ -1,8 +1,8 @@ import networkx.algorithms.tests.test_boundary import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx -from graphscope.experimental.nx.utils.compat import with_graphscope_nx_context +from graphscope.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import with_graphscope_nx_context import_as_graphscope_nx(networkx.algorithms.tests.test_boundary, decorators=pytest.mark.usefixtures("graphscope_session")) diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/test_bridges.py b/python/graphscope/nx/tests/algorithms/forward/test_bridges.py similarity index 73% rename from python/graphscope/experimental/nx/tests/algorithms/forward/test_bridges.py rename to python/graphscope/nx/tests/algorithms/forward/test_bridges.py index 07e6060c4784..9a7269614a2a 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/test_bridges.py +++ b/python/graphscope/nx/tests/algorithms/forward/test_bridges.py @@ -1,7 +1,7 @@ import networkx.algorithms.tests.test_bridges import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import import_as_graphscope_nx import_as_graphscope_nx(networkx.algorithms.tests.test_bridges, decorators=pytest.mark.usefixtures("graphscope_session")) diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/test_chains.py b/python/graphscope/nx/tests/algorithms/forward/test_chains.py similarity index 73% rename from python/graphscope/experimental/nx/tests/algorithms/forward/test_chains.py rename to python/graphscope/nx/tests/algorithms/forward/test_chains.py index 7197896ea1ff..a78b90de4ea9 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/test_chains.py +++ b/python/graphscope/nx/tests/algorithms/forward/test_chains.py @@ -1,7 +1,7 @@ import networkx.algorithms.tests.test_chains import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import import_as_graphscope_nx import_as_graphscope_nx(networkx.algorithms.tests.test_chains, decorators=pytest.mark.usefixtures("graphscope_session")) diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/test_chordal.py b/python/graphscope/nx/tests/algorithms/forward/test_chordal.py similarity index 57% rename from python/graphscope/experimental/nx/tests/algorithms/forward/test_chordal.py rename to python/graphscope/nx/tests/algorithms/forward/test_chordal.py index 7c5b3dc4f0d4..1b38503d4434 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/test_chordal.py +++ b/python/graphscope/nx/tests/algorithms/forward/test_chordal.py @@ -1,8 +1,8 @@ import networkx.algorithms.tests.test_chordal import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx -from graphscope.experimental.nx.utils.compat import with_graphscope_nx_context +from graphscope.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import with_graphscope_nx_context import_as_graphscope_nx(networkx.algorithms.tests.test_chordal, decorators=pytest.mark.usefixtures("graphscope_session")) diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/test_clique.py b/python/graphscope/nx/tests/algorithms/forward/test_clique.py similarity index 73% rename from python/graphscope/experimental/nx/tests/algorithms/forward/test_clique.py rename to python/graphscope/nx/tests/algorithms/forward/test_clique.py index 2f2c2b6ac3e6..517903cc578e 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/test_clique.py +++ b/python/graphscope/nx/tests/algorithms/forward/test_clique.py @@ -1,7 +1,7 @@ import networkx.algorithms.tests.test_clique import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import import_as_graphscope_nx import_as_graphscope_nx(networkx.algorithms.tests.test_clique, decorators=pytest.mark.usefixtures("graphscope_session")) diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/test_cluster.py b/python/graphscope/nx/tests/algorithms/forward/test_cluster.py similarity index 73% rename from python/graphscope/experimental/nx/tests/algorithms/forward/test_cluster.py rename to python/graphscope/nx/tests/algorithms/forward/test_cluster.py index a29c2b2ee5f8..ab8d04551599 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/test_cluster.py +++ b/python/graphscope/nx/tests/algorithms/forward/test_cluster.py @@ -1,7 +1,7 @@ import networkx.algorithms.tests.test_cluster import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import import_as_graphscope_nx import_as_graphscope_nx(networkx.algorithms.tests.test_cluster, decorators=pytest.mark.usefixtures("graphscope_session")) diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/test_communicability.py b/python/graphscope/nx/tests/algorithms/forward/test_communicability.py similarity index 74% rename from python/graphscope/experimental/nx/tests/algorithms/forward/test_communicability.py rename to python/graphscope/nx/tests/algorithms/forward/test_communicability.py index 6e0964135201..96e2832eedc6 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/test_communicability.py +++ b/python/graphscope/nx/tests/algorithms/forward/test_communicability.py @@ -1,7 +1,7 @@ import networkx.algorithms.tests.test_communicability import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import import_as_graphscope_nx import_as_graphscope_nx(networkx.algorithms.tests.test_communicability, decorators=pytest.mark.usefixtures("graphscope_session")) diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/test_core.py b/python/graphscope/nx/tests/algorithms/forward/test_core.py similarity index 72% rename from python/graphscope/experimental/nx/tests/algorithms/forward/test_core.py rename to python/graphscope/nx/tests/algorithms/forward/test_core.py index 5fa3a09a0310..775fde8894b0 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/test_core.py +++ b/python/graphscope/nx/tests/algorithms/forward/test_core.py @@ -1,7 +1,7 @@ import networkx.algorithms.tests.test_core import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import import_as_graphscope_nx import_as_graphscope_nx(networkx.algorithms.tests.test_core, decorators=pytest.mark.usefixtures("graphscope_session")) diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/test_covering.py b/python/graphscope/nx/tests/algorithms/forward/test_covering.py similarity index 73% rename from python/graphscope/experimental/nx/tests/algorithms/forward/test_covering.py rename to python/graphscope/nx/tests/algorithms/forward/test_covering.py index 0314470b3030..62568e412c71 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/test_covering.py +++ b/python/graphscope/nx/tests/algorithms/forward/test_covering.py @@ -1,7 +1,7 @@ import networkx.algorithms.tests.test_covering import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import import_as_graphscope_nx import_as_graphscope_nx(networkx.algorithms.tests.test_covering, decorators=pytest.mark.usefixtures("graphscope_session")) diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/test_cuts.py b/python/graphscope/nx/tests/algorithms/forward/test_cuts.py similarity index 84% rename from python/graphscope/experimental/nx/tests/algorithms/forward/test_cuts.py rename to python/graphscope/nx/tests/algorithms/forward/test_cuts.py index 080f8a1e835d..f2bc82ac1de6 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/test_cuts.py +++ b/python/graphscope/nx/tests/algorithms/forward/test_cuts.py @@ -1,8 +1,8 @@ import networkx.algorithms.tests.test_cuts import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx -from graphscope.experimental.nx.utils.compat import with_graphscope_nx_context +from graphscope.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import with_graphscope_nx_context import_as_graphscope_nx(networkx.algorithms.tests.test_cuts, decorators=pytest.mark.usefixtures("graphscope_session")) diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/test_cycles.py b/python/graphscope/nx/tests/algorithms/forward/test_cycles.py similarity index 88% rename from python/graphscope/experimental/nx/tests/algorithms/forward/test_cycles.py rename to python/graphscope/nx/tests/algorithms/forward/test_cycles.py index a9d0992fef8d..77121e372ca5 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/test_cycles.py +++ b/python/graphscope/nx/tests/algorithms/forward/test_cycles.py @@ -1,8 +1,8 @@ import networkx.algorithms.tests.test_cycles import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx -from graphscope.experimental.nx.utils.compat import with_graphscope_nx_context +from graphscope.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import with_graphscope_nx_context import_as_graphscope_nx(networkx.algorithms.tests.test_cycles, decorators=pytest.mark.usefixtures("graphscope_session")) diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/test_dag.py b/python/graphscope/nx/tests/algorithms/forward/test_dag.py similarity index 90% rename from python/graphscope/experimental/nx/tests/algorithms/forward/test_dag.py rename to python/graphscope/nx/tests/algorithms/forward/test_dag.py index e561ddc83d6a..4b1b2be4f87c 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/test_dag.py +++ b/python/graphscope/nx/tests/algorithms/forward/test_dag.py @@ -1,8 +1,8 @@ import networkx.algorithms.tests.test_dag import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx -from graphscope.experimental.nx.utils.compat import with_graphscope_nx_context +from graphscope.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import with_graphscope_nx_context import_as_graphscope_nx(networkx.algorithms.tests.test_dag, decorators=pytest.mark.usefixtures("graphscope_session")) diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/test_distance_measures.py b/python/graphscope/nx/tests/algorithms/forward/test_distance_measures.py similarity index 79% rename from python/graphscope/experimental/nx/tests/algorithms/forward/test_distance_measures.py rename to python/graphscope/nx/tests/algorithms/forward/test_distance_measures.py index 877968428509..348f840f0632 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/test_distance_measures.py +++ b/python/graphscope/nx/tests/algorithms/forward/test_distance_measures.py @@ -1,8 +1,8 @@ import networkx.algorithms.tests.test_distance_measures import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx -from graphscope.experimental.nx.utils.compat import with_graphscope_nx_context +from graphscope.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import with_graphscope_nx_context import_as_graphscope_nx(networkx.algorithms.tests.test_distance_measures, decorators=pytest.mark.usefixtures("graphscope_session")) diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/test_distance_regular.py b/python/graphscope/nx/tests/algorithms/forward/test_distance_regular.py similarity index 74% rename from python/graphscope/experimental/nx/tests/algorithms/forward/test_distance_regular.py rename to python/graphscope/nx/tests/algorithms/forward/test_distance_regular.py index e14529bd3526..f8803a9da101 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/test_distance_regular.py +++ b/python/graphscope/nx/tests/algorithms/forward/test_distance_regular.py @@ -1,7 +1,7 @@ import networkx.algorithms.tests.test_distance_regular import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import import_as_graphscope_nx import_as_graphscope_nx(networkx.algorithms.tests.test_distance_regular, decorators=pytest.mark.usefixtures("graphscope_session")) diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/test_dominance.py b/python/graphscope/nx/tests/algorithms/forward/test_dominance.py similarity index 88% rename from python/graphscope/experimental/nx/tests/algorithms/forward/test_dominance.py rename to python/graphscope/nx/tests/algorithms/forward/test_dominance.py index 2a992190bee7..6b70a314a6c2 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/test_dominance.py +++ b/python/graphscope/nx/tests/algorithms/forward/test_dominance.py @@ -1,8 +1,8 @@ import networkx.algorithms.tests.test_dominance import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx -from graphscope.experimental.nx.utils.compat import with_graphscope_nx_context +from graphscope.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import with_graphscope_nx_context import_as_graphscope_nx(networkx.algorithms.tests.test_dominance, decorators=pytest.mark.usefixtures("graphscope_session")) diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/test_dominating.py b/python/graphscope/nx/tests/algorithms/forward/test_dominating.py similarity index 73% rename from python/graphscope/experimental/nx/tests/algorithms/forward/test_dominating.py rename to python/graphscope/nx/tests/algorithms/forward/test_dominating.py index 20847d56748e..3536ec5d33d3 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/test_dominating.py +++ b/python/graphscope/nx/tests/algorithms/forward/test_dominating.py @@ -1,7 +1,7 @@ import networkx.algorithms.tests.test_dominating import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import import_as_graphscope_nx import_as_graphscope_nx(networkx.algorithms.tests.test_dominating, decorators=pytest.mark.usefixtures("graphscope_session")) diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/test_efficiency.py b/python/graphscope/nx/tests/algorithms/forward/test_efficiency.py similarity index 73% rename from python/graphscope/experimental/nx/tests/algorithms/forward/test_efficiency.py rename to python/graphscope/nx/tests/algorithms/forward/test_efficiency.py index 71dc719106d8..1cdcd61857a5 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/test_efficiency.py +++ b/python/graphscope/nx/tests/algorithms/forward/test_efficiency.py @@ -1,7 +1,7 @@ import networkx.algorithms.tests.test_efficiency import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import import_as_graphscope_nx import_as_graphscope_nx(networkx.algorithms.tests.test_efficiency, decorators=pytest.mark.usefixtures("graphscope_session")) diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/test_euler.py b/python/graphscope/nx/tests/algorithms/forward/test_euler.py similarity index 91% rename from python/graphscope/experimental/nx/tests/algorithms/forward/test_euler.py rename to python/graphscope/nx/tests/algorithms/forward/test_euler.py index d38f585133da..ec126ea79140 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/test_euler.py +++ b/python/graphscope/nx/tests/algorithms/forward/test_euler.py @@ -1,8 +1,8 @@ import networkx.algorithms.tests.test_euler import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx -from graphscope.experimental.nx.utils.compat import with_graphscope_nx_context +from graphscope.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import with_graphscope_nx_context import_as_graphscope_nx(networkx.algorithms.tests.test_euler, decorators=pytest.mark.usefixtures("graphscope_session")) diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/test_graphical.py b/python/graphscope/nx/tests/algorithms/forward/test_graphical.py similarity index 73% rename from python/graphscope/experimental/nx/tests/algorithms/forward/test_graphical.py rename to python/graphscope/nx/tests/algorithms/forward/test_graphical.py index 946d2e0fb5a1..9846da3d5dd3 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/test_graphical.py +++ b/python/graphscope/nx/tests/algorithms/forward/test_graphical.py @@ -1,7 +1,7 @@ import networkx.algorithms.tests.test_graphical import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import import_as_graphscope_nx import_as_graphscope_nx(networkx.algorithms.tests.test_graphical, decorators=pytest.mark.usefixtures("graphscope_session")) diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/test_hierarchy.py b/python/graphscope/nx/tests/algorithms/forward/test_hierarchy.py similarity index 73% rename from python/graphscope/experimental/nx/tests/algorithms/forward/test_hierarchy.py rename to python/graphscope/nx/tests/algorithms/forward/test_hierarchy.py index f3e007588b75..3b803f30823d 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/test_hierarchy.py +++ b/python/graphscope/nx/tests/algorithms/forward/test_hierarchy.py @@ -1,7 +1,7 @@ import networkx.algorithms.tests.test_hierarchy import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import import_as_graphscope_nx import_as_graphscope_nx(networkx.algorithms.tests.test_hierarchy, decorators=pytest.mark.usefixtures("graphscope_session")) diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/test_hybrid.py b/python/graphscope/nx/tests/algorithms/forward/test_hybrid.py similarity index 73% rename from python/graphscope/experimental/nx/tests/algorithms/forward/test_hybrid.py rename to python/graphscope/nx/tests/algorithms/forward/test_hybrid.py index d9a20ed9c751..296515c09bc1 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/test_hybrid.py +++ b/python/graphscope/nx/tests/algorithms/forward/test_hybrid.py @@ -1,7 +1,7 @@ import networkx.algorithms.tests.test_hybrid import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import import_as_graphscope_nx import_as_graphscope_nx(networkx.algorithms.tests.test_hybrid, decorators=pytest.mark.usefixtures("graphscope_session")) diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/test_isolate.py b/python/graphscope/nx/tests/algorithms/forward/test_isolate.py similarity index 73% rename from python/graphscope/experimental/nx/tests/algorithms/forward/test_isolate.py rename to python/graphscope/nx/tests/algorithms/forward/test_isolate.py index 98bd987b83de..62d47ec9fce7 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/test_isolate.py +++ b/python/graphscope/nx/tests/algorithms/forward/test_isolate.py @@ -1,7 +1,7 @@ import networkx.algorithms.tests.test_isolate import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import import_as_graphscope_nx import_as_graphscope_nx(networkx.algorithms.tests.test_isolate, decorators=pytest.mark.usefixtures("graphscope_session")) diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/test_link_prediction.py b/python/graphscope/nx/tests/algorithms/forward/test_link_prediction.py similarity index 95% rename from python/graphscope/experimental/nx/tests/algorithms/forward/test_link_prediction.py rename to python/graphscope/nx/tests/algorithms/forward/test_link_prediction.py index aaef7c9177f2..d0f67952c34b 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/test_link_prediction.py +++ b/python/graphscope/nx/tests/algorithms/forward/test_link_prediction.py @@ -1,8 +1,8 @@ import networkx.algorithms.tests.test_link_prediction import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx -from graphscope.experimental.nx.utils.compat import with_graphscope_nx_context +from graphscope.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import with_graphscope_nx_context import_as_graphscope_nx(networkx.algorithms.tests.test_link_prediction, decorators=pytest.mark.usefixtures("graphscope_session")) diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/test_lowest_common_ancestors.py b/python/graphscope/nx/tests/algorithms/forward/test_lowest_common_ancestors.py similarity index 88% rename from python/graphscope/experimental/nx/tests/algorithms/forward/test_lowest_common_ancestors.py rename to python/graphscope/nx/tests/algorithms/forward/test_lowest_common_ancestors.py index 3620e8434c50..fb6feee8fb1a 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/test_lowest_common_ancestors.py +++ b/python/graphscope/nx/tests/algorithms/forward/test_lowest_common_ancestors.py @@ -1,8 +1,8 @@ import networkx.algorithms.tests.test_lowest_common_ancestors import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx -from graphscope.experimental.nx.utils.compat import with_graphscope_nx_context +from graphscope.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import with_graphscope_nx_context import_as_graphscope_nx(networkx.algorithms.tests.test_lowest_common_ancestors, decorators=pytest.mark.usefixtures("graphscope_session")) diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/test_matching.py b/python/graphscope/nx/tests/algorithms/forward/test_matching.py similarity index 73% rename from python/graphscope/experimental/nx/tests/algorithms/forward/test_matching.py rename to python/graphscope/nx/tests/algorithms/forward/test_matching.py index 4f32f444e45f..2c836f3d9d5d 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/test_matching.py +++ b/python/graphscope/nx/tests/algorithms/forward/test_matching.py @@ -1,7 +1,7 @@ import networkx.algorithms.tests.test_matching import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import import_as_graphscope_nx import_as_graphscope_nx(networkx.algorithms.tests.test_matching, decorators=pytest.mark.usefixtures("graphscope_session")) diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/test_minors.py b/python/graphscope/nx/tests/algorithms/forward/test_minors.py similarity index 84% rename from python/graphscope/experimental/nx/tests/algorithms/forward/test_minors.py rename to python/graphscope/nx/tests/algorithms/forward/test_minors.py index 3380e0306d10..f7d81a719dc4 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/test_minors.py +++ b/python/graphscope/nx/tests/algorithms/forward/test_minors.py @@ -1,7 +1,7 @@ import networkx.algorithms.tests.test_minors import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import import_as_graphscope_nx import_as_graphscope_nx(networkx.algorithms.tests.test_minors, decorators=pytest.mark.usefixtures("graphscope_session")) diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/test_mis.py b/python/graphscope/nx/tests/algorithms/forward/test_mis.py similarity index 72% rename from python/graphscope/experimental/nx/tests/algorithms/forward/test_mis.py rename to python/graphscope/nx/tests/algorithms/forward/test_mis.py index b059863b583c..45c058385915 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/test_mis.py +++ b/python/graphscope/nx/tests/algorithms/forward/test_mis.py @@ -1,7 +1,7 @@ import networkx.algorithms.tests.test_mis import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import import_as_graphscope_nx import_as_graphscope_nx(networkx.algorithms.tests.test_mis, decorators=pytest.mark.usefixtures("graphscope_session")) diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/test_moral.py b/python/graphscope/nx/tests/algorithms/forward/test_moral.py similarity index 72% rename from python/graphscope/experimental/nx/tests/algorithms/forward/test_moral.py rename to python/graphscope/nx/tests/algorithms/forward/test_moral.py index a04d7fecc874..9de5a034c46a 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/test_moral.py +++ b/python/graphscope/nx/tests/algorithms/forward/test_moral.py @@ -1,7 +1,7 @@ import networkx.algorithms.tests.test_moral import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import import_as_graphscope_nx import_as_graphscope_nx(networkx.algorithms.tests.test_moral, decorators=pytest.mark.usefixtures("graphscope_session")) diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/test_non_randomness.py b/python/graphscope/nx/tests/algorithms/forward/test_non_randomness.py similarity index 74% rename from python/graphscope/experimental/nx/tests/algorithms/forward/test_non_randomness.py rename to python/graphscope/nx/tests/algorithms/forward/test_non_randomness.py index a17d0fcb8c94..693069c7d058 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/test_non_randomness.py +++ b/python/graphscope/nx/tests/algorithms/forward/test_non_randomness.py @@ -1,7 +1,7 @@ import networkx.algorithms.tests.test_non_randomness import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import import_as_graphscope_nx import_as_graphscope_nx(networkx.algorithms.tests.test_non_randomness, decorators=pytest.mark.usefixtures("graphscope_session")) diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/test_planar_drawing.py b/python/graphscope/nx/tests/algorithms/forward/test_planar_drawing.py similarity index 98% rename from python/graphscope/experimental/nx/tests/algorithms/forward/test_planar_drawing.py rename to python/graphscope/nx/tests/algorithms/forward/test_planar_drawing.py index 7ac83a8e4789..4d1a99b81592 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/test_planar_drawing.py +++ b/python/graphscope/nx/tests/algorithms/forward/test_planar_drawing.py @@ -17,7 +17,7 @@ import networkx.algorithms.tests.test_planar_drawing import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import import_as_graphscope_nx import_as_graphscope_nx(networkx.algorithms.tests.test_planar_drawing, decorators=pytest.mark.usefixtures("graphscope_session")) diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/test_planarity.py b/python/graphscope/nx/tests/algorithms/forward/test_planarity.py similarity index 89% rename from python/graphscope/experimental/nx/tests/algorithms/forward/test_planarity.py rename to python/graphscope/nx/tests/algorithms/forward/test_planarity.py index aac5dc7e5a8e..2a0d935f41a0 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/test_planarity.py +++ b/python/graphscope/nx/tests/algorithms/forward/test_planarity.py @@ -17,8 +17,8 @@ import networkx.algorithms.tests.test_planarity import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx -from graphscope.experimental.nx.utils.compat import with_graphscope_nx_context +from graphscope.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import with_graphscope_nx_context import_as_graphscope_nx(networkx.algorithms.tests.test_planarity, decorators=pytest.mark.usefixtures("graphscope_session")) diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/test_reciprocity.py b/python/graphscope/nx/tests/algorithms/forward/test_reciprocity.py similarity index 73% rename from python/graphscope/experimental/nx/tests/algorithms/forward/test_reciprocity.py rename to python/graphscope/nx/tests/algorithms/forward/test_reciprocity.py index 4519b48d4f45..c57665ce2e79 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/test_reciprocity.py +++ b/python/graphscope/nx/tests/algorithms/forward/test_reciprocity.py @@ -1,7 +1,7 @@ import networkx.algorithms.tests.test_reciprocity import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import import_as_graphscope_nx import_as_graphscope_nx(networkx.algorithms.tests.test_reciprocity, decorators=pytest.mark.usefixtures("graphscope_session")) diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/test_richclub.py b/python/graphscope/nx/tests/algorithms/forward/test_richclub.py similarity index 80% rename from python/graphscope/experimental/nx/tests/algorithms/forward/test_richclub.py rename to python/graphscope/nx/tests/algorithms/forward/test_richclub.py index 018fed2cf83f..de6e0388c174 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/test_richclub.py +++ b/python/graphscope/nx/tests/algorithms/forward/test_richclub.py @@ -1,7 +1,7 @@ import networkx.algorithms.tests.test_richclub import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import import_as_graphscope_nx import_as_graphscope_nx(networkx.algorithms.tests.test_richclub, decorators=pytest.mark.usefixtures("graphscope_session")) diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/test_similarity.py b/python/graphscope/nx/tests/algorithms/forward/test_similarity.py similarity index 79% rename from python/graphscope/experimental/nx/tests/algorithms/forward/test_similarity.py rename to python/graphscope/nx/tests/algorithms/forward/test_similarity.py index f9f2baecba78..11ee03890ceb 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/test_similarity.py +++ b/python/graphscope/nx/tests/algorithms/forward/test_similarity.py @@ -1,8 +1,8 @@ import networkx.algorithms.tests.test_similarity import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx -from graphscope.experimental.nx.utils.compat import with_graphscope_nx_context +from graphscope.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import with_graphscope_nx_context import_as_graphscope_nx(networkx.algorithms.tests.test_similarity, decorators=pytest.mark.usefixtures("graphscope_session")) diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/test_simple_paths.py b/python/graphscope/nx/tests/algorithms/forward/test_simple_paths.py similarity index 90% rename from python/graphscope/experimental/nx/tests/algorithms/forward/test_simple_paths.py rename to python/graphscope/nx/tests/algorithms/forward/test_simple_paths.py index b3f7c8121c8b..c02366fa9cb0 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/test_simple_paths.py +++ b/python/graphscope/nx/tests/algorithms/forward/test_simple_paths.py @@ -1,8 +1,8 @@ import networkx.algorithms.tests.test_simple_paths import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx -from graphscope.experimental.nx.utils.compat import with_graphscope_nx_context +from graphscope.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import with_graphscope_nx_context import_as_graphscope_nx(networkx.algorithms.tests.test_simple_paths, decorators=pytest.mark.usefixtures("graphscope_session")) diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/test_smallworld.py b/python/graphscope/nx/tests/algorithms/forward/test_smallworld.py similarity index 73% rename from python/graphscope/experimental/nx/tests/algorithms/forward/test_smallworld.py rename to python/graphscope/nx/tests/algorithms/forward/test_smallworld.py index 8c838c6d6ac4..f3f2f248dd63 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/test_smallworld.py +++ b/python/graphscope/nx/tests/algorithms/forward/test_smallworld.py @@ -1,7 +1,7 @@ import networkx.algorithms.tests.test_smallworld import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import import_as_graphscope_nx import_as_graphscope_nx(networkx.algorithms.tests.test_smallworld, decorators=pytest.mark.usefixtures("graphscope_session")) diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/test_smetric.py b/python/graphscope/nx/tests/algorithms/forward/test_smetric.py similarity index 73% rename from python/graphscope/experimental/nx/tests/algorithms/forward/test_smetric.py rename to python/graphscope/nx/tests/algorithms/forward/test_smetric.py index 8316a0e1e621..a8e331f54381 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/test_smetric.py +++ b/python/graphscope/nx/tests/algorithms/forward/test_smetric.py @@ -1,7 +1,7 @@ import networkx.algorithms.tests.test_smetric import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import import_as_graphscope_nx import_as_graphscope_nx(networkx.algorithms.tests.test_smetric, decorators=pytest.mark.usefixtures("graphscope_session")) diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/test_sparsifiers.py b/python/graphscope/nx/tests/algorithms/forward/test_sparsifiers.py similarity index 73% rename from python/graphscope/experimental/nx/tests/algorithms/forward/test_sparsifiers.py rename to python/graphscope/nx/tests/algorithms/forward/test_sparsifiers.py index 80e930cc51db..109a93fed270 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/test_sparsifiers.py +++ b/python/graphscope/nx/tests/algorithms/forward/test_sparsifiers.py @@ -1,7 +1,7 @@ import networkx.algorithms.tests.test_sparsifiers import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import import_as_graphscope_nx import_as_graphscope_nx(networkx.algorithms.tests.test_sparsifiers, decorators=pytest.mark.usefixtures("graphscope_session")) diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/test_structuralholes.py b/python/graphscope/nx/tests/algorithms/forward/test_structuralholes.py similarity index 74% rename from python/graphscope/experimental/nx/tests/algorithms/forward/test_structuralholes.py rename to python/graphscope/nx/tests/algorithms/forward/test_structuralholes.py index 9f9bfdd4ee13..9990ccc26ece 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/test_structuralholes.py +++ b/python/graphscope/nx/tests/algorithms/forward/test_structuralholes.py @@ -1,7 +1,7 @@ import networkx.algorithms.tests.test_structuralholes import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import import_as_graphscope_nx import_as_graphscope_nx(networkx.algorithms.tests.test_structuralholes, decorators=pytest.mark.usefixtures("graphscope_session")) diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/test_swap.py b/python/graphscope/nx/tests/algorithms/forward/test_swap.py similarity index 72% rename from python/graphscope/experimental/nx/tests/algorithms/forward/test_swap.py rename to python/graphscope/nx/tests/algorithms/forward/test_swap.py index 4dc218fc2d3e..b4e3e097986b 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/test_swap.py +++ b/python/graphscope/nx/tests/algorithms/forward/test_swap.py @@ -1,7 +1,7 @@ import networkx.algorithms.tests.test_swap import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import import_as_graphscope_nx import_as_graphscope_nx(networkx.algorithms.tests.test_swap, decorators=pytest.mark.usefixtures("graphscope_session")) diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/test_threshold.py b/python/graphscope/nx/tests/algorithms/forward/test_threshold.py similarity index 87% rename from python/graphscope/experimental/nx/tests/algorithms/forward/test_threshold.py rename to python/graphscope/nx/tests/algorithms/forward/test_threshold.py index 8dbb279b953b..734811c95f06 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/test_threshold.py +++ b/python/graphscope/nx/tests/algorithms/forward/test_threshold.py @@ -1,8 +1,8 @@ import networkx.algorithms.tests.test_threshold import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx -from graphscope.experimental.nx.utils.compat import with_graphscope_nx_context +from graphscope.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import with_graphscope_nx_context import_as_graphscope_nx(networkx.algorithms.tests.test_threshold, decorators=pytest.mark.usefixtures("graphscope_session")) diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/test_tournament.py b/python/graphscope/nx/tests/algorithms/forward/test_tournament.py similarity index 73% rename from python/graphscope/experimental/nx/tests/algorithms/forward/test_tournament.py rename to python/graphscope/nx/tests/algorithms/forward/test_tournament.py index a5a1f6d096af..720bbd2c4dc2 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/test_tournament.py +++ b/python/graphscope/nx/tests/algorithms/forward/test_tournament.py @@ -1,7 +1,7 @@ import networkx.algorithms.tests.test_tournament import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import import_as_graphscope_nx import_as_graphscope_nx(networkx.algorithms.tests.test_tournament, decorators=pytest.mark.usefixtures("graphscope_session")) diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/test_triads.py b/python/graphscope/nx/tests/algorithms/forward/test_triads.py similarity index 73% rename from python/graphscope/experimental/nx/tests/algorithms/forward/test_triads.py rename to python/graphscope/nx/tests/algorithms/forward/test_triads.py index 07282bb708d0..1567bfc27a12 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/test_triads.py +++ b/python/graphscope/nx/tests/algorithms/forward/test_triads.py @@ -1,7 +1,7 @@ import networkx.algorithms.tests.test_triads import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import import_as_graphscope_nx import_as_graphscope_nx(networkx.algorithms.tests.test_triads, decorators=pytest.mark.usefixtures("graphscope_session")) diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/test_vitality.py b/python/graphscope/nx/tests/algorithms/forward/test_vitality.py similarity index 77% rename from python/graphscope/experimental/nx/tests/algorithms/forward/test_vitality.py rename to python/graphscope/nx/tests/algorithms/forward/test_vitality.py index 15bdc3bedd85..e83a788b538c 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/test_vitality.py +++ b/python/graphscope/nx/tests/algorithms/forward/test_vitality.py @@ -1,8 +1,8 @@ import networkx.algorithms.tests.test_vitality import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx -from graphscope.experimental.nx.utils.compat import with_graphscope_nx_context +from graphscope.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import with_graphscope_nx_context import_as_graphscope_nx(networkx.algorithms.tests.test_vitality, decorators=pytest.mark.usefixtures("graphscope_session")) diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/test_voronoi.py b/python/graphscope/nx/tests/algorithms/forward/test_voronoi.py similarity index 84% rename from python/graphscope/experimental/nx/tests/algorithms/forward/test_voronoi.py rename to python/graphscope/nx/tests/algorithms/forward/test_voronoi.py index 2b715ad764fc..8672071c3ec0 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/test_voronoi.py +++ b/python/graphscope/nx/tests/algorithms/forward/test_voronoi.py @@ -1,8 +1,8 @@ import networkx.algorithms.tests.test_voronoi import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx -from graphscope.experimental.nx.utils.compat import with_graphscope_nx_context +from graphscope.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import with_graphscope_nx_context import_as_graphscope_nx(networkx.algorithms.tests.test_voronoi, decorators=pytest.mark.usefixtures("graphscope_session")) diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/test_wiener.py b/python/graphscope/nx/tests/algorithms/forward/test_wiener.py similarity index 73% rename from python/graphscope/experimental/nx/tests/algorithms/forward/test_wiener.py rename to python/graphscope/nx/tests/algorithms/forward/test_wiener.py index a826b144e13f..0f86b89dce3f 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/test_wiener.py +++ b/python/graphscope/nx/tests/algorithms/forward/test_wiener.py @@ -1,7 +1,7 @@ import networkx.algorithms.tests.test_wiener import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import import_as_graphscope_nx import_as_graphscope_nx(networkx.algorithms.tests.test_wiener, decorators=pytest.mark.usefixtures("graphscope_session")) diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/traversal/__init__.py b/python/graphscope/nx/tests/algorithms/forward/traversal/__init__.py similarity index 100% rename from python/graphscope/experimental/nx/tests/algorithms/forward/traversal/__init__.py rename to python/graphscope/nx/tests/algorithms/forward/traversal/__init__.py diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/traversal/test_beamsearch.py b/python/graphscope/nx/tests/algorithms/forward/traversal/test_beamsearch.py similarity index 75% rename from python/graphscope/experimental/nx/tests/algorithms/forward/traversal/test_beamsearch.py rename to python/graphscope/nx/tests/algorithms/forward/traversal/test_beamsearch.py index 95e0281a597e..c558cefa004c 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/traversal/test_beamsearch.py +++ b/python/graphscope/nx/tests/algorithms/forward/traversal/test_beamsearch.py @@ -1,7 +1,7 @@ import networkx.algorithms.traversal.tests.test_beamsearch import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import import_as_graphscope_nx import_as_graphscope_nx(networkx.algorithms.traversal.tests.test_beamsearch, decorators=pytest.mark.usefixtures("graphscope_session")) diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/traversal/test_bfs.py b/python/graphscope/nx/tests/algorithms/forward/traversal/test_bfs.py similarity index 74% rename from python/graphscope/experimental/nx/tests/algorithms/forward/traversal/test_bfs.py rename to python/graphscope/nx/tests/algorithms/forward/traversal/test_bfs.py index 914be77a550d..fa2b5cb5ed49 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/traversal/test_bfs.py +++ b/python/graphscope/nx/tests/algorithms/forward/traversal/test_bfs.py @@ -1,7 +1,7 @@ import networkx.algorithms.traversal.tests.test_bfs import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import import_as_graphscope_nx import_as_graphscope_nx(networkx.algorithms.traversal.tests.test_bfs, decorators=pytest.mark.usefixtures("graphscope_session")) diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/traversal/test_dfs.py b/python/graphscope/nx/tests/algorithms/forward/traversal/test_dfs.py similarity index 74% rename from python/graphscope/experimental/nx/tests/algorithms/forward/traversal/test_dfs.py rename to python/graphscope/nx/tests/algorithms/forward/traversal/test_dfs.py index dbbba12e7636..bcec5d226243 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/traversal/test_dfs.py +++ b/python/graphscope/nx/tests/algorithms/forward/traversal/test_dfs.py @@ -1,7 +1,7 @@ import networkx.algorithms.traversal.tests.test_dfs import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import import_as_graphscope_nx import_as_graphscope_nx(networkx.algorithms.traversal.tests.test_dfs, decorators=pytest.mark.usefixtures("graphscope_session")) diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/traversal/test_edgebfs.py b/python/graphscope/nx/tests/algorithms/forward/traversal/test_edgebfs.py similarity index 84% rename from python/graphscope/experimental/nx/tests/algorithms/forward/traversal/test_edgebfs.py rename to python/graphscope/nx/tests/algorithms/forward/traversal/test_edgebfs.py index a0156644778d..58332c0ef433 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/traversal/test_edgebfs.py +++ b/python/graphscope/nx/tests/algorithms/forward/traversal/test_edgebfs.py @@ -1,8 +1,8 @@ import networkx.algorithms.traversal.tests.test_edgebfs import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx -from graphscope.experimental.nx.utils.compat import with_graphscope_nx_context +from graphscope.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import with_graphscope_nx_context import_as_graphscope_nx(networkx.algorithms.traversal.tests.test_edgebfs, decorators=pytest.mark.usefixtures("graphscope_session")) diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/traversal/test_edgedfs.py b/python/graphscope/nx/tests/algorithms/forward/traversal/test_edgedfs.py similarity index 84% rename from python/graphscope/experimental/nx/tests/algorithms/forward/traversal/test_edgedfs.py rename to python/graphscope/nx/tests/algorithms/forward/traversal/test_edgedfs.py index 0217a9dd9c44..7379470d4af8 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/traversal/test_edgedfs.py +++ b/python/graphscope/nx/tests/algorithms/forward/traversal/test_edgedfs.py @@ -1,8 +1,8 @@ import networkx.algorithms.traversal.tests.test_edgedfs import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx -from graphscope.experimental.nx.utils.compat import with_graphscope_nx_context +from graphscope.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import with_graphscope_nx_context import_as_graphscope_nx(networkx.algorithms.traversal.tests.test_edgedfs, decorators=pytest.mark.usefixtures("graphscope_session")) diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/tree/__init__.py b/python/graphscope/nx/tests/algorithms/forward/tree/__init__.py similarity index 100% rename from python/graphscope/experimental/nx/tests/algorithms/forward/tree/__init__.py rename to python/graphscope/nx/tests/algorithms/forward/tree/__init__.py diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/tree/test_branchings.py b/python/graphscope/nx/tests/algorithms/forward/tree/test_branchings.py similarity index 94% rename from python/graphscope/experimental/nx/tests/algorithms/forward/tree/test_branchings.py rename to python/graphscope/nx/tests/algorithms/forward/tree/test_branchings.py index 38f967c7128d..372f9a42cd4e 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/tree/test_branchings.py +++ b/python/graphscope/nx/tests/algorithms/forward/tree/test_branchings.py @@ -1,7 +1,7 @@ import networkx.algorithms.tree.tests.test_branchings import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import import_as_graphscope_nx import_as_graphscope_nx(networkx.algorithms.tree.tests.test_branchings, decorators=pytest.mark.usefixtures("graphscope_session")) diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/tree/test_coding.py b/python/graphscope/nx/tests/algorithms/forward/tree/test_coding.py similarity index 79% rename from python/graphscope/experimental/nx/tests/algorithms/forward/tree/test_coding.py rename to python/graphscope/nx/tests/algorithms/forward/tree/test_coding.py index 7e3c2dc9c2a8..ed5d538cdeef 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/tree/test_coding.py +++ b/python/graphscope/nx/tests/algorithms/forward/tree/test_coding.py @@ -1,8 +1,8 @@ import networkx.algorithms.tree.tests.test_coding import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx -from graphscope.experimental.nx.utils.compat import with_graphscope_nx_context +from graphscope.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import with_graphscope_nx_context import_as_graphscope_nx(networkx.algorithms.tree.tests.test_coding, decorators=pytest.mark.usefixtures("graphscope_session")) diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/tree/test_mst.py b/python/graphscope/nx/tests/algorithms/forward/tree/test_mst.py similarity index 85% rename from python/graphscope/experimental/nx/tests/algorithms/forward/tree/test_mst.py rename to python/graphscope/nx/tests/algorithms/forward/tree/test_mst.py index 9dcebae2aa53..1fbcbbe4d299 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/tree/test_mst.py +++ b/python/graphscope/nx/tests/algorithms/forward/tree/test_mst.py @@ -1,7 +1,7 @@ import networkx.algorithms.tree.tests.test_mst import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import import_as_graphscope_nx import_as_graphscope_nx(networkx.algorithms.tree.tests.test_mst, decorators=pytest.mark.usefixtures("graphscope_session")) diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/tree/test_operations.py b/python/graphscope/nx/tests/algorithms/forward/tree/test_operations.py similarity index 74% rename from python/graphscope/experimental/nx/tests/algorithms/forward/tree/test_operations.py rename to python/graphscope/nx/tests/algorithms/forward/tree/test_operations.py index a173fbec2259..0a66edbc075b 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/tree/test_operations.py +++ b/python/graphscope/nx/tests/algorithms/forward/tree/test_operations.py @@ -1,7 +1,7 @@ import networkx.algorithms.tree.tests.test_operations import pytest -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import import_as_graphscope_nx import_as_graphscope_nx(networkx.algorithms.tree.tests.test_operations, decorators=pytest.mark.usefixtures("graphscope_session")) diff --git a/python/graphscope/experimental/nx/tests/algorithms/forward/tree/test_recognition.py b/python/graphscope/nx/tests/algorithms/forward/tree/test_recognition.py similarity index 98% rename from python/graphscope/experimental/nx/tests/algorithms/forward/tree/test_recognition.py rename to python/graphscope/nx/tests/algorithms/forward/tree/test_recognition.py index 275ddf8a217d..61212b65a333 100644 --- a/python/graphscope/experimental/nx/tests/algorithms/forward/tree/test_recognition.py +++ b/python/graphscope/nx/tests/algorithms/forward/tree/test_recognition.py @@ -17,7 +17,7 @@ import pytest -import graphscope.experimental.nx as nx +import graphscope.nx as nx @pytest.mark.usefixtures("graphscope_session") diff --git a/python/graphscope/experimental/nx/tests/classes/conftest.py b/python/graphscope/nx/tests/classes/conftest.py similarity index 100% rename from python/graphscope/experimental/nx/tests/classes/conftest.py rename to python/graphscope/nx/tests/classes/conftest.py diff --git a/python/graphscope/experimental/nx/tests/classes/test_digraph.py b/python/graphscope/nx/tests/classes/test_digraph.py similarity index 96% rename from python/graphscope/experimental/nx/tests/classes/test_digraph.py rename to python/graphscope/nx/tests/classes/test_digraph.py index 6460bdc10fa1..a840319f6f20 100644 --- a/python/graphscope/experimental/nx/tests/classes/test_digraph.py +++ b/python/graphscope/nx/tests/classes/test_digraph.py @@ -21,9 +21,9 @@ from networkx.classes.tests.test_digraph import BaseAttrDiGraphTester from networkx.testing import assert_nodes_equal -from graphscope.experimental import nx -from graphscope.experimental.nx.tests.classes.test_graph import TestEdgeSubgraph -from graphscope.experimental.nx.tests.classes.test_graph import TestGraph +from graphscope import nx +from graphscope.nx.tests.classes.test_graph import TestEdgeSubgraph +from graphscope.nx.tests.classes.test_graph import TestGraph @pytest.mark.usefixtures("graphscope_session") diff --git a/python/graphscope/experimental/nx/tests/classes/test_function.py b/python/graphscope/nx/tests/classes/test_function.py similarity index 99% rename from python/graphscope/experimental/nx/tests/classes/test_function.py rename to python/graphscope/nx/tests/classes/test_function.py index e4b1b4dda419..2dfdadc14524 100644 --- a/python/graphscope/experimental/nx/tests/classes/test_function.py +++ b/python/graphscope/nx/tests/classes/test_function.py @@ -25,7 +25,7 @@ from networkx.testing import assert_edges_equal from networkx.testing import assert_nodes_equal -from graphscope.experimental import nx +from graphscope import nx # fmt: on diff --git a/python/graphscope/experimental/nx/tests/classes/test_graph.py b/python/graphscope/nx/tests/classes/test_graph.py similarity index 99% rename from python/graphscope/experimental/nx/tests/classes/test_graph.py rename to python/graphscope/nx/tests/classes/test_graph.py index c151bf56854c..89fb414ec674 100644 --- a/python/graphscope/experimental/nx/tests/classes/test_graph.py +++ b/python/graphscope/nx/tests/classes/test_graph.py @@ -19,7 +19,7 @@ from networkx.classes.tests.test_graph import TestEdgeSubgraph as _TestEdgeSubgraph from networkx.classes.tests.test_graph import TestGraph as _TestGraph -from graphscope.experimental import nx +from graphscope import nx @pytest.mark.usefixtures("graphscope_session") diff --git a/python/graphscope/experimental/nx/tests/classes/test_graphviews.py b/python/graphscope/nx/tests/classes/test_graphviews.py similarity index 96% rename from python/graphscope/experimental/nx/tests/classes/test_graphviews.py rename to python/graphscope/nx/tests/classes/test_graphviews.py index cc1a1646c021..74e414ab92e6 100644 --- a/python/graphscope/experimental/nx/tests/classes/test_graphviews.py +++ b/python/graphscope/nx/tests/classes/test_graphviews.py @@ -18,9 +18,9 @@ import pytest from networkx.classes.tests import test_graphviews as test_gvs -from graphscope.experimental import nx -from graphscope.experimental.nx.tests.utils import assert_edges_equal -from graphscope.experimental.nx.tests.utils import assert_nodes_equal +from graphscope import nx +from graphscope.nx.tests.utils import assert_edges_equal +from graphscope.nx.tests.utils import assert_nodes_equal # Note: SubGraph views are not tested here. They have their own testing file diff --git a/python/graphscope/experimental/nx/tests/classes/test_reportviews.py b/python/graphscope/nx/tests/classes/test_reportviews.py similarity index 99% rename from python/graphscope/experimental/nx/tests/classes/test_reportviews.py rename to python/graphscope/nx/tests/classes/test_reportviews.py index 840e973a679b..0534fa5583cd 100644 --- a/python/graphscope/experimental/nx/tests/classes/test_reportviews.py +++ b/python/graphscope/nx/tests/classes/test_reportviews.py @@ -39,7 +39,7 @@ TestOutEdgeDataView as _TestOutEdgeDataView from networkx.classes.tests.test_reportviews import TestOutEdgeView as _TestOutEdgeView -from graphscope.experimental import nx +from graphscope import nx # fmt:on diff --git a/python/graphscope/experimental/nx/tests/conftest.py b/python/graphscope/nx/tests/conftest.py similarity index 100% rename from python/graphscope/experimental/nx/tests/conftest.py rename to python/graphscope/nx/tests/conftest.py diff --git a/python/graphscope/experimental/nx/tests/test_nx.py b/python/graphscope/nx/tests/test_nx.py similarity index 99% rename from python/graphscope/experimental/nx/tests/test_nx.py rename to python/graphscope/nx/tests/test_nx.py index ba1e6eb029d2..4ed15741e766 100644 --- a/python/graphscope/experimental/nx/tests/test_nx.py +++ b/python/graphscope/nx/tests/test_nx.py @@ -21,7 +21,7 @@ import pytest import graphscope -import graphscope.experimental.nx as nx +import graphscope.nx as nx from graphscope.client.session import g from graphscope.framework.errors import AnalyticalEngineInternalError from graphscope.framework.errors import InvalidArgumentError diff --git a/python/graphscope/experimental/nx/tests/test_utils.py b/python/graphscope/nx/tests/test_utils.py similarity index 95% rename from python/graphscope/experimental/nx/tests/test_utils.py rename to python/graphscope/nx/tests/test_utils.py index 70f3206c97af..d73480997ec1 100644 --- a/python/graphscope/experimental/nx/tests/test_utils.py +++ b/python/graphscope/nx/tests/test_utils.py @@ -22,10 +22,10 @@ import pytest import graphscope -from graphscope.experimental import nx -from graphscope.experimental.nx.tests.utils import assert_edges_equal -from graphscope.experimental.nx.tests.utils import assert_graphs_equal -from graphscope.experimental.nx.tests.utils import assert_nodes_equal +from graphscope import nx +from graphscope.nx.tests.utils import assert_edges_equal +from graphscope.nx.tests.utils import assert_graphs_equal +from graphscope.nx.tests.utils import assert_nodes_equal # thanks to numpy for this GenericTest class (numpy/testing/test_utils.py) diff --git a/python/graphscope/experimental/nx/tests/utils.py b/python/graphscope/nx/tests/utils.py similarity index 100% rename from python/graphscope/experimental/nx/tests/utils.py rename to python/graphscope/nx/tests/utils.py diff --git a/python/graphscope/experimental/nx/utils/__init__.py b/python/graphscope/nx/utils/__init__.py similarity index 86% rename from python/graphscope/experimental/nx/utils/__init__.py rename to python/graphscope/nx/utils/__init__.py index 99561c211a4d..fcb49e02be78 100644 --- a/python/graphscope/experimental/nx/utils/__init__.py +++ b/python/graphscope/nx/utils/__init__.py @@ -18,5 +18,5 @@ from networkx.utils.contextmanagers import * -from graphscope.experimental.nx.utils.decorators import * -from graphscope.experimental.nx.utils.misc import * +from graphscope.nx.utils.decorators import * +from graphscope.nx.utils.misc import * diff --git a/python/graphscope/experimental/nx/utils/compat.py b/python/graphscope/nx/utils/compat.py similarity index 98% rename from python/graphscope/experimental/nx/utils/compat.py rename to python/graphscope/nx/utils/compat.py index d9afb1ebbdf2..6a1736ddaafb 100644 --- a/python/graphscope/experimental/nx/utils/compat.py +++ b/python/graphscope/nx/utils/compat.py @@ -274,7 +274,7 @@ def replace_module_context( # noqa: C901 def import_as_graphscope_nx(module_or_value, expand=True, decorators=None): """ - With context :mod:`networkx` with :mod:`graphscope.experimental.nx` inside the given module + With context :mod:`networkx` with :mod:`graphscope.nx` inside the given module or value (normally function). Parameters @@ -290,7 +290,7 @@ def import_as_graphscope_nx(module_or_value, expand=True, decorators=None): """ import networkx - from graphscope.experimental import nx as gs_nx + from graphscope import nx as gs_nx return replace_module_context( module_or_value, networkx, gs_nx, expand=expand, decorators=decorators @@ -390,7 +390,7 @@ def patch_class_wrapper(target_class): def with_graphscope_nx_context(source_method_or_class, patch_docstring=True): import networkx - from graphscope.experimental import nx as gs_nx + from graphscope import nx as gs_nx return with_module_map( source_method_or_class, networkx, gs_nx, patch_docstring=patch_docstring diff --git a/python/graphscope/experimental/nx/utils/decorators.py b/python/graphscope/nx/utils/decorators.py similarity index 90% rename from python/graphscope/experimental/nx/utils/decorators.py rename to python/graphscope/nx/utils/decorators.py index 3b3fb4b4d4ff..dcd3c9b60302 100644 --- a/python/graphscope/experimental/nx/utils/decorators.py +++ b/python/graphscope/nx/utils/decorators.py @@ -18,6 +18,6 @@ import networkx.utils.decorators -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import import_as_graphscope_nx import_as_graphscope_nx(networkx.utils.decorators) diff --git a/python/graphscope/experimental/nx/utils/misc.py b/python/graphscope/nx/utils/misc.py similarity index 90% rename from python/graphscope/experimental/nx/utils/misc.py rename to python/graphscope/nx/utils/misc.py index e17a924ad2cd..d89496a6f7b2 100644 --- a/python/graphscope/experimental/nx/utils/misc.py +++ b/python/graphscope/nx/utils/misc.py @@ -18,6 +18,6 @@ import networkx.utils.misc -from graphscope.experimental.nx.utils.compat import import_as_graphscope_nx +from graphscope.nx.utils.compat import import_as_graphscope_nx import_as_graphscope_nx(networkx.utils.misc) diff --git a/python/graphscope/experimental/nx/utils/other.py b/python/graphscope/nx/utils/other.py similarity index 100% rename from python/graphscope/experimental/nx/utils/other.py rename to python/graphscope/nx/utils/other.py diff --git a/python/setup.cfg b/python/setup.cfg index 4fb2b86808d9..c79090e4a97a 100644 --- a/python/setup.cfg +++ b/python/setup.cfg @@ -28,11 +28,11 @@ extend-exclude = dist/ tests/** graphscope/analytical/udf/compile.py - graphscope/experimental/nx/tests/** + graphscope/nx/tests/** jupyter/graphscope/node_modules/.* per-file-ignores = - graphscope/experimental/nx/classes/function.py:F405 - graphscope/experimental/nx/algorithms/builtin.py:W605 + graphscope/nx/classes/function.py:F405 + graphscope/nx/algorithms/builtin.py:W605 [pylint] max-line-length = 88 diff --git a/python/tests/conftest.py b/python/tests/conftest.py index b009a43ff12b..c2c4814f1cf0 100644 --- a/python/tests/conftest.py +++ b/python/tests/conftest.py @@ -22,7 +22,7 @@ import pytest import graphscope -import graphscope.experimental.nx as nx +import graphscope.nx as nx from graphscope import property_sssp from graphscope import sssp from graphscope.client.session import default_session diff --git a/python/tests/test_app.py b/python/tests/test_app.py index 70d300186987..2ce4b1ca60fd 100644 --- a/python/tests/test_app.py +++ b/python/tests/test_app.py @@ -55,7 +55,7 @@ def test_create_app(): @pytest.mark.skipif( - os.environ.get("EXPERIMENTAL_ON") != "ON", reason="dynamic graph is in experimental" + os.environ.get("NETWORKX") != "ON", reason="dynamic graph is in NETWORKX ON" ) def test_compatible_with_dynamic_graph(dynamic_property_graph): # bfs @@ -88,7 +88,7 @@ def test_errors_on_create_app(arrow_property_graph, arrow_project_graph): @pytest.mark.skipif( - os.environ.get("EXPERIMENTAL_ON") != "ON", reason="dynamic graph is in experimental" + os.environ.get("NETWORKX") != "ON", reason="dynamic graph is in NETWORKX ON" ) def test_errors_on_create_app_with_dynamic(dynamic_project_graph): with pytest.raises(graphscope.CompilationError): diff --git a/python/tests/test_graph.py b/python/tests/test_graph.py index c51cbcbd21f4..07e792946681 100644 --- a/python/tests/test_graph.py +++ b/python/tests/test_graph.py @@ -159,7 +159,7 @@ def test_error_on_project_to_simple_wrong_graph_type(arrow_property_graph): @pytest.mark.skipif( - os.environ.get("EXPERIMENTAL_ON") != "ON", reason="dynamic graph is in experimental" + os.environ.get("NETWORKX") != "ON", reason="dynamic graph is in NETWORKX ON" ) def test_error_on_project_to_simple_wrong_graph_type_2(dynamic_property_graph): sdg = dynamic_property_graph.project_to_simple() diff --git a/python/tests/test_udf_app.py b/python/tests/test_udf_app.py index 1edfc1735488..90faf465e6cf 100644 --- a/python/tests/test_udf_app.py +++ b/python/tests/test_udf_app.py @@ -954,7 +954,7 @@ def test_create_cython_app( @pytest.mark.skipif( - os.environ.get("EXPERIMENTAL_ON") != "ON", reason="dynamic graph is in experimental" + os.environ.get("NETWORKX") != "ON", reason="dynamic graph is in NETWORKX ON" ) def test_error_on_create_cython_app( graphscope_session, dynamic_property_graph, dynamic_project_graph, random_gar diff --git a/scripts/build.sh b/scripts/build.sh index 481e0fe59276..da5a82c365d8 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -73,7 +73,7 @@ function check_dependencies_version() { exit 1 fi if ! command -v cargo &> /dev/null; then - echo "cargo ${err_msg}" + echo "cargo ${err_msg} or source ~/.cargo/env" exit fi if ! command -v go &> /dev/null; then diff --git a/scripts/install_dependencies.sh b/scripts/install_dependencies.sh index c94058b07c1a..b610fab236db 100755 --- a/scripts/install_dependencies.sh +++ b/scripts/install_dependencies.sh @@ -88,6 +88,24 @@ function install_dependencies() { sudo apt update sudo apt install -y libarrow-dev=1.0.1-1 libarrow-python-dev=1.0.1-1 + # intall fmt, required by folly + wget https://github.com/fmtlib/fmt/archive/7.0.3.tar.gz -P /tmp + tar xf /tmp/7.0.3.tar.gz -C /tmp/ + pushd /tmp/fmt-7.0.3 + mkdir build && cd build + cmake .. -DBUILD_SHARED_LIBS=ON + make install -j + popd + + # install folly + wget https://github.com/facebook/folly/archive/v2020.10.19.00.tar.gz -P /tmp + tar xf /tmp/v2020.10.19.00.tar.gz -C /tmp/ + pushd /tmp/folly-2020.10.19.00 + mkdir _build && cd _build + cmake -DBUILD_SHARED_LIBS=ON -DCMAKE_POSITION_INDEPENDENT_CODE=ON .. + make install -j + popd + # install zookeeper wget https://archive.apache.org/dist/zookeeper/zookeeper-3.4.14/zookeeper-3.4.14.tar.gz -P /tmp tar xf /tmp/zookeeper-3.4.14.tar.gz -C /tmp/ @@ -101,7 +119,8 @@ function install_dependencies() { # clean rm -fr /tmp/apache-arrow-archive-keyring-latest-$(lsb_release --codename --short).deb - rm -fr /tmp/zookeeper-3.4.14.tar.gz /tmp/zookeeper-3.4.14 /tmp/go1.15.5.linux-amd64.tar.gz + rm -fr /tmp/zookeeper-3.4.14.tar.gz /tmp/zookeeper-3.4.14 /tmp/go1.15.5.linux-amd64.tar.gz /tmp/7.0.3.tar.gz /tmp/v2020.10.19.00.tar.gz + rm -fr /tmp/fmt-7.0.3 /tmp/folly-2020.10.19.00 # install python packages for vineyard codegen pip3 install -U pip --user diff --git a/tutorials/2_graph_manipulations_with_networkx_compatible_apis.ipynb b/tutorials/2_graph_manipulations_with_networkx_compatible_apis.ipynb index e3d97c98670d..95d958a9ca99 100644 --- a/tutorials/2_graph_manipulations_with_networkx_compatible_apis.ipynb +++ b/tutorials/2_graph_manipulations_with_networkx_compatible_apis.ipynb @@ -61,7 +61,7 @@ "metadata": {}, "outputs": [], "source": [ - "import graphscope.experimental.nx as nx" + "import graphscope.nx as nx" ] }, { @@ -122,7 +122,7 @@ "outputs": [], "source": [ "from graphscope.framework.loader import Loader\n", - "graph = graphscope.g()\n", + "graph = graphscope.g(directed=False)\n", "graph = graph.add_vertices(Loader(\"/home/jovyan/datasets/ldbc_sample/person_0_0.csv\", delimiter=\"|\"), \"person\")\n", "graph = graph.add_edges(Loader(\"/home/jovyan/datasets/ldbc_sample/person_knows_person_0_0.csv\", delimiter=\"|\"),\n", " \"knows\",\n", @@ -138,7 +138,7 @@ "source": [ "## Nodes\n", "\n", - "The graph `G` can be grown in several ways. In graphscope.nx, nodes can be some hashable object, including int/float/tuple/bool.\n", + "The graph `G` can be grown in several ways. In graphscope.nx, nodes can be some hashable Python object, including int, str, float, tuple, bool object.\n", "To get started though we’ll look at simple manipulations and start from empty graph. You can add one node\n", "at a time," ]