From dc0bee6206f08ca039aecd444c96b992e95d8258 Mon Sep 17 00:00:00 2001 From: Tao He Date: Wed, 31 Jan 2024 12:29:58 +0800 Subject: [PATCH] ci: fixes a syntax error in CI (#3521) See also: https://github.com/alibaba/GraphScope/actions/runs/7709297882 Signed-off-by: Tao He --- .github/workflows/hqps-db-ci.yml | 6 +++--- .github/workflows/local-ci.yml | 2 +- Makefile | 6 +++--- k8s/internal/Makefile | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/hqps-db-ci.yml b/.github/workflows/hqps-db-ci.yml index f5dd83c1c467..59a4c283c097 100644 --- a/.github/workflows/hqps-db-ci.yml +++ b/.github/workflows/hqps-db-ci.yml @@ -170,15 +170,15 @@ jobs: eval ${cmd} done - -name: Test cypher procedure generation + - name: Test cypher procedure generation run: | cd ${GITHUB_WORKSPACE}/flex/bin ./load_plan_and_gen.sh -e=hqps -i=../interactive/examples/modern_graph/get_person_name.cypher -w=/tmp/codegen \ - --ir_conf=/workspaces/GraphScope/flex/tests/hqps/engine_config_test.yaml \ + --ir_conf=${GITHUB_WORKSPACE}/flex/tests/hqps/engine_config_test.yaml \ --graph_schema_path=../interactive/examples/modern_graph/modern_graph.yaml ./load_plan_and_gen.sh -e=hqps -i=../interactive/examples/modern_graph/count_vertex_num.cypher -w=/tmp/codegen \ - --ir_conf=/workspaces/GraphScope/flex/tests/hqps/engine_config_test.yaml \ + --ir_conf=${GITHUB_WORKSPACE}/flex/tests/hqps/engine_config_test.yaml \ --graph_schema_path=../interactive/examples/modern_graph/modern_graph.yaml - name: Run End-to-End cypher adhoc ldbc query test diff --git a/.github/workflows/local-ci.yml b/.github/workflows/local-ci.yml index aa0246693301..bc2d0509f084 100644 --- a/.github/workflows/local-ci.yml +++ b/.github/workflows/local-ci.yml @@ -298,7 +298,7 @@ jobs: # install tensorflow python3 -m pip install --no-cache-dir pytest pytest-xdist "tensorflow" "pandas" --user # install pytorch - python3 -m pip install --no-cache-dir "torch" --index-url https://download.pytorch.org/whl/cpu + python3 -m pip install --no-cache-dir "torch" "networkx<=3.0" --index-url https://download.pytorch.org/whl/cpu # install java sudo apt update -y && sudo apt install openjdk-11-jdk -y diff --git a/Makefile b/Makefile index 9ba9ec4b9639..ce95851582a3 100644 --- a/Makefile +++ b/Makefile @@ -78,7 +78,7 @@ clean: client: learning cd $(CLIENT_DIR) && \ - python3 -m pip install ${PIP_ARGS} "torch" --index-url https://download.pytorch.org/whl/cpu --user && \ + python3 -m pip install ${PIP_ARGS} "torch" "networkx<=3.0" --index-url https://download.pytorch.org/whl/cpu --user && \ python3 -m pip install ${PIP_ARGS} -r requirements.txt -r requirements-dev.txt --user && \ export PATH=$(PATH):$(HOME)/.local/bin && \ python3 setup.py build_ext --inplace --user && \ @@ -90,7 +90,7 @@ client: learning coordinator: client cd $(COORDINATOR_DIR) && \ - python3 -m pip install ${PIP_ARGS} "torch" --index-url https://download.pytorch.org/whl/cpu --user && \ + python3 -m pip install ${PIP_ARGS} "torch" "networkx<=3.0" --index-url https://download.pytorch.org/whl/cpu --user && \ python3 -m pip install ${PIP_ARGS} -r requirements.txt -r requirements-dev.txt --user && \ python3 setup.py build_builtin && \ python3 -m pip install --user --editable $(COORDINATOR_DIR) && \ @@ -174,7 +174,7 @@ $(LEARNING_DIR)/graphlearn/built/lib/libgraphlearn_shared.$(SUFFIX): prepare-client: cd $(CLIENT_DIR) && \ - pip3 install ${PIP_ARGS} "torch" --index-url https://download.pytorch.org/whl/cpu --user && \ + pip3 install ${PIP_ARGS} "torch" "networkx<=3.0" --index-url https://download.pytorch.org/whl/cpu --user && \ pip3 install ${PIP_ARGS} -r requirements.txt --user && \ pip3 install ${PIP_ARGS} -r requirements-dev.txt --user && \ python3 setup.py build_proto diff --git a/k8s/internal/Makefile b/k8s/internal/Makefile index 5a2c59feb4b6..239895493e12 100644 --- a/k8s/internal/Makefile +++ b/k8s/internal/Makefile @@ -157,7 +157,7 @@ graphscope-manylinux2014-py3: graphscope-client-manylinux2014-py3-nodocker: set -euxo pipefail && \ cd $(WORKING_DIR)/../../python && \ - python3 -m pip install ${PIP_ARGS} "torch" --index-url https://download.pytorch.org/whl/cpu --user && \ + python3 -m pip install ${PIP_ARGS} "torch" "networkx<=3.0" --index-url https://download.pytorch.org/whl/cpu --user && \ python3 -m pip install ${PIP_ARGS} -r requirements.txt -r requirements-dev.txt --user && \ cd $(WORKING_DIR)/../../learning_engine/graph-learn && \ git submodule update --init third_party/pybind11 && \ @@ -216,7 +216,7 @@ graphscope-client-manylinux2014-py3-nodocker: graphscope-client-darwin-py3: cd $(WORKING_DIR)/../../python && \ - python3 -m pip install ${PIP_ARGS} "torch" --index-url https://download.pytorch.org/whl/cpu --user && \ + python3 -m pip install ${PIP_ARGS} "torch" "networkx<=3.0" --index-url https://download.pytorch.org/whl/cpu --user && \ python3 -m pip install ${PIP_ARGS} -r requirements.txt -r requirements-dev.txt --user && \ cd $(WORKING_DIR)/../../learning_engine/graph-learn && \ (git submodule update --init third_party/pybind11 || true) && \