Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(learning): specify proper torch version for macos #3679

Merged
merged 2 commits into from
Mar 29, 2024
Merged

fix(learning): specify proper torch version for macos #3679

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dd706fa
fix(learning): specify proper torch version for macos
LiSu Mar 29, 2024
4ff278b
Merge branch 'main' into fix-torch-macos
LiSu Mar 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/local-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
6 changes: 3 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 && \
Expand All @@ -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) && \
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions k8s/internal/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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; \
Expand Down Expand Up @@ -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) && \
Expand Down