Skip to content

Commit 08ad5bf

Browse files
siyuan0322siyuan0322
authored
fix(interactive): disable repair wheel in coordinator dockerfile (#4517)
Fixes #4454 --------- Signed-off-by: siyuan0322 <[email protected]>
1 parent aa450cf commit 08ad5bf

File tree

3 files changed

+31
-27
lines changed

3 files changed

+31
-27
lines changed

‎.github/workflows/build-graphscope-images-linux.yml‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ jobs:
6161
df -h
6262
make learning CI=false VERSION=${SHORT_SHA}
6363
df -h
64-
make graphlearn-torch CI=false VERSION=${SHORT_SHA}
64+
# make graphlearn-torch CI=false VERSION=${SHORT_SHA}
6565
df -h
6666
6767
- name: Release Nightly Image
@@ -86,7 +86,7 @@ jobs:
8686
sudo docker tag graphscope/interactive-frontend:${SHORT_SHA} ${{ env.REGISTRY }}/graphscope/interactive-frontend:${tag}
8787
sudo docker tag graphscope/interactive-executor:${SHORT_SHA} ${{ env.REGISTRY }}/graphscope/interactive-executor:${tag}
8888
sudo docker tag graphscope/learning:${SHORT_SHA} ${{ env.REGISTRY }}/graphscope/learning:${tag}
89-
sudo docker tag graphscope/graphlearn-torch:${SHORT_SHA} ${{ env.REGISTRY }}/graphscope/graphlearn-torch:${tag}
89+
# sudo docker tag graphscope/graphlearn-torch:${SHORT_SHA} ${{ env.REGISTRY }}/graphscope/graphlearn-torch:${tag}
9090
9191
sudo docker push ${{ env.REGISTRY }}/graphscope/coordinator:${tag}
9292
sudo docker push ${{ env.REGISTRY }}/graphscope/analytical:${tag}
@@ -96,7 +96,7 @@ jobs:
9696
sudo docker push ${{ env.REGISTRY }}/graphscope/interactive-frontend:${tag}
9797
sudo docker push ${{ env.REGISTRY }}/graphscope/interactive-executor:${tag}
9898
sudo docker push ${{ env.REGISTRY }}/graphscope/learning:${tag}
99-
sudo docker push ${{ env.REGISTRY }}/graphscope/graphlearn-torch:${tag}
99+
# sudo docker push ${{ env.REGISTRY }}/graphscope/graphlearn-torch:${tag}
100100
101101
# dataset image
102102
# Note! dataset image are built manually just use the latest one.
@@ -128,7 +128,7 @@ jobs:
128128
sudo docker tag graphscope/interactive-frontend:${SHORT_SHA} ${{ env.REGISTRY }}/graphscope/interactive-frontend:${tag}
129129
sudo docker tag graphscope/interactive-executor:${SHORT_SHA} ${{ env.REGISTRY }}/graphscope/interactive-executor:${tag}
130130
sudo docker tag graphscope/learning:${SHORT_SHA} ${{ env.REGISTRY }}/graphscope/learning:${tag}
131-
sudo docker tag graphscope/graphlearn-torch:${SHORT_SHA} ${{ env.REGISTRY }}/graphscope/graphlearn-torch:${tag}
131+
# sudo docker tag graphscope/graphlearn-torch:${SHORT_SHA} ${{ env.REGISTRY }}/graphscope/graphlearn-torch:${tag}
132132
133133
sudo docker push ${{ env.REGISTRY }}/graphscope/coordinator:${tag}
134134
sudo docker push ${{ env.REGISTRY }}/graphscope/analytical:${tag}
@@ -137,7 +137,7 @@ jobs:
137137
sudo docker push ${{ env.REGISTRY }}/graphscope/interactive-frontend:${tag}
138138
sudo docker push ${{ env.REGISTRY }}/graphscope/interactive-executor:${tag}
139139
sudo docker push ${{ env.REGISTRY }}/graphscope/learning:${tag}
140-
sudo docker push ${{ env.REGISTRY }}/graphscope/graphlearn-torch:${tag}
140+
# sudo docker push ${{ env.REGISTRY }}/graphscope/graphlearn-torch:${tag}
141141
142142
# dataset image
143143
# Note! dataset image are built manually just use the latest one.
@@ -154,7 +154,7 @@ jobs:
154154
sudo docker tag graphscope/interactive-frontend:${SHORT_SHA} ${{ env.REGISTRY }}/graphscope/interactive-frontend:${tag}
155155
sudo docker tag graphscope/interactive-executor:${SHORT_SHA} ${{ env.REGISTRY }}/graphscope/interactive-executor:${tag}
156156
sudo docker tag graphscope/learning:${SHORT_SHA} ${{ env.REGISTRY }}/graphscope/learning:${tag}
157-
sudo docker tag graphscope/graphlearn-torch:${SHORT_SHA} ${{ env.REGISTRY }}/graphscope/graphlearn-torch:${tag}
157+
# sudo docker tag graphscope/graphlearn-torch:${SHORT_SHA} ${{ env.REGISTRY }}/graphscope/graphlearn-torch:${tag}
158158
159159
sudo docker push ${{ env.REGISTRY }}/graphscope/coordinator:${tag}
160160
sudo docker push ${{ env.REGISTRY }}/graphscope/analytical:${tag}
@@ -163,7 +163,7 @@ jobs:
163163
sudo docker push ${{ env.REGISTRY }}/graphscope/interactive-frontend:${tag}
164164
sudo docker push ${{ env.REGISTRY }}/graphscope/interactive-executor:${tag}
165165
sudo docker push ${{ env.REGISTRY }}/graphscope/learning:${tag}
166-
sudo docker push ${{ env.REGISTRY }}/graphscope/graphlearn-torch:${tag}
166+
# sudo docker push ${{ env.REGISTRY }}/graphscope/graphlearn-torch:${tag}
167167
168168
169169
build-image-aarch64:
@@ -385,9 +385,9 @@ jobs:
385385
${{ env.REGISTRY }}/graphscope/learning:${version}a${time}-x86_64 \
386386
${{ env.REGISTRY }}/graphscope/learning:${version}a${time}-aarch64
387387
388-
sudo docker manifest create \
389-
${{ env.REGISTRY }}/graphscope/graphlearn-torch:${version}a${time} \
390-
${{ env.REGISTRY }}/graphscope/graphlearn-torch:${version}a${time}-x86_64
388+
# sudo docker manifest create \
389+
# ${{ env.REGISTRY }}/graphscope/graphlearn-torch:${version}a${time} \
390+
# ${{ env.REGISTRY }}/graphscope/graphlearn-torch:${version}a${time}-x86_64
391391
392392
sudo docker manifest create \
393393
${{ env.REGISTRY }}/graphscope/dataset:${version}a${time} \
@@ -399,7 +399,7 @@ jobs:
399399
sudo docker manifest push ${{ env.REGISTRY }}/graphscope/interactive-frontend:${version}a${time}
400400
sudo docker manifest push ${{ env.REGISTRY }}/graphscope/interactive-executor:${version}a${time}
401401
sudo docker manifest push ${{ env.REGISTRY }}/graphscope/learning:${version}a${time}
402-
sudo docker manifest push ${{ env.REGISTRY }}/graphscope/graphlearn-torch:${version}a${time}
402+
# sudo docker manifest push ${{ env.REGISTRY }}/graphscope/graphlearn-torch:${version}a${time}
403403
sudo docker manifest push ${{ env.REGISTRY }}/graphscope/dataset:${version}a${time}
404404
405405
- name: Extract Tag Name
@@ -438,9 +438,9 @@ jobs:
438438
${{ env.REGISTRY }}/graphscope/learning:${{ steps.tag.outputs.TAG }}-x86_64 \
439439
${{ env.REGISTRY }}/graphscope/learning:${{ steps.tag.outputs.TAG }}-aarch64
440440
441-
sudo docker manifest create \
442-
${{ env.REGISTRY }}/graphscope/graphlearn-torch:${{ steps.tag.outputs.TAG }} \
443-
${{ env.REGISTRY }}/graphscope/graphlearn-torch:${{ steps.tag.outputs.TAG }}-x86_64
441+
# sudo docker manifest create \
442+
# ${{ env.REGISTRY }}/graphscope/graphlearn-torch:${{ steps.tag.outputs.TAG }} \
443+
# ${{ env.REGISTRY }}/graphscope/graphlearn-torch:${{ steps.tag.outputs.TAG }}-x86_64
444444
445445
sudo docker manifest create \
446446
${{ env.REGISTRY }}/graphscope/dataset:${{ steps.tag.outputs.TAG }} \
@@ -471,23 +471,23 @@ jobs:
471471
${{ env.REGISTRY }}/graphscope/learning:latest-x86_64 \
472472
${{ env.REGISTRY }}/graphscope/learning:latest-aarch64
473473
474-
sudo docker manifest create \
475-
${{ env.REGISTRY }}/graphscope/graphlearn-torch:latest \
476-
${{ env.REGISTRY }}/graphscope/graphlearn-torch:latest-x86_64
474+
# sudo docker manifest create \
475+
# ${{ env.REGISTRY }}/graphscope/graphlearn-torch:latest \
476+
# ${{ env.REGISTRY }}/graphscope/graphlearn-torch:latest-x86_64
477477
478478
# push
479479
sudo docker manifest push ${{ env.REGISTRY }}/graphscope/coordinator:${{ steps.tag.outputs.TAG }}
480480
sudo docker manifest push ${{ env.REGISTRY }}/graphscope/analytical:${{ steps.tag.outputs.TAG }}
481481
sudo docker manifest push ${{ env.REGISTRY }}/graphscope/interactive-frontend:${{ steps.tag.outputs.TAG }}
482482
sudo docker manifest push ${{ env.REGISTRY }}/graphscope/interactive-executor:${{ steps.tag.outputs.TAG }}
483483
sudo docker manifest push ${{ env.REGISTRY }}/graphscope/learning:${{ steps.tag.outputs.TAG }}
484-
sudo docker manifest push ${{ env.REGISTRY }}/graphscope/graphlearn-torch:${{ steps.tag.outputs.TAG }}
484+
# sudo docker manifest push ${{ env.REGISTRY }}/graphscope/graphlearn-torch:${{ steps.tag.outputs.TAG }}
485485
sudo docker manifest push ${{ env.REGISTRY }}/graphscope/dataset:${{ steps.tag.outputs.TAG }}
486486
487487
sudo docker manifest push ${{ env.REGISTRY }}/graphscope/coordinator:latest
488488
sudo docker manifest push ${{ env.REGISTRY }}/graphscope/analytical:latest
489489
sudo docker manifest push ${{ env.REGISTRY }}/graphscope/interactive-frontend:latest
490490
sudo docker manifest push ${{ env.REGISTRY }}/graphscope/interactive-executor:latest
491491
sudo docker manifest push ${{ env.REGISTRY }}/graphscope/learning:latest
492-
sudo docker manifest push ${{ env.REGISTRY }}/graphscope/graphlearn-torch:latest
492+
# sudo docker manifest push ${{ env.REGISTRY }}/graphscope/graphlearn-torch:latest
493493

‎k8s/dockerfiles/coordinator.Dockerfile‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,12 @@ RUN cd /home/graphscope/GraphScope/ && \
2020
cd python && \
2121
python3 -m pip install --user -r requirements.txt && \
2222
python3 setup.py bdist_wheel && \
23-
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/home/graphscope/GraphScope/learning_engine/graph-learn/graphlearn/built/lib && \
24-
auditwheel repair dist/*.whl && \
25-
python3 -m pip install wheelhouse/*.whl && \
26-
cp wheelhouse/*.whl /home/graphscope/install/ && \
23+
python3 -m pip install dist/*.whl && \
24+
cp dist/*.whl /home/graphscope/install/ && \
25+
# export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/home/graphscope/GraphScope/learning_engine/graph-learn/graphlearn/built/lib && \
26+
# auditwheel repair dist/*.whl && \
27+
# python3 -m pip install wheelhouse/*.whl && \
28+
# cp wheelhouse/*.whl /home/graphscope/install/ && \
2729
cd ../coordinator && \
2830
python3 setup.py bdist_wheel && \
2931
cp dist/*.whl /home/graphscope/install/; \

‎k8s/dockerfiles/learning.Dockerfile‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,12 @@ RUN cd /home/graphscope/GraphScope/ && \
1919
cd python; \
2020
python3 -m pip install --user -r requirements.txt; \
2121
python3 setup.py bdist_wheel; \
22-
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/home/graphscope/GraphScope/learning_engine/graph-learn/graphlearn/built/lib; \
23-
auditwheel repair dist/*.whl; \
24-
python3 -m pip install wheelhouse/*.whl; \
25-
cp wheelhouse/*.whl /home/graphscope/install/; \
22+
python3 -m pip install dist/*.whl && \
23+
cp dist/*.whl /home/graphscope/install/ && \
24+
# export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/home/graphscope/GraphScope/learning_engine/graph-learn/graphlearn/built/lib; \
25+
# auditwheel repair dist/*.whl; \
26+
# python3 -m pip install wheelhouse/*.whl; \
27+
# cp wheelhouse/*.whl /home/graphscope/install/; \
2628
cd ../coordinator; \
2729
python3 setup.py bdist_wheel; \
2830
cp dist/*.whl /home/graphscope/install/; \

0 commit comments

Comments
 (0)