Upgrade to latest vineyard (v0.16.1)

Signed-off-by: Tao He <linzhu.ht@alibaba-inc.com>
alibaba · Jul 17, 2023 · 1867ff6 · 1867ff6
1 parent bb1ce36
commit 1867ff6
Show file tree

Hide file tree

Showing 11 changed files with 28 additions and 18 deletions.
diff --git a/.github/workflows/build-graphscope-wheels-macos.yml b/.github/workflows/build-graphscope-wheels-macos.yml
@@ -163,7 +163,7 @@ jobs:
       run: |
         . ~/.graphscope_env
         python3 -m pip install libclang
-        git clone --single-branch -b v0.15.0 --depth=1 https://github.com/v6d-io/v6d.git /tmp/v6d
+        git clone --single-branch -b v0.16.1 --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.15.0
+      image: registry.cn-hongkong.aliyuncs.com/graphscope/graphscope-dev:v0.16.1
     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.15.0
+      image: registry.cn-hongkong.aliyuncs.com/graphscope/graphscope-dev:v0.16.1
       options:
         --shm-size 4096m
 

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -43,7 +43,7 @@ jobs:
         fi
         sudo mkdir /opt/graphscope
         sudo chown -R $(id -u):$(id -g) /opt/graphscope
-        ./gs install-deps dev --v6d-version v0.15.0
+        ./gs install-deps dev --v6d-version v0.16.1
 
     - name: Setup tmate session
       if: false

