Skip to content

fix(interactive): disable repair wheel in coordinator dockerfile #4517

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

Merged
merged 4 commits into from
Feb 24, 2025
Merged

fix(interactive): disable repair wheel in coordinator dockerfile #4517

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6624077
disable repair wheel in coordinator dockerfile
siyuan0322 Feb 24, 2025
49a6e97
disable repair wheel in learning dockerfile
siyuan0322 Feb 24, 2025
6d8c3ed
skip gltorch..
siyuan0322 Feb 24, 2025
02e4bd2
fix
siyuan0322 Feb 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 19 additions & 19 deletions .github/workflows/build-graphscope-images-linux.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ jobs:
df -h
make learning CI=false VERSION=${SHORT_SHA}
df -h
make graphlearn-torch CI=false VERSION=${SHORT_SHA}
# make graphlearn-torch CI=false VERSION=${SHORT_SHA}
df -h

- name: Release Nightly Image
Expand All @@ -86,7 +86,7 @@ jobs:
sudo docker tag graphscope/interactive-frontend:${SHORT_SHA} ${{ env.REGISTRY }}/graphscope/interactive-frontend:${tag}
sudo docker tag graphscope/interactive-executor:${SHORT_SHA} ${{ env.REGISTRY }}/graphscope/interactive-executor:${tag}
sudo docker tag graphscope/learning:${SHORT_SHA} ${{ env.REGISTRY }}/graphscope/learning:${tag}
sudo docker tag graphscope/graphlearn-torch:${SHORT_SHA} ${{ env.REGISTRY }}/graphscope/graphlearn-torch:${tag}
# sudo docker tag graphscope/graphlearn-torch:${SHORT_SHA} ${{ env.REGISTRY }}/graphscope/graphlearn-torch:${tag}

sudo docker push ${{ env.REGISTRY }}/graphscope/coordinator:${tag}
sudo docker push ${{ env.REGISTRY }}/graphscope/analytical:${tag}
Expand All @@ -96,7 +96,7 @@ jobs:
sudo docker push ${{ env.REGISTRY }}/graphscope/interactive-frontend:${tag}
sudo docker push ${{ env.REGISTRY }}/graphscope/interactive-executor:${tag}
sudo docker push ${{ env.REGISTRY }}/graphscope/learning:${tag}
sudo docker push ${{ env.REGISTRY }}/graphscope/graphlearn-torch:${tag}
# sudo docker push ${{ env.REGISTRY }}/graphscope/graphlearn-torch:${tag}

# dataset image
# Note! dataset image are built manually just use the latest one.
Expand Down Expand Up @@ -128,7 +128,7 @@ jobs:
sudo docker tag graphscope/interactive-frontend:${SHORT_SHA} ${{ env.REGISTRY }}/graphscope/interactive-frontend:${tag}
sudo docker tag graphscope/interactive-executor:${SHORT_SHA} ${{ env.REGISTRY }}/graphscope/interactive-executor:${tag}
sudo docker tag graphscope/learning:${SHORT_SHA} ${{ env.REGISTRY }}/graphscope/learning:${tag}
sudo docker tag graphscope/graphlearn-torch:${SHORT_SHA} ${{ env.REGISTRY }}/graphscope/graphlearn-torch:${tag}
# sudo docker tag graphscope/graphlearn-torch:${SHORT_SHA} ${{ env.REGISTRY }}/graphscope/graphlearn-torch:${tag}

sudo docker push ${{ env.REGISTRY }}/graphscope/coordinator:${tag}
sudo docker push ${{ env.REGISTRY }}/graphscope/analytical:${tag}
Expand All @@ -137,7 +137,7 @@ jobs:
sudo docker push ${{ env.REGISTRY }}/graphscope/interactive-frontend:${tag}
sudo docker push ${{ env.REGISTRY }}/graphscope/interactive-executor:${tag}
sudo docker push ${{ env.REGISTRY }}/graphscope/learning:${tag}
sudo docker push ${{ env.REGISTRY }}/graphscope/graphlearn-torch:${tag}
# sudo docker push ${{ env.REGISTRY }}/graphscope/graphlearn-torch:${tag}

