Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
lidongze0629 committed Sep 6, 2024
1 parent 32f2d1e commit 394f85c
Show file tree
Hide file tree
Showing 5 changed files with 31 additions and 7 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/interactive.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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]
Expand All @@ -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

Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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/
GLOG_v=10 ./bin/bulk_loader -g ${SCHEMA_FILE} -l ${BULK_LOAD_FILE} -d /tmp/csr-data-dir/
2 changes: 1 addition & 1 deletion .github/workflows/networkx-forward-algo-nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
8 changes: 8 additions & 0 deletions analytical_engine/core/fragment/dynamic_fragment.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
16 changes: 16 additions & 0 deletions analytical_engine/core/fragment/dynamic_projected_fragment.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down Expand Up @@ -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<vertex_t>& MirrorVertices(fid_t fid) const {
return fragment_->MirrorVertices(fid);
}
Expand Down
2 changes: 1 addition & 1 deletion python/setup_gsctl.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down

0 comments on commit 394f85c

Please sign in to comment.