From dd706fafd5f998b93f9b5fb7abdac82635512a8b Mon Sep 17 00:00:00 2001 From: LiSu Date: Fri, 29 Mar 2024 10:31:44 +0800 Subject: [PATCH] fix(learning): specify proper torch version for macos Committed-by: LiSu from Dev container --- .github/workflows/local-ci.yml | 2 +- Makefile | 6 +++--- k8s/internal/Makefile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/local-ci.yml b/.github/workflows/local-ci.yml index ff0c2223629d..2b195ec9096c 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==1.13.1" "networkx<=3.0" --index-url https://download.pytorch.org/whl/cpu + python3 -m pip install --no-cache-dir "torch<=2.2.1" "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 e16556deb216..7c3ded9b5226 100644 --- a/Makefile +++ b/Makefile @@ -78,7 +78,7 @@ clean: client: learning cd $(CLIENT_DIR) && \ - python3 -m pip install ${PIP_ARGS} "torch==1.13.1" "networkx<=3.0" --index-url https://download.pytorch.org/whl/cpu --user && \ + python3 -m pip install ${PIP_ARGS} "torch<=2.2.1" "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==1.13.1" "networkx<=3.0" --index-url https://download.pytorch.org/whl/cpu --user && \ + python3 -m pip install ${PIP_ARGS} "torch<=2.2.1" "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==1.13.1" "networkx<=3.0" --index-url https://download.pytorch.org/whl/cpu --user && \ + pip3 install ${PIP_ARGS} "torch<=2.2.1" "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 ff57312636c2..0c5fc78b3813 100644 --- a/k8s/internal/Makefile +++ b/k8s/internal/Makefile @@ -174,7 +174,7 @@ graphscope-client-manylinux2014-py3-nodocker: cd $(WORKING_DIR)/../../python; \ export PATH=/opt/python/$$py/bin:$$PATH; \ python3 -m pip install ${PIP_ARGS} -U pip; \ - python3 -m pip install ${PIP_ARGS} "torch==1.13.1" --index-url https://download.pytorch.org/whl/cpu --user; \ + python3 -m pip install ${PIP_ARGS} "torch<=2.2.1" --index-url https://download.pytorch.org/whl/cpu --user; \ if [[ "$$py" == "cp311-cp311" ]]; then \ if [[ "${ARCH}" == "aarch64" ]]; then \ python3 -m pip install ${PIP_ARGS} grpcio==1.49.1 --no-binary grpcio; \ @@ -218,7 +218,7 @@ graphscope-client-manylinux2014-py3-nodocker: graphscope-client-darwin-py3: cd $(WORKING_DIR)/../../python && \ - python3 -m pip install ${PIP_ARGS} "torch==1.13.1" "networkx<=3.0" --index-url https://download.pytorch.org/whl/cpu --user && \ + python3 -m pip install ${PIP_ARGS} "torch<=2.2.1" "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) && \