# dataset image
# Note! dataset image are built manually just use the latest one.
Expand All @@ -154,7 +154,7 @@ jobs:
sudo docker tag graphscope/interactive-frontend:${SHORT_SHA} ${{ env.REGISTRY }}/graphscope/interactive-frontend:${tag}
sudo docker tag graphscope/interactive-executor:${SHORT_SHA} ${{ env.REGISTRY }}/graphscope/interactive-executor:${tag}
sudo docker tag graphscope/learning:${SHORT_SHA} ${{ env.REGISTRY }}/graphscope/learning:${tag}
sudo docker tag graphscope/graphlearn-torch:${SHORT_SHA} ${{ env.REGISTRY }}/graphscope/graphlearn-torch:${tag}
# sudo docker tag graphscope/graphlearn-torch:${SHORT_SHA} ${{ env.REGISTRY }}/graphscope/graphlearn-torch:${tag}

sudo docker push ${{ env.REGISTRY }}/graphscope/coordinator:${tag}
sudo docker push ${{ env.REGISTRY }}/graphscope/analytical:${tag}
Expand All @@ -163,7 +163,7 @@ jobs:
sudo docker push ${{ env.REGISTRY }}/graphscope/interactive-frontend:${tag}
sudo docker push ${{ env.REGISTRY }}/graphscope/interactive-executor:${tag}
sudo docker push ${{ env.REGISTRY }}/graphscope/learning:${tag}
sudo docker push ${{ env.REGISTRY }}/graphscope/graphlearn-torch:${tag}
# sudo docker push ${{ env.REGISTRY }}/graphscope/graphlearn-torch:${tag}


build-image-aarch64:
Expand Down Expand Up @@ -385,9 +385,9 @@ jobs:
${{ env.REGISTRY }}/graphscope/learning:${version}a${time}-x86_64 \
${{ env.REGISTRY }}/graphscope/learning:${version}a${time}-aarch64

sudo docker manifest create \
${{ env.REGISTRY }}/graphscope/graphlearn-torch:${version}a${time} \
${{ env.REGISTRY }}/graphscope/graphlearn-torch:${version}a${time}-x86_64
# sudo docker manifest create \
# ${{ env.REGISTRY }}/graphscope/graphlearn-torch:${version}a${time} \
# ${{ env.REGISTRY }}/graphscope/graphlearn-torch:${version}a${time}-x86_64

sudo docker manifest create \
${{ env.REGISTRY }}/graphscope/dataset:${version}a${time} \
Expand All @@ -399,7 +399,7 @@ jobs:
sudo docker manifest push ${{ env.REGISTRY }}/graphscope/interactive-frontend:${version}a${time}
sudo docker manifest push ${{ env.REGISTRY }}/graphscope/interactive-executor:${version}a${time}
sudo docker manifest push ${{ env.REGISTRY }}/graphscope/learning:${version}a${time}
sudo docker manifest push ${{ env.REGISTRY }}/graphscope/graphlearn-torch:${version}a${time}
# sudo docker manifest push ${{ env.REGISTRY }}/graphscope/graphlearn-torch:${version}a${time}
sudo docker manifest push ${{ env.REGISTRY }}/graphscope/dataset:${version}a${time}

- name: Extract Tag Name
Expand Down Expand Up @@ -438,9 +438,9 @@ jobs:
${{ env.REGISTRY }}/graphscope/learning:${{ steps.tag.outputs.TAG }}-x86_64 \
${{ env.REGISTRY }}/graphscope/learning:${{ steps.tag.outputs.TAG }}-aarch64

sudo docker manifest create \
${{ env.REGISTRY }}/graphscope/graphlearn-torch:${{ steps.tag.outputs.TAG }} \
${{ env.REGISTRY }}/graphscope/graphlearn-torch:${{ steps.tag.outputs.TAG }}-x86_64
# sudo docker manifest create \
# ${{ env.REGISTRY }}/graphscope/graphlearn-torch:${{ steps.tag.outputs.TAG }} \
# ${{ env.REGISTRY }}/graphscope/graphlearn-torch:${{ steps.tag.outputs.TAG }}-x86_64

sudo docker manifest create \
${{ env.REGISTRY }}/graphscope/dataset:${{ steps.tag.outputs.TAG }} \
Expand Down Expand Up @@ -471,23 +471,23 @@ jobs:
${{ env.REGISTRY }}/graphscope/learning:latest-x86_64 \
${{ env.REGISTRY }}/graphscope/learning:latest-aarch64

