diff --git a/.github/workflows/gae.yml b/.github/workflows/gae.yml index 773a40c9ad8c..9f0b33a9e940 100644 --- a/.github/workflows/gae.yml +++ b/.github/workflows/gae.yml @@ -29,7 +29,7 @@ jobs: runs-on: ubuntu-20.04 if: ${{ github.repository == 'alibaba/GraphScope' }} container: - image: registry.cn-hongkong.aliyuncs.com/graphscope/graphscope-dev:v0.11.2 + image: registry.cn-hongkong.aliyuncs.com/graphscope/graphscope-dev:v0.11.4 options: --shm-size 4096m steps: diff --git a/.github/workflows/networkx-forward-algo-nightly.yml b/.github/workflows/networkx-forward-algo-nightly.yml index a164c2ef5f79..dd72e19f896e 100644 --- a/.github/workflows/networkx-forward-algo-nightly.yml +++ b/.github/workflows/networkx-forward-algo-nightly.yml @@ -16,7 +16,7 @@ jobs: run: shell: bash --noprofile --norc -eo pipefail {0} container: - image: registry.cn-hongkong.aliyuncs.com/graphscope/graphscope-dev:v0.11.2 + image: registry.cn-hongkong.aliyuncs.com/graphscope/graphscope-dev:v0.11.4 options: --shm-size 4096m diff --git a/analytical_engine/CMakeLists.txt b/analytical_engine/CMakeLists.txt index 3da23c6ca2c2..b980dabda638 100644 --- a/analytical_engine/CMakeLists.txt +++ b/analytical_engine/CMakeLists.txt @@ -234,7 +234,7 @@ else() endif() # find vineyard after arrow to avoid duplicate target names -find_package(vineyard 0.11.2 REQUIRED) +find_package(vineyard 0.11.4 REQUIRED) include_directories(${VINEYARD_INCLUDE_DIRS}) add_compile_options(-DENABLE_SELECTOR) diff --git a/coordinator/requirements.txt b/coordinator/requirements.txt index 7920a2c1af67..19a5368f3403 100644 --- a/coordinator/requirements.txt +++ b/coordinator/requirements.txt @@ -5,8 +5,8 @@ grpcio-tools<=1.43.0,>=1.40.0 kubernetes~=12.0.1 protobuf>=3.15.0,<=3.18.1 PyYAML -vineyard>=0.11.1; sys_platform != "win32" -vineyard-io>=0.11.1; sys_platform != "win32" +vineyard>=0.11.4; sys_platform != "win32" +vineyard-io>=0.11.4; sys_platform != "win32" prometheus-client>=0.14.1 setuptools>=65.5.1 packaging diff --git a/interactive_engine/executor/store/global_query/src/store_impl/v6d/native/CMakeLists.txt b/interactive_engine/executor/store/global_query/src/store_impl/v6d/native/CMakeLists.txt index 90e0761b050c..2a41c2cce42d 100644 --- a/interactive_engine/executor/store/global_query/src/store_impl/v6d/native/CMakeLists.txt +++ b/interactive_engine/executor/store/global_query/src/store_impl/v6d/native/CMakeLists.txt @@ -57,7 +57,7 @@ find_package(Threads REQUIRED) # we need edge src/dst ids in etable. add_definitions(-DENDPOINT_LISTS) -find_package(vineyard 0.11.1 REQUIRED) +find_package(vineyard 0.11.4 REQUIRED) add_library(v6d_native_store global_store_ffi.cc htap_ds_impl.cc graph_builder_ffi.cc diff --git a/k8s/Makefile b/k8s/Makefile index 9f054d7b1073..13440d761ec0 100644 --- a/k8s/Makefile +++ b/k8s/Makefile @@ -7,7 +7,7 @@ ifeq ($(REGISTRY),) endif VERSION ?= latest -VINEYARD_VERSION ?= v0.11.2 +VINEYARD_VERSION ?= v0.11.4 # 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 index 1debb2536214..2bf0404600fc 100644 --- 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.11.2 +VINEYARD_VERSION ?= v0.11.4 BUILDER_VERSION ?= $(VINEYARD_VERSION) # default list of platforms for which multiarch image is built diff --git a/k8s/build_scripts/build_vineyard.sh b/k8s/build_scripts/build_vineyard.sh index aa64fc38b22b..4b17a5bdb099 100755 --- a/k8s/build_scripts/build_vineyard.sh +++ b/k8s/build_scripts/build_vineyard.sh @@ -17,7 +17,7 @@ cd ${WORKDIR} && \ # Vineyard echo "Installing vineyard" cd ${WORKDIR} && \ - git clone -b v0.11.2 https://github.com/v6d-io/v6d.git --depth=1 && \ + git clone -b v0.11.4 https://github.com/v6d-io/v6d.git --depth=1 && \ pushd v6d && \ git submodule update --init && \ cmake . -DCMAKE_PREFIX_PATH=/opt/vineyard \ diff --git a/k8s/internal/Makefile b/k8s/internal/Makefile index a9d0d0785046..13d22c5d0c42 100644 --- a/k8s/internal/Makefile +++ b/k8s/internal/Makefile @@ -31,7 +31,7 @@ else endif VERSION ?= latest -VINEYARD_VERSION ?= v0.11.2 +VINEYARD_VERSION ?= v0.11.4 PROFILE ?= release CI ?= false diff --git a/python/graphscope/config.py b/python/graphscope/config.py index 69a87ef9ebf8..f7a4d118f345 100644 --- a/python/graphscope/config.py +++ b/python/graphscope/config.py @@ -68,7 +68,7 @@ class GSConfig(object): # vineyard resource configuration # image for vineyard container - k8s_vineyard_image = "vineyardcloudnative/vineyardd:v0.11.2" + k8s_vineyard_image = "vineyardcloudnative/vineyardd:v0.11.4" k8s_vineyard_daemonset = None k8s_vineyard_cpu = 0.5 k8s_vineyard_mem = "512Mi" diff --git a/scripts/install_deps.sh b/scripts/install_deps.sh index e1c5b3cba124..ee80e07aa13b 100755 --- 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.11.2" # vineyard version -readonly V6D_BRANCH="v0.11.2" # vineyard branch +readonly V6D_VERSION="0.11.4" # vineyard version +readonly V6D_BRANCH="v0.11.4" # vineyard branch readonly OUTPUT_ENV_FILE="${HOME}/.graphscope_env" IS_IN_WSL=false && [[ ! -z "${IS_WSL}" || ! -z "${WSL_DISTRO_NAME}" ]] && IS_IN_WSL=true