diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e5285b300c9b..2bcadb208aaa 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -32,7 +32,7 @@ jobs: run: shell: scl enable devtoolset-7 -- bash --noprofile --norc -eo pipefail {0} container: - image: registry.cn-hongkong.aliyuncs.com/graphscope/graphscope-vineyard:v0.2.3 + image: registry.cn-hongkong.aliyuncs.com/graphscope/graphscope-vineyard:v0.2.5 options: --shm-size 4096m strategy: @@ -138,7 +138,7 @@ jobs: defaults: run: shell: scl enable devtoolset-7 -- bash --noprofile --norc -eo pipefail {0} - container: registry.cn-hongkong.aliyuncs.com/graphscope/graphscope-vineyard:v0.2.3 + container: registry.cn-hongkong.aliyuncs.com/graphscope/graphscope-vineyard:v0.2.5 steps: - name: Install Dependencies run: | @@ -179,7 +179,7 @@ jobs: defaults: run: shell: scl enable devtoolset-7 -- bash --noprofile --norc -eo pipefail {0} - container: registry.cn-hongkong.aliyuncs.com/graphscope/graphscope-vineyard:v0.2.3 + container: registry.cn-hongkong.aliyuncs.com/graphscope/graphscope-vineyard:v0.2.5 steps: - name: Install Dependencies run: | @@ -516,7 +516,7 @@ jobs: defaults: run: shell: scl enable devtoolset-7 -- bash --noprofile --norc -eo pipefail {0} - container: registry.cn-hongkong.aliyuncs.com/graphscope/graphscope-vineyard:v0.2.3 + container: registry.cn-hongkong.aliyuncs.com/graphscope/graphscope-vineyard:v0.2.5 steps: - name: Install Dependencies run: | diff --git a/.github/workflows/local.yml b/.github/workflows/local.yml index e6e11810f525..f4559f957e32 100644 --- a/.github/workflows/local.yml +++ b/.github/workflows/local.yml @@ -48,10 +48,10 @@ jobs: openjdk-8-jdk perl protobuf-compiler-grpc python3-pip uuid-dev wget zip zlib1g-dev # install apache-arrow - wget https://apache.bintray.com/arrow/$(lsb_release --id --short | tr 'A-Z' 'a-z')/apache-arrow-archive-keyring-latest-$(lsb_release --codename --short).deb - sudo apt install -y -V ./apache-arrow-archive-keyring-latest-$(lsb_release --codename --short).deb - sudo apt update - sudo apt install -y libarrow-dev=1.0.1-1 libarrow-python-dev=1.0.1-1 + wget https://apache.jfrog.io/artifactory/arrow/$(lsb_release --id --short | tr 'A-Z' 'a-z')/apache-arrow-apt-source-latest-$(lsb_release --codename --short).deb + sudo apt install -y -V ./apache-arrow-apt-source-latest-$(lsb_release --codename --short).deb + sudo apt update -y + sudo apt install -y libarrow-dev=3.0.0-1 libarrow-python-dev=3.0.0-1 # install zookeeper wget https://archive.apache.org/dist/zookeeper/zookeeper-3.4.14/zookeeper-3.4.14.tar.gz @@ -85,7 +85,7 @@ jobs: - name: Install libvineyard run: | - git clone -b main-v0.2.3 --single-branch --depth=1 https://github.com/alibaba/libvineyard.git + git clone -b main-v0.2.5 --single-branch --depth=1 https://github.com/alibaba/libvineyard.git cd libvineyard git submodule update --init mkdir build && pushd build diff --git a/analytical_engine/CMakeLists.txt b/analytical_engine/CMakeLists.txt index 2805b261bafc..2d4b3cc7f912 100644 --- a/analytical_engine/CMakeLists.txt +++ b/analytical_engine/CMakeLists.txt @@ -111,7 +111,7 @@ endif () find_package(libgrapelite REQUIRED) include_directories(${LIBGRAPELITE_INCLUDE_DIRS}) -find_package(vineyard 0.2.3 REQUIRED) +find_package(vineyard 0.2.5 REQUIRED) include_directories(${VINEYARD_INCLUDE_DIRS}) add_compile_options(-DENABLE_SELECTOR) diff --git a/coordinator/gscoordinator/template/CMakeLists.template b/coordinator/gscoordinator/template/CMakeLists.template index c426e87b059e..dd1205cca530 100644 --- a/coordinator/gscoordinator/template/CMakeLists.template +++ b/coordinator/gscoordinator/template/CMakeLists.template @@ -45,7 +45,7 @@ set(CMAKE_THREAD_PREFER_PTHREAD ON) find_package(Threads REQUIRED) # find vineyard----------------------------------------------------------------- -find_package(vineyard 0.2.3 REQUIRED) +find_package(vineyard 0.2.5 REQUIRED) include_directories(${VINEYARD_INCLUDE_DIRS}) add_compile_options(-DENABLE_SELECTOR) diff --git a/interactive_engine/src/executor/runtime/native/CMakeLists.txt b/interactive_engine/src/executor/runtime/native/CMakeLists.txt index d5cafc01e9ee..c8e2ce366585 100644 --- a/interactive_engine/src/executor/runtime/native/CMakeLists.txt +++ b/interactive_engine/src/executor/runtime/native/CMakeLists.txt @@ -44,7 +44,7 @@ find_package(Threads REQUIRED) # we need edge src/dst ids in etable. add_definitions(-DENDPOINT_LISTS) -find_package(vineyard 0.2.3 REQUIRED) +find_package(vineyard 0.2.5 REQUIRED) add_library(native_store global_store_ffi.cc htap_ds_impl.cc graph_builder_ffi.cc diff --git a/k8s/graphscope-store.Dockerfile b/k8s/graphscope-store.Dockerfile index c7c804b55e23..001b63623f27 100644 --- a/k8s/graphscope-store.Dockerfile +++ b/k8s/graphscope-store.Dockerfile @@ -1,4 +1,4 @@ -ARG BASE_VERSION=v0.2.3 +ARG BASE_VERSION=v0.2.5 FROM registry.cn-hongkong.aliyuncs.com/graphscope/graphscope-vineyard:$BASE_VERSION as builder ARG CI=true diff --git a/k8s/graphscope.Dockerfile b/k8s/graphscope.Dockerfile index 94b101c53a4a..934e394559d6 100644 --- a/k8s/graphscope.Dockerfile +++ b/k8s/graphscope.Dockerfile @@ -4,7 +4,7 @@ # the result image includes all runtime stuffs of graphscope, with analytical engine, # learning engine and interactive engine installed. -ARG BASE_VERSION=v0.2.3 +ARG BASE_VERSION=v0.2.5 FROM registry.cn-hongkong.aliyuncs.com/graphscope/graphscope-vineyard:$BASE_VERSION as builder ARG CI=true diff --git a/k8s/gsvineyard.Dockerfile b/k8s/gsvineyard.Dockerfile index 4071b444cbbd..72b402504bd1 100644 --- a/k8s/gsvineyard.Dockerfile +++ b/k8s/gsvineyard.Dockerfile @@ -14,7 +14,7 @@ RUN cd /tmp && \ make -j`nproc` && \ make install && \ cd /tmp && \ - git clone -b v0.2.3 https://github.com/alibaba/libvineyard.git --depth=1 && \ + git clone -b main-v0.2.5 https://github.com/alibaba/libvineyard.git --depth=1 && \ cd libvineyard && \ git submodule update --init && \ mkdir -p /tmp/libvineyard/build && \ diff --git a/k8s/ubuntu/gsruntime.Dockerfile b/k8s/ubuntu/gsruntime.Dockerfile index 49758ca6b5ae..6c2bca004397 100644 --- a/k8s/ubuntu/gsruntime.Dockerfile +++ b/k8s/ubuntu/gsruntime.Dockerfile @@ -18,12 +18,12 @@ RUN apt update -y && apt install -y \ perl protobuf-compiler-grpc python3-pip sudo telnet uuid-dev vim wget zip zlib1g-dev && \ rm -fr /var/lib/apt/lists/* -# apache arrow 1.0.1 -RUN wget https://apache.bintray.com/arrow/$(lsb_release --id --short | tr 'A-Z' 'a-z')/apache-arrow-archive-keyring-latest-$(lsb_release --codename --short).deb && \ - apt install -y -V ./apache-arrow-archive-keyring-latest-$(lsb_release --codename --short).deb && \ - apt update -y && \ - apt install -y libarrow-dev=1.0.1-1 libarrow-python-dev=1.0.1-1 && \ - rm -f ./apache-arrow-archive-keyring-latest-$(lsb_release --codename --short).deb +# apache arrow 3.0.0 +RUN wget https://apache.jfrog.io/artifactory/arrow/$(lsb_release --id --short | tr 'A-Z' 'a-z')/apache-arrow-apt-source-latest-$(lsb_release --codename --short).deb && \ + apt install -y -V ./apache-arrow-apt-source-latest-$(lsb_release --codename --short).deb && \ + apt update -y && \ + apt install -y libarrow-dev=3.0.0-1 libarrow-python-dev=3.0.0-1 && \ + rm ./apache-arrow-apt-source-latest-$(lsb_release --codename --short).deb # fmt v7.0.3, required by folly RUN cd /tmp && \ diff --git a/python/requirements.txt b/python/requirements.txt index 5fba34b8f4f5..1109cd007b8d 100644 --- a/python/requirements.txt +++ b/python/requirements.txt @@ -11,5 +11,5 @@ pandas protobuf>=3.12.0 PyYAML scipy -vineyard==0.2.3 -vineyard-io==0.2.3 +vineyard>=0.2.5 +vineyard-io>=0.2.5 diff --git a/scripts/build.sh b/scripts/build.sh index 5b59390f5301..15a810c6e98c 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -99,7 +99,7 @@ function install_libgrape-lite() { function install_vineyard() { echo "$(date '+%Y-%m-%d %H:%M:%S') build and install vineyard" - git clone -b v0.2.3 --single-branch --depth=1 https://github.com/alibaba/libvineyard.git /tmp/libvineyard + git clone -b v0.2.5 --single-branch --depth=1 https://github.com/alibaba/libvineyard.git /tmp/libvineyard pushd /tmp/libvineyard git submodule update --init mkdir build && pushd build diff --git a/scripts/install_dependencies.sh b/scripts/install_dependencies.sh index b610fab236db..a818bca79688 100755 --- a/scripts/install_dependencies.sh +++ b/scripts/install_dependencies.sh @@ -83,10 +83,10 @@ function install_dependencies() { openjdk-8-jdk perl protobuf-compiler-grpc python3-pip uuid-dev wget zip zlib1g-dev # install apache-arrow - wget https://apache.bintray.com/arrow/$(lsb_release --id --short | tr 'A-Z' 'a-z')/apache-arrow-archive-keyring-latest-$(lsb_release --codename --short).deb -P /tmp - sudo apt install -y -V /tmp/apache-arrow-archive-keyring-latest-$(lsb_release --codename --short).deb - sudo apt update - sudo apt install -y libarrow-dev=1.0.1-1 libarrow-python-dev=1.0.1-1 + wget https://apache.jfrog.io/artifactory/arrow/$(lsb_release --id --short | tr 'A-Z' 'a-z')/apache-arrow-apt-source-latest-$(lsb_release --codename --short).deb + sudo apt install -y -V ./apache-arrow-apt-source-latest-$(lsb_release --codename --short).deb + sudo apt update -y + sudo apt install -y libarrow-dev=3.0.0-1 libarrow-python-dev=3.0.0-1 # intall fmt, required by folly wget https://github.com/fmtlib/fmt/archive/7.0.3.tar.gz -P /tmp