Skip to content

Commit 513155c

Browse files
authored
Upgrade the graphlearn submodule to fixes nightly CI, refactor the Makefile for early error exit (#2902)
See also: - nightly CI failure in https://github.com/alibaba/GraphScope/actions/runs/5271097039/jobs/9531496683 Signed-off-by: Tao He <[email protected]>
1 parent bd7680f commit 513155c

File tree

2 files changed

+39
-31
lines changed

2 files changed

+39
-31
lines changed

k8s/internal/Makefile

+38-30
Original file line numberDiff line numberDiff line change
@@ -65,15 +65,18 @@ graphscope-py3-package: $(TARGET_SERVER_PACKAGE)
6565
graphscope-client-py3-package: $(TARGET_CLIENT_PACKAGE)
6666

6767

68+
MAKE_COMMAND=make INSTALL_PREFIX=${INSTALL_PREFIX}
6869
MAKE_INSTALL_COMMAND=make install INSTALL_PREFIX=${INSTALL_PREFIX}
6970

7071
graphscope-darwin-py3:
7172
# build graphscope
7273
cd $(WORKING_DIR)/../.. && \
7374
python3 -m pip install --upgrade setuptools && \
7475
export INSTALL_PREFIX=/opt/graphscope && \
75-
for _ in {1..5}; do if make INSTALL_PREFIX=${INSTALL_PREFIX}; then break; fi; done && \
76-
for _ in {1..5}; do if $(MAKE_INSTALL_COMMAND); then break; fi; done && \
76+
for _ in {1..5}; do if $(MAKE_COMMAND); then succeed=1; break; else succeed=0; fi; done && \
77+
if [[ $$succeed == 1 ]]; then echo "Build succeed"; else echo "Build failed"; exit 1; fi && \
78+
for _ in {1..5}; do if $(MAKE_INSTALL_COMMAND); then succeed=1; break; else succeed=0; fi; done && \
79+
if [[ $$succeed == 1 ]]; then echo "Install succeed"; else echo "Install failed"; exit 1; fi && \
7780
(sudo cp -rs ${INSTALL_PREFIX}/* /usr/local/ || true) && \
7881
python3 $(WORKING_DIR)/../utils/precompile.py --graph --app
7982
# build and delocate wheel
@@ -105,35 +108,40 @@ graphscope-manylinux2014-py3-nodocker:
105108
sudo yum install java-11-openjdk-devel -y && \
106109
sudo yum remove java-1.8.0-openjdk-devel java-1.8.0-openjdk java-1.8.0-openjdk-headless -y && \
107110
cd $(WORKING_DIR)/../.. && \
108-
if [[ "${ARCH}" == "aarch64" ]]; then python3 -m pip install grpcio==1.49.1 --no-binary grpcio; \
109-
export AUDITWHEEL_PLAT=manylinux2014_${ARCH}; \
110-
python3 -m pip install grpcio-tools==1.49.1 --no-binary grpcio-tools; fi && \
111-
for _ in {1..5}; do if make INSTALL_PREFIX=${INSTALL_PREFIX}; then break; fi; done && \
112-
for _ in {1..5}; do if $(MAKE_INSTALL_COMMAND); then break; fi; done && \
113-
if [ ${INSTALL_PREFIX} != ${GRAPHSCOPE_HOME} ]; then sudo cp -rsn ${INSTALL_PREFIX}/* ${GRAPHSCOPE_HOME}/; fi && \
114-
python3 $(WORKING_DIR)/../utils/precompile.py --graph --app && \
115-
export WITH_EXTRA_DATA=ON && \
116-
export GRAPHSCOPE_HOME=${GRAPHSCOPE_HOME} && \
117-
export INSTALL_PREFIX=${INSTALL_PREFIX} && \
111+
if [[ "${ARCH}" == "aarch64" ]]; then python3 -m pip install grpcio==1.49.1 --no-binary grpcio; \
112+
export AUDITWHEEL_PLAT=manylinux2014_${ARCH}; \
113+
python3 -m pip install grpcio-tools==1.49.1 --no-binary grpcio-tools; \
114+
fi && \
115+
for _ in {1..5}; do if $(MAKE_COMMAND); then succeed=1; break; else succeed=0; fi; done && \
116+
if [[ $$succeed == 1 ]]; then echo "Build succeed"; else echo "Build failed"; exit 1; fi && \
117+
for _ in {1..5}; do if $(MAKE_INSTALL_COMMAND); then succeed=1; break; else succeed=0; fi; done && \
118+
if [[ $$succeed == 1 ]]; then echo "Install succeed"; else echo "Install failed"; exit 1; fi && \
119+
if [ ${INSTALL_PREFIX} != ${GRAPHSCOPE_HOME} ]; then \
120+
sudo cp -rsn ${INSTALL_PREFIX}/* ${GRAPHSCOPE_HOME}/; \
121+
fi && \
122+
python3 $(WORKING_DIR)/../utils/precompile.py --graph --app && \
118123
cd $(WORKING_DIR)/../../coordinator && \
119-
rm -rf build dist/*.whl && \
120-
sudo strip ${INSTALL_PREFIX}/bin/grape_engine && \
121-
sudo strip ${INSTALL_PREFIX}/bin/gaia_executor && \
122-
sudo strip ${INSTALL_PREFIX}/lib/*.so && \
123-
(strip /tmp/gs/builtin/*/*.so || true) && \
124-
package_name=gs-include python3 setup.py bdist_wheel && \
125-
rm -rf build && \
126-
package_name=gs-apps python3 setup.py bdist_wheel && \
127-
rm -rf build && \
128-
package_name=gs-engine python3 setup.py bdist_wheel && \
129-
rm -rf build && \
130-
package_name=gs-coordinator python3 setup.py bdist_wheel && \
131-
rm -rf build && \
132-
package_name=graphscope python3 setup.py bdist_wheel && \
133-
cd dist && \
134-
for wheel in `ls ./*.whl`; do \
135-
(auditwheel repair $$wheel --plat=manylinux2014_${ARCH} && rm $$wheel) || true; \
136-
done
124+
export WITH_EXTRA_DATA=ON && \
125+
export GRAPHSCOPE_HOME=${GRAPHSCOPE_HOME} && \
126+
export INSTALL_PREFIX=${INSTALL_PREFIX} && \
127+
rm -rf build dist/*.whl && \
128+
sudo strip ${INSTALL_PREFIX}/bin/grape_engine && \
129+
sudo strip ${INSTALL_PREFIX}/bin/gaia_executor && \
130+
sudo strip ${INSTALL_PREFIX}/lib/*.so && \
131+
(strip /tmp/gs/builtin/*/*.so || true) && \
132+
package_name=gs-include python3 setup.py bdist_wheel && \
133+
rm -rf build && \
134+
package_name=gs-apps python3 setup.py bdist_wheel && \
135+
rm -rf build && \
136+
package_name=gs-engine python3 setup.py bdist_wheel && \
137+
rm -rf build && \
138+
package_name=gs-coordinator python3 setup.py bdist_wheel && \
139+
rm -rf build && \
140+
package_name=graphscope python3 setup.py bdist_wheel && \
141+
cd dist && \
142+
for wheel in `ls ./*.whl`; do \
143+
(auditwheel repair $$wheel --plat=manylinux2014_${ARCH} && rm $$wheel) || true; \
144+
done
137145

138146
graphscope-manylinux2014-py3:
139147
docker pull ${REGISTRY}/graphscope/graphscope-dev:wheel

0 commit comments

Comments
 (0)