From bd5f9594df2231fef4a79d466e9ad47807ffadb7 Mon Sep 17 00:00:00 2001 From: "xiaolei.zl" Date: Fri, 31 May 2024 09:09:44 +0000 Subject: [PATCH 01/12] add scripts to install hiactor --- .../gsctl/scripts/install_deps_command.sh | 19 +++++++++++++++++++ .../scripts/lib/install_libgrape_lite.sh | 10 ++++++++++ 2 files changed, 29 insertions(+) create mode 100644 python/graphscope/gsctl/scripts/lib/install_libgrape_lite.sh diff --git a/python/graphscope/gsctl/scripts/install_deps_command.sh b/python/graphscope/gsctl/scripts/install_deps_command.sh index 02952c769910..087030525bcf 100644 --- a/python/graphscope/gsctl/scripts/install_deps_command.sh +++ b/python/graphscope/gsctl/scripts/install_deps_command.sh @@ -6,6 +6,8 @@ source ${script_dir}/lib/install_thirdparty_dependencies.sh source ${script_dir}/lib/install_vineyard.sh source ${script_dir}/lib/util.sh source ${script_dir}/initialize.sh +source ${script_dir}/lib/install_libgrape_lite.sh +source ${script_dir}/lib/install_hiactor.sh # parse args while getopts ":t:i:d:v:j:-:" opt; do @@ -321,6 +323,16 @@ install_dependencies_analytical_universal() { fi } +install_interactive_deps() { + # First install libgrape-lite + install_libgrape_lite + # arrow should already be installed by analytical dependencies + # install hiactor. + install_hiactor + sh -c 'echo "fs.aio-max-nr = 1048576" >> /etc/sysctl.conf' + sysctl -p /etc/sysctl.conf +} + write_env_config() { log "Output environments config file ${OUTPUT_ENV_FILE}" if [ -f "${OUTPUT_ENV_FILE}" ]; then @@ -407,6 +419,13 @@ install_deps_for_dev() { install_llvm_universal install_rust_universal install_cppkafka "${deps_prefix}" "${install_prefix}" + # install dependencies for flex interactive + # can not install on macos since seastar can not be built on macos + if [[ "${OS_PLATFORM}" == *"Darwin"* ]]; then + warning "Skip installing dependencies for flex interactive on macOS." + else + install_interactive_deps + fi fi write_env_config diff --git a/python/graphscope/gsctl/scripts/lib/install_libgrape_lite.sh b/python/graphscope/gsctl/scripts/lib/install_libgrape_lite.sh new file mode 100644 index 000000000000..bac6bc550ca6 --- /dev/null +++ b/python/graphscope/gsctl/scripts/lib/install_libgrape_lite.sh @@ -0,0 +1,10 @@ +install_libgrape_lite() { + pushd /tmp + git clone https://github.com/alibaba/libgrape-lite.git + cd libgrape-lite + git checkout v0.3.2 + mkdir build && cd build && cmake .. -DBUILD_LIBGRAPELITE_TESTS=OFF + make -j ${parallelism} && sudo make install + sudo cp /usr/local/lib/libgrape-lite.so /usr/lib/libgrape-lite.so + popd && rm -rf /tmp/libgrape-lite +} \ No newline at end of file From 36cea8db231ea1636dec3a4f1c89f46f4d48a4e3 Mon Sep 17 00:00:00 2001 From: "xiaolei.zl" Date: Thu, 6 Jun 2024 15:56:25 +0800 Subject: [PATCH 02/12] minor Committed-by: xiaolei.zl from Dev container Committed-by: xiaolei.zl from Dev container --- python/graphscope/gsctl/scripts/lib/install_libgrape_lite.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/python/graphscope/gsctl/scripts/lib/install_libgrape_lite.sh b/python/graphscope/gsctl/scripts/lib/install_libgrape_lite.sh index bac6bc550ca6..4dbbf1848041 100644 --- a/python/graphscope/gsctl/scripts/lib/install_libgrape_lite.sh +++ b/python/graphscope/gsctl/scripts/lib/install_libgrape_lite.sh @@ -1,8 +1,7 @@ install_libgrape_lite() { pushd /tmp - git clone https://github.com/alibaba/libgrape-lite.git + git clone https://github.com/alibaba/libgrape-lite.git -b v0.3.2 --single-branch cd libgrape-lite - git checkout v0.3.2 mkdir build && cd build && cmake .. -DBUILD_LIBGRAPELITE_TESTS=OFF make -j ${parallelism} && sudo make install sudo cp /usr/local/lib/libgrape-lite.so /usr/lib/libgrape-lite.so From dfcd4c849029a078995ffe1dce85edecae5d6518 Mon Sep 17 00:00:00 2001 From: zhanglei1949 Date: Thu, 6 Jun 2024 20:15:01 +0800 Subject: [PATCH 03/12] fix script --- .../graphscope/gsctl/scripts/install_deps_command.sh | 11 ++--------- .../scripts/lib/install_thirdparty_dependencies.sh | 11 +++++++++++ 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/python/graphscope/gsctl/scripts/install_deps_command.sh b/python/graphscope/gsctl/scripts/install_deps_command.sh index 087030525bcf..c3537e84d517 100644 --- a/python/graphscope/gsctl/scripts/install_deps_command.sh +++ b/python/graphscope/gsctl/scripts/install_deps_command.sh @@ -6,8 +6,6 @@ source ${script_dir}/lib/install_thirdparty_dependencies.sh source ${script_dir}/lib/install_vineyard.sh source ${script_dir}/lib/util.sh source ${script_dir}/initialize.sh -source ${script_dir}/lib/install_libgrape_lite.sh -source ${script_dir}/lib/install_hiactor.sh # parse args while getopts ":t:i:d:v:j:-:" opt; do @@ -143,7 +141,8 @@ _install_apache_arrow_ubuntu() { -P /tmp/ ${SUDO} apt-get install -y -V /tmp/apache-arrow-apt-source-latest-"$(lsb_release --codename --short)".deb ${SUDO} apt-get update -y - ${SUDO} apt-get install -y libarrow-dev libarrow-dataset-dev libarrow-acero-dev libparquet-dev + #TODO(weibin): Remove the arrow version constrait after issue is resolved: https://github.com/apache/incubator-graphar/issues/515 + ${SUDO} apt-get install -y libarrow-dev=15.0.2-1 libarrow-dataset-dev=15.0.2-1 libarrow-acero-dev=15.0.2-1 libparquet-dev=15.0.2-1 rm /tmp/apache-arrow-apt-source-latest-*.deb else log "apache-arrow (libarrow-dev) already installed, skip." @@ -324,13 +323,7 @@ install_dependencies_analytical_universal() { } install_interactive_deps() { - # First install libgrape-lite - install_libgrape_lite - # arrow should already be installed by analytical dependencies - # install hiactor. install_hiactor - sh -c 'echo "fs.aio-max-nr = 1048576" >> /etc/sysctl.conf' - sysctl -p /etc/sysctl.conf } write_env_config() { diff --git a/python/graphscope/gsctl/scripts/lib/install_thirdparty_dependencies.sh b/python/graphscope/gsctl/scripts/lib/install_thirdparty_dependencies.sh index 3340a4a8be4c..e054e75c682a 100644 --- a/python/graphscope/gsctl/scripts/lib/install_thirdparty_dependencies.sh +++ b/python/graphscope/gsctl/scripts/lib/install_thirdparty_dependencies.sh @@ -434,3 +434,14 @@ install_maven() { popd || exit cleanup_files "${workdir}/${directory}" "${workdir}/${file}" } + +install_hiactor() { + pushd /tmp + git clone https://github.com/alibaba/hiactor.git -b v0.1.1 --single-branch + cd hiactor && git submodule update --init --recursive + sudo bash ./seastar/seastar/install-dependencies.sh + mkdir build && cd build + cmake -DHiactor_DEMOS=OFF -DHiactor_TESTING=OFF -DHiactor_DPDK=OFF -DHiactor_CXX_DIALECT=gnu++17 -DSeastar_CXX_FLAGS="-DSEASTAR_DEFAULT_ALLOCATOR -mno-avx512" .. + make -j ${parallelism} && sudo make install + popd && rm -rf /tmp/hiactor +} From afdc5c4d8691c05867208fdcb6e5e234ba713467 Mon Sep 17 00:00:00 2001 From: zhanglei1949 Date: Fri, 14 Jun 2024 16:49:31 +0800 Subject: [PATCH 04/12] fix --- python/graphscope/gsctl/scripts/install_deps_command.sh | 7 ++++--- .../gsctl/scripts/lib/install_libgrape_lite.sh | 9 --------- .../gsctl/scripts/lib/install_thirdparty_dependencies.sh | 4 +++- 3 files changed, 7 insertions(+), 13 deletions(-) delete mode 100644 python/graphscope/gsctl/scripts/lib/install_libgrape_lite.sh diff --git a/python/graphscope/gsctl/scripts/install_deps_command.sh b/python/graphscope/gsctl/scripts/install_deps_command.sh index c3537e84d517..0925aceb458f 100644 --- a/python/graphscope/gsctl/scripts/install_deps_command.sh +++ b/python/graphscope/gsctl/scripts/install_deps_command.sh @@ -141,8 +141,9 @@ _install_apache_arrow_ubuntu() { -P /tmp/ ${SUDO} apt-get install -y -V /tmp/apache-arrow-apt-source-latest-"$(lsb_release --codename --short)".deb ${SUDO} apt-get update -y - #TODO(weibin): Remove the arrow version constrait after issue is resolved: https://github.com/apache/incubator-graphar/issues/515 ${SUDO} apt-get install -y libarrow-dev=15.0.2-1 libarrow-dataset-dev=15.0.2-1 libarrow-acero-dev=15.0.2-1 libparquet-dev=15.0.2-1 + #TODO(zhanglei): Remove the arrow version constrait after new version of vineyard is release. see https://github.com/v6d-io/v6d/pull/1911 and https://github.com/apache/incubator-graphar/issues/515 + #${SUDO} apt-get install -y libarrow-dev libarrow-dataset-dev libarrow-acero-dev libparquet-dev rm /tmp/apache-arrow-apt-source-latest-*.deb else log "apache-arrow (libarrow-dev) already installed, skip." @@ -323,7 +324,7 @@ install_dependencies_analytical_universal() { } install_interactive_deps() { - install_hiactor + install_hiactor "${install_prefix}" } write_env_config() { @@ -335,7 +336,7 @@ write_env_config() { { echo "export GRAPHSCOPE_HOME=${install_prefix}" - echo "export CMAKE_PREFIX_PATH=/opt/vineyard" + echo "export CMAKE_PREFIX_PATH=/opt/vineyard:/opt/graphscope/" echo "export PATH=${install_prefix}/bin:\$HOME/.local/bin:\$HOME/.cargo/bin:\$PATH" echo "export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}" echo "export LIBRARY_PATH=${install_prefix}/lib:${install_prefix}/lib64" diff --git a/python/graphscope/gsctl/scripts/lib/install_libgrape_lite.sh b/python/graphscope/gsctl/scripts/lib/install_libgrape_lite.sh deleted file mode 100644 index 4dbbf1848041..000000000000 --- a/python/graphscope/gsctl/scripts/lib/install_libgrape_lite.sh +++ /dev/null @@ -1,9 +0,0 @@ -install_libgrape_lite() { - pushd /tmp - git clone https://github.com/alibaba/libgrape-lite.git -b v0.3.2 --single-branch - cd libgrape-lite - mkdir build && cd build && cmake .. -DBUILD_LIBGRAPELITE_TESTS=OFF - make -j ${parallelism} && sudo make install - sudo cp /usr/local/lib/libgrape-lite.so /usr/lib/libgrape-lite.so - popd && rm -rf /tmp/libgrape-lite -} \ No newline at end of file diff --git a/python/graphscope/gsctl/scripts/lib/install_thirdparty_dependencies.sh b/python/graphscope/gsctl/scripts/lib/install_thirdparty_dependencies.sh index e054e75c682a..35758fd3fd17 100644 --- a/python/graphscope/gsctl/scripts/lib/install_thirdparty_dependencies.sh +++ b/python/graphscope/gsctl/scripts/lib/install_thirdparty_dependencies.sh @@ -436,12 +436,14 @@ install_maven() { } install_hiactor() { + install_prefix=$1 pushd /tmp git clone https://github.com/alibaba/hiactor.git -b v0.1.1 --single-branch cd hiactor && git submodule update --init --recursive sudo bash ./seastar/seastar/install-dependencies.sh mkdir build && cd build - cmake -DHiactor_DEMOS=OFF -DHiactor_TESTING=OFF -DHiactor_DPDK=OFF -DHiactor_CXX_DIALECT=gnu++17 -DSeastar_CXX_FLAGS="-DSEASTAR_DEFAULT_ALLOCATOR -mno-avx512" .. + cmake -DHiactor_DEMOS=OFF -DHiactor_TESTING=OFF -DHiactor_DPDK=OFF -DCMAKE_INSTALL_PREFIX="${install_prefix}" \ + -DHiactor_CXX_DIALECT=gnu++17 -DSeastar_CXX_FLAGS="-DSEASTAR_DEFAULT_ALLOCATOR -mno-avx512" .. make -j ${parallelism} && sudo make install popd && rm -rf /tmp/hiactor } From 74b1db3137fc4451d8e3ab82ac02f6d031b1ca72 Mon Sep 17 00:00:00 2001 From: zhanglei1949 Date: Fri, 14 Jun 2024 16:55:54 +0800 Subject: [PATCH 05/12] replace hqps-server-base, remove flex dev container json --- .github/workflows/interactive.yml | 8 ++++---- flex/.devcontainer.json | 32 ------------------------------- 2 files changed, 4 insertions(+), 36 deletions(-) delete mode 100644 flex/.devcontainer.json diff --git a/.github/workflows/interactive.yml b/.github/workflows/interactive.yml index 3ebcba777388..abd9a73f8dfc 100644 --- a/.github/workflows/interactive.yml +++ b/.github/workflows/interactive.yml @@ -28,7 +28,7 @@ jobs: runs-on: ubuntu-20.04 if: ${{ github.repository == 'alibaba/GraphScope' }} container: - image: registry.cn-hongkong.aliyuncs.com/graphscope/hqps-server-base:v0.0.10 + image: registry.cn-hongkong.aliyuncs.com/graphscope/graphscope-dev:v0.23.0 steps: - uses: actions/checkout@v3 @@ -352,7 +352,7 @@ jobs: test-cmake-options: runs-on: ubuntu-20.04 container: - image: registry.cn-hongkong.aliyuncs.com/graphscope/hqps-server-base:v0.0.10 + image: registry.cn-hongkong.aliyuncs.com/graphscope/graphscope-dev:v0.23.0 strategy: matrix: BUILD_HQPS: [ON, OFF] @@ -373,7 +373,7 @@ jobs: test-AOCC-compilation: runs-on: ubuntu-20.04 container: - image: registry.cn-hongkong.aliyuncs.com/graphscope/hqps-server-base:v0.0.10 + image: registry.cn-hongkong.aliyuncs.com/graphscope/graphscope-dev:v0.23.0 steps: - uses: actions/checkout@v3 @@ -402,7 +402,7 @@ jobs: runs-on: ubuntu-20.04 if: ${{ github.repository == 'alibaba/GraphScope' }} container: - image: registry.cn-hongkong.aliyuncs.com/graphscope/hqps-server-base:v0.0.10 + image: registry.cn-hongkong.aliyuncs.com/graphscope/graphscope-dev:v0.23.0 steps: - uses: actions/checkout@v3 diff --git a/flex/.devcontainer.json b/flex/.devcontainer.json deleted file mode 100644 index 8e20e6284157..000000000000 --- a/flex/.devcontainer.json +++ /dev/null @@ -1,32 +0,0 @@ -// For format details, see https://aka.ms/devcontainer.json. For config options, see the -// README at: https://github.com/devcontainers/templates/tree/main/src/javascript-node -{ - "name": "GraphScope", - // Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile - "image": "registry.cn-hongkong.aliyuncs.com/graphscope/hqps-server-base:v0.0.10", - // Features to add to the dev container. More info: https://containers.dev/features. - "features": { - "ghcr.io/devcontainers/features/common-utils:2": { - "installZsh": "true", - "configureZshAsDefaultShell": "true", - "installOhMyZsh": true, - "upgradePackages": "false" - } - }, - // Configure tool-specific properties. - "customizations": { - // Configure properties specific to VS Code. - "vscode": { - "settings": {}, - "extensions": [ - "streetsidesoftware.code-spell-checker", - "eamodio.gitlens", - "github.copilot", - "github.copilot-labs" - ] - } - }, - // Set `remoteUser` to `root` to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root. - "remoteUser": "graphscope", - "postCreateCommand": "sudo chown -R graphscope /workspaces && bash pre-commit/install-hook.sh && bash pre-commit/prepare-commit-msg" -} \ No newline at end of file From 2dd91b33333af3382f84608221932fd80521ad5d Mon Sep 17 00:00:00 2001 From: zhanglei1949 Date: Mon, 17 Jun 2024 16:21:35 +0800 Subject: [PATCH 06/12] fixing --- .github/workflows/interactive.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/interactive.yml b/.github/workflows/interactive.yml index abd9a73f8dfc..e95f54fc7c43 100644 --- a/.github/workflows/interactive.yml +++ b/.github/workflows/interactive.yml @@ -68,6 +68,7 @@ jobs: GIE_HOME: ${{ github.workspace }}/interactive_engine/ HOME: /home/graphscope/ run: | + . /home/graphscope/.graphscope_env cd ${GITHUB_WORKSPACE}/ git submodule update --init cd ${GITHUB_WORKSPACE}/flex From 022ac82342eee71ebaa8f2c0e5e7785202fa7814 Mon Sep 17 00:00:00 2001 From: "xiaolei.zl" Date: Mon, 17 Jun 2024 18:13:47 +0800 Subject: [PATCH 07/12] fixing Committed-by: xiaolei.zl from Dev container --- flex/resources/hqps/CMakeLists.txt.template | 6 ++++++ .../gsctl/scripts/lib/install_thirdparty_dependencies.sh | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/flex/resources/hqps/CMakeLists.txt.template b/flex/resources/hqps/CMakeLists.txt.template index 2ab7db7ded59..4165022bab7c 100644 --- a/flex/resources/hqps/CMakeLists.txt.template +++ b/flex/resources/hqps/CMakeLists.txt.template @@ -33,6 +33,12 @@ else () endif() include_directories(${CMAKE_CURRENT_SOURCE_DIR}) + +# Check if /opt/graphscope exists and include directory. Since grape headers may installed here. +if(EXISTS "/opt/graphscope/include") + include_directories("/opt/graphscope/include") +endif() + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fopenmp -Wl,-rpath,$ORIGIN -O0 -flto -Werror=unused-result -fPIC -no-pie") diff --git a/python/graphscope/gsctl/scripts/lib/install_thirdparty_dependencies.sh b/python/graphscope/gsctl/scripts/lib/install_thirdparty_dependencies.sh index 35758fd3fd17..5648226f7b02 100644 --- a/python/graphscope/gsctl/scripts/lib/install_thirdparty_dependencies.sh +++ b/python/graphscope/gsctl/scripts/lib/install_thirdparty_dependencies.sh @@ -440,10 +440,10 @@ install_hiactor() { pushd /tmp git clone https://github.com/alibaba/hiactor.git -b v0.1.1 --single-branch cd hiactor && git submodule update --init --recursive - sudo bash ./seastar/seastar/install-dependencies.sh + bash ./seastar/seastar/install-dependencies.sh mkdir build && cd build cmake -DHiactor_DEMOS=OFF -DHiactor_TESTING=OFF -DHiactor_DPDK=OFF -DCMAKE_INSTALL_PREFIX="${install_prefix}" \ -DHiactor_CXX_DIALECT=gnu++17 -DSeastar_CXX_FLAGS="-DSEASTAR_DEFAULT_ALLOCATOR -mno-avx512" .. - make -j ${parallelism} && sudo make install + make -j ${parallelism} && make install popd && rm -rf /tmp/hiactor } From 74fe976ec7003e95ac175f9b7d934c45f6093e47 Mon Sep 17 00:00:00 2001 From: "xiaolei.zl" Date: Mon, 17 Jun 2024 18:14:24 +0800 Subject: [PATCH 08/12] minor Committed-by: xiaolei.zl from Dev container --- .../gsctl/scripts/lib/install_thirdparty_dependencies.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/graphscope/gsctl/scripts/lib/install_thirdparty_dependencies.sh b/python/graphscope/gsctl/scripts/lib/install_thirdparty_dependencies.sh index 5648226f7b02..8e08b268e75f 100644 --- a/python/graphscope/gsctl/scripts/lib/install_thirdparty_dependencies.sh +++ b/python/graphscope/gsctl/scripts/lib/install_thirdparty_dependencies.sh @@ -440,7 +440,7 @@ install_hiactor() { pushd /tmp git clone https://github.com/alibaba/hiactor.git -b v0.1.1 --single-branch cd hiactor && git submodule update --init --recursive - bash ./seastar/seastar/install-dependencies.sh + sudo bash ./seastar/seastar/install-dependencies.sh mkdir build && cd build cmake -DHiactor_DEMOS=OFF -DHiactor_TESTING=OFF -DHiactor_DPDK=OFF -DCMAKE_INSTALL_PREFIX="${install_prefix}" \ -DHiactor_CXX_DIALECT=gnu++17 -DSeastar_CXX_FLAGS="-DSEASTAR_DEFAULT_ALLOCATOR -mno-avx512" .. From 96be0c5c85bdf681f6e4137ce0aecbefd425fb34 Mon Sep 17 00:00:00 2001 From: "xiaolei.zl" Date: Tue, 18 Jun 2024 11:18:20 +0800 Subject: [PATCH 09/12] minor fix Committed-by: xiaolei.zl from Dev container --- .github/workflows/interactive.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/interactive.yml b/.github/workflows/interactive.yml index e95f54fc7c43..75b69039ed8f 100644 --- a/.github/workflows/interactive.yml +++ b/.github/workflows/interactive.yml @@ -312,6 +312,7 @@ jobs: - name: Run Gremlin test on modern graph env: GS_TEST_DIR: ${{ github.workspace }}/gstest + HOME : /home/graphscope/ INTERACTIVE_WORKSPACE: /tmp/interactive_workspace LD_LIBRARY_PATH: /usr/local/lib run: | @@ -382,7 +383,7 @@ jobs: run: | cd ${GITHUB_WORKSPACE}/flex wget https://download.amd.com/developer/eula/aocc/aocc-4-1/aocc-compiler-4.1.0_1_amd64.deb - sudo apt-get update && sudo apt-get install libncurses-dev libncurses5-dev + sudo apt-get update && sudo apt-get install -y libncurses-dev libncurses5-dev sudo dpkg -i aocc-compiler-4.1.0_1_amd64.deb - name: Test AOCC compiler From 6043657f53b2c7017037da2c30cebf30caef73f1 Mon Sep 17 00:00:00 2001 From: "dongze.ldz" Date: Tue, 18 Jun 2024 16:46:28 +0800 Subject: [PATCH 10/12] fix ci problem --- .github/workflows/build-graphscope-dev-images.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build-graphscope-dev-images.yml b/.github/workflows/build-graphscope-dev-images.yml index 7a4f8c791683..18d92d3cda3b 100644 --- a/.github/workflows/build-graphscope-dev-images.yml +++ b/.github/workflows/build-graphscope-dev-images.yml @@ -33,7 +33,7 @@ on: branches: - main paths: - - 'python/graphscope/gsctl/**' + - 'python/graphscope/gsctl/scripts/**' concurrency: group: ${{ github.repository }}-${{ github.event.number || github.head_ref || github.sha }}-${{ github.workflow }} @@ -45,7 +45,7 @@ env: jobs: build-wheel-image-x86-64: runs-on: ubuntu-20.04 - if: (github.event_name == 'workflow_dispatch' && github.event.inputs.build_wheel == 'true') || (github.pull_request == 'pull_request') + if: (github.event_name == 'workflow_dispatch' && github.event.inputs.build_wheel == 'true') || (github.event_name == 'pull_request') steps: - uses: actions/checkout@v3 @@ -82,7 +82,7 @@ jobs: build-wheel-image-aarch64: runs-on: [self-hosted, Linux, ARM64] - # if: (github.event_name == 'workflow_dispatch' && github.event.inputs.build_wheel == 'true') || (github.pull_request == 'pull_request') + # if: (github.event_name == 'workflow_dispatch' && github.event.inputs.build_wheel == 'true') || (github.event_name == 'pull_request') if: false steps: @@ -151,7 +151,7 @@ jobs: build-graphscope-dev-image-x86-64: runs-on: ubuntu-20.04 - if: (github.event_name == 'workflow_dispatch' && github.event.inputs.build_graphscope_dev == 'true') || (github.pull_request == 'pull_request') + if: (github.event_name == 'workflow_dispatch' && github.event.inputs.build_graphscope_dev == 'true') || (github.event_name == 'pull_request') steps: - uses: actions/checkout@v3 @@ -188,7 +188,7 @@ jobs: build-graphscope-dev-image-aarch64: runs-on: [self-hosted, Linux, ARM64] - # if: (github.event_name == 'workflow_dispatch' && github.event.inputs.build_graphscope_dev == 'true') || (github.pull_request == 'pull_request') + # if: (github.event_name == 'workflow_dispatch' && github.event.inputs.build_graphscope_dev == 'true') || (github.event_name == 'pull_request') if: false steps: @@ -257,7 +257,7 @@ jobs: build-vineyard-dev-image-x86-64: runs-on: ubuntu-20.04 - if: (github.event_name == 'workflow_dispatch' && github.event.inputs.build_vineyard_dev == 'true') || (github.pull_request == 'pull_request') + if: (github.event_name == 'workflow_dispatch' && github.event.inputs.build_vineyard_dev == 'true') || (github.event_name == 'pull_request') steps: - uses: actions/checkout@v3 @@ -294,7 +294,7 @@ jobs: build-vineyard-dev-image-aarch64: runs-on: [self-hosted, Linux, ARM64] - # if: (github.event_name == 'workflow_dispatch' && github.event.inputs.build_vineyard_dev == 'true') || (github.pull_request == 'pull_request') + # if: (github.event_name == 'workflow_dispatch' && github.event.inputs.build_vineyard_dev == 'true') || (github.event_name == 'pull_request') if: false steps: From fbb9099302188d3115467193067a15690d4a87a9 Mon Sep 17 00:00:00 2001 From: "dongze.ldz" Date: Wed, 19 Jun 2024 16:13:04 +0800 Subject: [PATCH 11/12] update --- .github/workflows/build-graphscope-dev-images.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-graphscope-dev-images.yml b/.github/workflows/build-graphscope-dev-images.yml index 18d92d3cda3b..569448ff33d1 100644 --- a/.github/workflows/build-graphscope-dev-images.yml +++ b/.github/workflows/build-graphscope-dev-images.yml @@ -365,7 +365,7 @@ jobs: runs-on: ubuntu-20.04 # only trigger this step in 'workflow_dispatch' event, # since the 'vineyard-dev' image isn't actually pushed in 'pull_request' - if: ${{ github.event_name == 'workflow_dispatch' }} && ${{ github.event.inputs.build_vineyard_dev == 'true' }} + if: ${{ github.event_name == 'workflow_dispatch' }} && ${{ github.event.inputs.build_vineyard_dev == 'true' }} || (github.event_name == 'pull_request') needs: [build-vineyard-dev-image-x86-64] steps: @@ -387,6 +387,7 @@ jobs: fi - name: Release Image + if: ${{ github.event_name == 'workflow_dispatch' }} env: docker_password: ${{ secrets.DOCKER_PASSWORD }} docker_username: ${{ secrets.DOCKER_USER }} @@ -404,7 +405,7 @@ jobs: runs-on: [self-hosted, Linux, ARM64] # only trigger this step in 'workflow_dispatch' event, # since the 'vineyard-dev' image isn't actually pushed in 'pull_request' - # if: ${{ github.event_name == 'workflow_dispatch' }} && ${{ github.event.inputs.build_vineyard_dev == 'true' }} + # if: ${{ github.event_name == 'workflow_dispatch' }} && ${{ github.event.inputs.build_vineyard_dev == 'true' }} || (github.event_name == 'pull_request') if: false needs: [manifest-push-vineyard-dev-image] From db227a16b9754efc081ffa40d588dab647c93cd1 Mon Sep 17 00:00:00 2001 From: "xiaolei.zl" Date: Thu, 20 Jun 2024 10:39:39 +0800 Subject: [PATCH 12/12] lower parallelsim Committed-by: xiaolei.zl from Dev container --- .../gsctl/scripts/lib/install_thirdparty_dependencies.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/graphscope/gsctl/scripts/lib/install_thirdparty_dependencies.sh b/python/graphscope/gsctl/scripts/lib/install_thirdparty_dependencies.sh index 8e08b268e75f..39d8eab7e200 100644 --- a/python/graphscope/gsctl/scripts/lib/install_thirdparty_dependencies.sh +++ b/python/graphscope/gsctl/scripts/lib/install_thirdparty_dependencies.sh @@ -444,6 +444,6 @@ install_hiactor() { mkdir build && cd build cmake -DHiactor_DEMOS=OFF -DHiactor_TESTING=OFF -DHiactor_DPDK=OFF -DCMAKE_INSTALL_PREFIX="${install_prefix}" \ -DHiactor_CXX_DIALECT=gnu++17 -DSeastar_CXX_FLAGS="-DSEASTAR_DEFAULT_ALLOCATOR -mno-avx512" .. - make -j ${parallelism} && make install + make -j 4 && make install popd && rm -rf /tmp/hiactor }