Try use vineyard:make to test CI

alibaba · Apr 16, 2024 · 4c3bca7 · 4c3bca7
1 parent 662d014
commit 4c3bca7
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 10 deletions.
diff --git a/.github/workflows/build-graphscope-wheels-macos.yml b/.github/workflows/build-graphscope-wheels-macos.yml
@@ -185,7 +185,7 @@ jobs:
       run: |
         . ~/.graphscope_env
         python3 -m pip install libclang
-        git clone --single-branch -b v0.21.5 --depth=1 https://github.com/v6d-io/v6d.git /tmp/v6d
+        git clone --single-branch -b main --depth=1 https://github.com/v6d-io/v6d.git /tmp/v6d
         cd /tmp/v6d
         git submodule update --init
         cmake .  -DCMAKE_INSTALL_PREFIX=/usr/local \

diff --git a/.github/workflows/gae.yml b/.github/workflows/gae.yml
@@ -30,7 +30,7 @@ jobs:
     runs-on: ubuntu-20.04
     if: ${{ github.repository == 'alibaba/GraphScope' }}
     container:
-      image: registry.cn-hongkong.aliyuncs.com/graphscope/graphscope-dev:v0.21.5
+      image: registry.cn-hongkong.aliyuncs.com/graphscope/graphscope-dev:main
     steps:
     - uses: actions/checkout@v3
 

diff --git 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.21.5
+      image: registry.cn-hongkong.aliyuncs.com/graphscope/graphscope-dev:main
       options:
         --shm-size 4096m
 

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -44,7 +44,7 @@ jobs:
         sudo mkdir /opt/graphscope
         sudo chown -R $(id -u):$(id -g) /opt/graphscope
         python3 -m pip install click 
-        python3 gsctl.py install-deps dev --v6d-version v0.21.5
+        python3 gsctl.py install-deps dev --v6d-version main
 
     - name: Setup tmate session
       if: false

diff --git a/analytical_engine/core/grape_instance.cc b/analytical_engine/core/grape_instance.cc
@@ -220,7 +220,11 @@ bl::result<void> GrapeInstance::archiveGraph(const rpc::GSParams& params) {
     bool exists = false;
     VY_OK_OR_RAISE(client_->Exists(frag_group_id, exists));
     if (exists) {
-      graph_utils->ArchiveGraph(frag_group_id, comm_spec_, *client_, params);
+      BOOST_LEAF_CHECK(graph_utils->ArchiveGraph(frag_group_id, comm_spec_, *client_, params));
+    } else {
+      RETURN_GS_ERROR(vineyard::ErrorCode::kInvalidValueError,
+                      "Fragment group " + std::to_string(frag_group_id) +
+                          " does not exist");
     }
   }
   return {};

diff --git a/analytical_engine/frame/property_graph_frame.cc b/analytical_engine/frame/property_graph_frame.cc
@@ -204,7 +204,6 @@ LoadGraph(const grape::CommSpec& comm_spec, vineyard::Client& client,
       BOOST_LEAF_CHECK(loader->Init(graph_info_path, selected_vertices,
                                     selected_edges, true, false,
                                     store_in_local));
-      MPI_Barrier(comm_spec.comm());
       BOOST_LEAF_ASSIGN(frag_group_id, loader->LoadFragmentAsFragmentGroup());
 #else
       RETURN_GS_ERROR(vineyard::ErrorCode::kInvalidValueError,

diff --git a/docs/reference/session.rst b/docs/reference/session.rst
@@ -20,7 +20,6 @@ Session Functions
    graphscope.get_default_session
    graphscope.has_default_session
    graphscope.set_option
-   graphscope.get_option
    graphscope.g
    graphscope.gremlin
    graphscope.graphlearn
diff --git a/k8s/Makefile b/k8s/Makefile
@@ -10,7 +10,7 @@ endif
 ARCH := $(shell uname -m)
 
 VERSION ?= latest
-VINEYARD_VERSION ?= v0.21.5
+VINEYARD_VERSION ?= main
 # This is the version of builder base image in most cases, except for graphscope-dev
 BUILDER_VERSION ?= $(VINEYARD_VERSION)
 # This is the version of runtime base image

diff --git a/k8s/actions-runner-controller/manylinux/Makefile b/k8s/actions-runner-controller/manylinux/Makefile
@@ -12,7 +12,7 @@ TARGETPLATFORM ?= $(shell arch)
 RUNNER_VERSION ?= 2.287.1
 DOCKER_VERSION ?= 20.10.12
 
-VINEYARD_VERSION ?= v0.21.5
+VINEYARD_VERSION ?= main
 BUILDER_VERSION ?= $(VINEYARD_VERSION)
 
 # default list of platforms for which multiarch image is built

diff --git a/k8s/internal/Makefile b/k8s/internal/Makefile
@@ -42,7 +42,7 @@ GRAPHSCOPE_HOME ?= /usr/local
 INSTALL_PREFIX ?= /opt/graphscope
 
 VERSION ?= latest
-VINEYARD_VERSION ?= v0.21.5
+VINEYARD_VERSION ?= main
 PROFILE ?= release
 CI ?= false