sudo docker manifest create \
${{ env.REGISTRY }}/graphscope/graphlearn-torch:latest \
${{ env.REGISTRY }}/graphscope/graphlearn-torch:latest-x86_64
# sudo docker manifest create \
# ${{ env.REGISTRY }}/graphscope/graphlearn-torch:latest \
# ${{ env.REGISTRY }}/graphscope/graphlearn-torch:latest-x86_64

# push
sudo docker manifest push ${{ env.REGISTRY }}/graphscope/coordinator:${{ steps.tag.outputs.TAG }}
sudo docker manifest push ${{ env.REGISTRY }}/graphscope/analytical:${{ steps.tag.outputs.TAG }}
sudo docker manifest push ${{ env.REGISTRY }}/graphscope/interactive-frontend:${{ steps.tag.outputs.TAG }}
sudo docker manifest push ${{ env.REGISTRY }}/graphscope/interactive-executor:${{ steps.tag.outputs.TAG }}
sudo docker manifest push ${{ env.REGISTRY }}/graphscope/learning:${{ steps.tag.outputs.TAG }}
sudo docker manifest push ${{ env.REGISTRY }}/graphscope/graphlearn-torch:${{ steps.tag.outputs.TAG }}
# sudo docker manifest push ${{ env.REGISTRY }}/graphscope/graphlearn-torch:${{ steps.tag.outputs.TAG }}
sudo docker manifest push ${{ env.REGISTRY }}/graphscope/dataset:${{ steps.tag.outputs.TAG }}

sudo docker manifest push ${{ env.REGISTRY }}/graphscope/coordinator:latest
sudo docker manifest push ${{ env.REGISTRY }}/graphscope/analytical:latest
sudo docker manifest push ${{ env.REGISTRY }}/graphscope/interactive-frontend:latest
sudo docker manifest push ${{ env.REGISTRY }}/graphscope/interactive-executor:latest
sudo docker manifest push ${{ env.REGISTRY }}/graphscope/learning:latest
sudo docker manifest push ${{ env.REGISTRY }}/graphscope/graphlearn-torch:latest
# sudo docker manifest push ${{ env.REGISTRY }}/graphscope/graphlearn-torch:latest

10 changes: 6 additions & 4 deletions k8s/dockerfiles/coordinator.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,12 @@ RUN cd /home/graphscope/GraphScope/ && \
cd python && \
python3 -m pip install --user -r requirements.txt && \
python3 setup.py bdist_wheel && \
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/home/graphscope/GraphScope/learning_engine/graph-learn/graphlearn/built/lib && \
auditwheel repair dist/*.whl && \
python3 -m pip install wheelhouse/*.whl && \
cp wheelhouse/*.whl /home/graphscope/install/ && \
python3 -m pip install dist/*.whl && \
cp dist/*.whl /home/graphscope/install/ && \
# export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/home/graphscope/GraphScope/learning_engine/graph-learn/graphlearn/built/lib && \
# auditwheel repair dist/*.whl && \
# python3 -m pip install wheelhouse/*.whl && \
# cp wheelhouse/*.whl /home/graphscope/install/ && \
cd ../coordinator && \
python3 setup.py bdist_wheel && \
cp dist/*.whl /home/graphscope/install/; \
Expand Down
10 changes: 6 additions & 4 deletions k8s/dockerfiles/learning.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,12 @@ RUN cd /home/graphscope/GraphScope/ && \
cd python; \
python3 -m pip install --user -r requirements.txt; \
python3 setup.py bdist_wheel; \
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/home/graphscope/GraphScope/learning_engine/graph-learn/graphlearn/built/lib; \
auditwheel repair dist/*.whl; \
python3 -m pip install wheelhouse/*.whl; \
cp wheelhouse/*.whl /home/graphscope/install/; \
python3 -m pip install dist/*.whl && \
cp dist/*.whl /home/graphscope/install/ && \
# export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/home/graphscope/GraphScope/learning_engine/graph-learn/graphlearn/built/lib; \
# auditwheel repair dist/*.whl; \
# python3 -m pip install wheelhouse/*.whl; \
# cp wheelhouse/*.whl /home/graphscope/install/; \
cd ../coordinator; \
python3 setup.py bdist_wheel; \
cp dist/*.whl /home/graphscope/install/; \
Expand Down
Loading