diff --git a/.github/workflows/interactive.yml b/.github/workflows/interactive.yml index 7c5610e28374..80a65d8934cf 100644 --- a/.github/workflows/interactive.yml +++ b/.github/workflows/interactive.yml @@ -28,7 +28,7 @@ jobs: runs-on: ubuntu-20.04 if: ${{ github.repository == 'alibaba/GraphScope' }} container: - image: registry.cn-hongkong.aliyuncs.com/graphscope/graphscope-dev:v0.23.0 + image: registry.cn-hongkong.aliyuncs.com/graphscope/graphscope-dev:v0.24.2-amd64 steps: - uses: actions/checkout@v4 @@ -353,7 +353,7 @@ jobs: test-cmake-options: runs-on: ubuntu-20.04 container: - image: registry.cn-hongkong.aliyuncs.com/graphscope/graphscope-dev:v0.23.0 + image: registry.cn-hongkong.aliyuncs.com/graphscope/graphscope-dev:v0.24.2-amd64 strategy: matrix: BUILD_TEST: [ON, OFF] @@ -373,7 +373,7 @@ jobs: test-AOCC-compilation: runs-on: ubuntu-20.04 container: - image: registry.cn-hongkong.aliyuncs.com/graphscope/graphscope-dev:v0.23.0 + image: registry.cn-hongkong.aliyuncs.com/graphscope/graphscope-dev:v0.24.2-amd64 steps: - uses: actions/checkout@v4 @@ -402,7 +402,7 @@ jobs: runs-on: ubuntu-20.04 if: ${{ github.repository == 'alibaba/GraphScope' }} container: - image: registry.cn-hongkong.aliyuncs.com/graphscope/graphscope-dev:v0.23.0 + image: registry.cn-hongkong.aliyuncs.com/graphscope/graphscope-dev:v0.24.2-amd64 steps: - uses: actions/checkout@v4 @@ -553,4 +553,4 @@ jobs: cd ${GITHUB_WORKSPACE}/flex/build/ SCHEMA_FILE=${GITHUB_WORKSPACE}/flex/tests/rt_mutable_graph/movie_schema_test.yaml BULK_LOAD_FILE=${GITHUB_WORKSPACE}/flex/tests/rt_mutable_graph/movie_import_test.yaml - GLOG_v=10 ./bin/bulk_loader -g ${SCHEMA_FILE} -l ${BULK_LOAD_FILE} -d /tmp/csr-data-dir/ \ No newline at end of file + GLOG_v=10 ./bin/bulk_loader -g ${SCHEMA_FILE} -l ${BULK_LOAD_FILE} -d /tmp/csr-data-dir/ diff --git a/.github/workflows/networkx-forward-algo-nightly.yml b/.github/workflows/networkx-forward-algo-nightly.yml index f395b0a4a7a3..4fe4993ca5d4 100644 --- a/.github/workflows/networkx-forward-algo-nightly.yml +++ b/.github/workflows/networkx-forward-algo-nightly.yml @@ -17,7 +17,7 @@ jobs: run: shell: bash --noprofile --norc -eo pipefail {0} container: - image: registry.cn-hongkong.aliyuncs.com/graphscope/graphscope-dev:v0.22.0 + image: registry.cn-hongkong.aliyuncs.com/graphscope/graphscope-dev:v0.24.2-amd64 options: --shm-size 4096m diff --git a/analytical_engine/core/fragment/dynamic_fragment.h b/analytical_engine/core/fragment/dynamic_fragment.h index 862d55fe4cf4..65becac15e49 100644 --- a/analytical_engine/core/fragment/dynamic_fragment.h +++ b/analytical_engine/core/fragment/dynamic_fragment.h @@ -428,6 +428,14 @@ class DynamicFragment return res; } + inline size_t GetOutgoingEdgeNum() const override { + return oe_.head_edge_num() + is_selfloops_.count(); + } + + inline size_t GetIncomingEdgeNum() const override { + return ie_.head_edge_num() + is_selfloops_.count(); + } + using base_t::InnerVertices; using base_t::IsInnerVertex; using base_t::OuterVertices; diff --git a/analytical_engine/core/fragment/dynamic_projected_fragment.h b/analytical_engine/core/fragment/dynamic_projected_fragment.h index 242c54b68982..1e4829ceb323 100644 --- a/analytical_engine/core/fragment/dynamic_projected_fragment.h +++ b/analytical_engine/core/fragment/dynamic_projected_fragment.h @@ -479,6 +479,10 @@ class DynamicProjectedFragment { inline size_t GetEdgeNum() const { return fragment_->GetEdgeNum(); } + inline size_t GetOutgoingEdgeNum() const { return fragment_->GetOutgoingEdgeNum(); } + + inline size_t GetIncomingEdgeNum() const { return fragment_->GetIncomingEdgeNum(); } + inline bool IsInnerVertex(const vertex_t& v) const { return fragment_->IsInnerVertex(v); } @@ -639,14 +643,26 @@ class DynamicProjectedFragment { return fragment_->IEDests(v); } + inline size_t IEDestsSize() const { + return fragment_->IEDestsSize(); + } + inline grape::DestList OEDests(const vertex_t& v) const { return fragment_->OEDests(v); } + inline size_t OEDestsSize() const { + return fragment_->OEDestsSize(); + } + inline grape::DestList IOEDests(const vertex_t& v) const { return fragment_->IOEDests(v); } + inline size_t IOEDestsSize() const { + return fragment_->IOEDestsSize(); + } + inline const std::vector& MirrorVertices(fid_t fid) const { return fragment_->MirrorVertices(fid); } diff --git a/python/setup_gsctl.py b/python/setup_gsctl.py index 3d118445204f..8a918be4e18a 100644 --- a/python/setup_gsctl.py +++ b/python/setup_gsctl.py @@ -46,7 +46,7 @@ def parse_version(root, **kwargs): if platform.system() == "Linux" and platform.machine() == "aarch64" else "click >= 8.1.6" ), - "graphscope-flex >= 0.27.0", + "graphscope-flex >= 0.28.0", "treelib", "packaging", "pyyaml",