diff --git a/coordinator/gscoordinator/kubernetes_launcher.py b/coordinator/gscoordinator/kubernetes_launcher.py
@@ -173,6 +173,7 @@ def __init__(
         self._del_retry_time_seconds = del_retry_time_seconds
 
         self._waiting_for_delete = waiting_for_delete
+        self._serving = False
 
         self._with_analytical = False
         self._with_analytical_java = False
@@ -273,8 +274,6 @@ def __init__(
         self._analytical_engine_endpoint = None
         self._mars_service_endpoint = None
 
-        self._serving = False
-
         self._analytical_engine_process = None
         self._random_analytical_engine_rpc_port = random.randint(56001, 57000)
         # interactive engine

diff --git a/coordinator/requirements.txt b/coordinator/requirements.txt
@@ -4,8 +4,8 @@ grpcio-tools>=1.49
 kubernetes>=24.2.0
 protobuf>=4
 PyYAML
-vineyard==0.15.0;sys_platform!="win32"
-vineyard-io==0.15.0;sys_platform!="win32"
+vineyard>=0.16.1;sys_platform!="win32"
+vineyard-io>=0.16.1;sys_platform!="win32"
 prometheus-client>=0.14.1
 packaging
 tqdm
diff --git a/k8s/Makefile b/k8s/Makefile
@@ -7,15 +7,15 @@ ifeq ($(REGISTRY),)
 endif
 
 VERSION ?= latest
-VINEYARD_VERSION ?= v0.15.0
+VINEYARD_VERSION ?= v0.16.1
 # 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
 RUNTIME_VERSION ?= $(VINEYARD_VERSION)
 PROFILE ?= release
 CI ?= false
 
-BUILD_PROGRESS  	= auto
+BUILD_PROGRESS  	?= auto
 
 .PHONY: all graphscope
 
@@ -39,7 +39,8 @@ graphscope: all
 dev-wheel:
 	cd $(WORKING_DIR) && \
 	cp ../gs ./ && \
-	docker build  \
+	docker build \
+		--progress=$(BUILD_PROGRESS) \
 		--build-arg REGISTRY=$(REGISTRY) \
 		--build-arg VINEYARD_VERSION=${VINEYARD_VERSION} \
 		-t graphscope/graphscope-dev:wheel \
@@ -50,13 +51,15 @@ manylinux2014-ext:
 	cd $(WORKING_DIR) && \
 	cp ../gs ./ && \
 	docker build \
+		--progress=$(BUILD_PROGRESS) \
 		-t graphscope/manylinux2014:20230407-ext \
 		-f $(DOCKERFILES_DIR)/manylinux2014-ext.Dockerfile .
 
 graphscope-dev:
 	cd $(WORKING_DIR) && \
 	cp ../gs ./ && \
 	docker build \
+		--progress=$(BUILD_PROGRESS) \
 		--build-arg REGISTRY=$(REGISTRY) \
 		--build-arg VINEYARD_VERSION=${VINEYARD_VERSION} \
 		-t graphscope/graphscope-dev:${VINEYARD_VERSION} \
@@ -66,6 +69,7 @@ vineyard-dev:
 	cd $(WORKING_DIR) && \
 	cp ../gs ./ && \
 	docker build \
+		--progress=$(BUILD_PROGRESS) \
 		--build-arg REGISTRY=$(REGISTRY) \
 		--build-arg VINEYARD_VERSION=${VINEYARD_VERSION} \
 		-t graphscope/vineyard-dev:${VINEYARD_VERSION} \
@@ -74,6 +78,7 @@ vineyard-dev:
 vineyard-runtime:
 	cd $(WORKING_DIR) && \
 	docker build \
+		--progress=$(BUILD_PROGRESS) \
 		--build-arg REGISTRY=$(REGISTRY) \
 		--build-arg BUILDER_VERSION=$(BUILDER_VERSION) \
 		-t graphscope/vineyard-runtime:${VINEYARD_VERSION} \
@@ -83,6 +88,7 @@ coordinator:
 	cd $(WORKING_DIR)/.. && \
 	docker build \
 	    --target coordinator \
+		--progress=$(BUILD_PROGRESS) \
 		--build-arg REGISTRY=$(REGISTRY) \
 		--build-arg BUILDER_VERSION=$(BUILDER_VERSION) \
 		--build-arg CI=${CI} \
@@ -93,6 +99,7 @@ analytical:
 	cd $(WORKING_DIR)/.. && \
 	docker build \
 	    --target analytical \
+		--progress=$(BUILD_PROGRESS) \
 		--build-arg REGISTRY=$(REGISTRY) \
 		--build-arg BUILDER_VERSION=$(BUILDER_VERSION) \
 		--build-arg RUNTIME_VERSION=$(RUNTIME_VERSION) \
@@ -104,6 +111,7 @@ analytical-java:
 	cd $(WORKING_DIR)/.. && \
 	docker build \
 	    --target analytical-java \
+		--progress=$(BUILD_PROGRESS) \
 		--build-arg REGISTRY=$(REGISTRY) \
 		--build-arg BUILDER_VERSION=$(BUILDER_VERSION) \
 		--build-arg RUNTIME_VERSION=$(RUNTIME_VERSION) \
@@ -115,6 +123,7 @@ interactive-frontend:
 	cd $(WORKING_DIR)/.. && \
 	docker build \
 	    --target frontend \
+		--progress=$(BUILD_PROGRESS) \
 		--build-arg REGISTRY=$(REGISTRY) \
 		--build-arg BUILDER_VERSION=$(BUILDER_VERSION) \
 		--build-arg RUNTIME_VERSION=$(RUNTIME_VERSION) \
@@ -127,6 +136,7 @@ interactive-executor:
 	cd $(WORKING_DIR)/.. \
 	&& docker build \
 	    --target executor \
+		--progress=$(BUILD_PROGRESS) \
 		--build-arg REGISTRY=$(REGISTRY) \
 		--build-arg BUILDER_VERSION=$(BUILDER_VERSION) \
 		--build-arg RUNTIME_VERSION=$(RUNTIME_VERSION) \
@@ -140,6 +150,7 @@ interactive-experimental:
 	cd $(WORKING_DIR)/.. && \
 	docker build \
 	    --target experimental \
+		--progress=$(BUILD_PROGRESS) \
 		--build-arg REGISTRY=$(REGISTRY) \
 		--build-arg BUILDER_VERSION=$(BUILDER_VERSION) \
 		-t graphscope/interactive-experimental:${VERSION} \
@@ -149,6 +160,7 @@ learning:
 	cd $(WORKING_DIR)/.. && \
 	docker build \
 	    --target learning \
+		--progress=$(BUILD_PROGRESS) \
 		--build-arg REGISTRY=$(REGISTRY) \
 		--build-arg BUILDER_VERSION=$(BUILDER_VERSION) \
 		--build-arg RUNTIME_VERSION=$(RUNTIME_VERSION) \
@@ -159,6 +171,7 @@ learning:
 graphscope-store:
 	cd $(WORKING_DIR)/.. && \
 	docker build \
+		--progress=$(BUILD_PROGRESS) \
 		--build-arg REGISTRY=$(REGISTRY) \
 		--build-arg BUILDER_VERSION=$(BUILDER_VERSION) \
 		--build-arg profile=${PROFILE} \

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.15.0
+VINEYARD_VERSION ?= v0.16.1
 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.15.0
+VINEYARD_VERSION ?= v0.16.1
 PROFILE ?= release
 CI ?= false
 

diff --git a/python/requirements.txt b/python/requirements.txt
@@ -22,6 +22,4 @@ PyYAML
 rich
 tqdm
 click
-vineyard==0.15.0;sys_platform!="win32"
-vineyard-io==0.15.0;sys_platform!="win32"
-
+vineyard>=0.16.1;sys_platform!="win32"
diff --git a/scripts/install_deps.sh b/scripts/install_deps.sh
@@ -14,8 +14,8 @@ readonly GREEN="\033[0;32m"
 readonly NC="\033[0m" # No Color
 
 readonly GRAPE_BRANCH="master" # libgrape-lite branch
-readonly V6D_VERSION="0.15.0"  # vineyard version
-readonly V6D_BRANCH="v0.15.0" # vineyard branch
+readonly V6D_VERSION="0.16.1"  # vineyard version
+readonly V6D_BRANCH="v0.16.1" # vineyard branch
 
 readonly OUTPUT_ENV_FILE="${HOME}/.graphscope_env"
 IS_IN_WSL=false && [[ ! -z "${IS_WSL}" || ! -z "${WSL_DISTRO_NAME}" ]] && IS_IN_WSL=true