diff --git a/.github/workflows/cancel.yaml b/.github/workflows/cancel.yaml index 48bc8e2c61f3..e3459e0b6568 100644 --- a/.github/workflows/cancel.yaml +++ b/.github/workflows/cancel.yaml @@ -1,6 +1,6 @@ name: Cancel Stale Runs -on: [push, pull_request_target] +on: [pull_request_target] jobs: cancel: diff --git a/k8s/Makefile b/k8s/Makefile index f6a28be1086d..a392467f7a08 100644 --- a/k8s/Makefile +++ b/k8s/Makefile @@ -100,7 +100,9 @@ graphscope-darwin-py3: sudo rm -fr /tmp/libvineyard /tmp/libgrape-lite # build graphscope cd $(WORKING_DIR)/../ && \ + export LDFLAGS=-L/usr/local/opt/llvm/lib && \ make install WITH_LEARNING_ENGINE=OFF && \ + unset LDFLAGS && \ sudo install_name_tool -add_rpath /usr/local/lib /opt/graphscope/bin/executor && \ sudo install_name_tool -add_rpath /usr/local/lib /opt/graphscope/bin/gaia_executor && \ python3 $(WORKING_DIR)/precompile.py @@ -179,7 +181,6 @@ graphscope-client-manylinux2014-py3: cmake .. -DCMAKE_PREFIX_PATH=/opt/vineyard \ -DCMAKE_INSTALL_PREFIX=/opt/vineyard \ -DBUILD_SHARED_LIBS=OFF \ - -DBUILD_VINEYARD_IO_OSS=ON \ -DBUILD_VINEYARD_MIGRATION=OFF && \ sudo make install vineyard_client_python -j`nproc` && \ sudo cp -rf /opt/vineyard/* /usr/local/ && \ diff --git a/k8s/ubuntu/gsvineyard.Dockerfile b/k8s/ubuntu/gsvineyard.Dockerfile index 91dc87bcd3cf..c129ae5b0f01 100644 --- a/k8s/ubuntu/gsvineyard.Dockerfile +++ b/k8s/ubuntu/gsvineyard.Dockerfile @@ -20,8 +20,7 @@ RUN cd /tmp && \ mkdir -p /tmp/libvineyard/build && \ cd /tmp/libvineyard/build && \ cmake .. -DBUILD_VINEYARD_PYPI_PACKAGES=ON \ - -DBUILD_SHARED_LIBS=ON \ - -DBUILD_VINEYARD_IO_OSS=ON && \ + -DBUILD_SHARED_LIBS=ON && \ make install vineyard_client_python -j && \ cd /tmp/libvineyard && \ python3 setup.py bdist_wheel && \ diff --git a/learning_engine/graph-learn b/learning_engine/graph-learn index 9fa6a524cba3..90e6944ac70c 160000 --- a/learning_engine/graph-learn +++ b/learning_engine/graph-learn @@ -1 +1 @@ -Subproject commit 9fa6a524cba3744c62ac623c5c4c842f4f17c6b0 +Subproject commit 90e6944ac70c60f8d2d2ec570a91c2a6cf9d78df diff --git a/scripts/deploy_local.sh b/scripts/deploy_local.sh index a2dbee9b2f25..bb8c84e877eb 100755 --- a/scripts/deploy_local.sh +++ b/scripts/deploy_local.sh @@ -434,7 +434,6 @@ write_envs_config() { # packages_to_install contains llvm echo "export CC=/usr/local/opt/llvm/bin/clang" echo "export CXX=/usr/local/opt/llvm/bin/clang++" - echo "export LDFLAGS=-L/usr/local/opt/llvm/lib" echo "export CPPFLAGS=-I/usr/local/opt/llvm/include" echo "export PATH=/usr/local/opt/llvm/bin:\$PATH" if [ -z "${JAVA_HOME}" ]; then @@ -699,7 +698,6 @@ install_dependencies() { export OPENSSL_SSL_LIBRARY=/usr/local/opt/openssl/lib/libssl.dylib export CC=/usr/local/opt/llvm/bin/clang export CXX=/usr/local/opt/llvm/bin/clang++ - export LDFLAGS=-L/usr/local/opt/llvm/lib export CPPFLAGS=-I/usr/local/opt/llvm/include fi @@ -798,11 +796,10 @@ install_vineyard() { if [[ "${PLATFORM}" == *"Darwin"* ]]; then cmake .. -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DBUILD_SHARED_LIBS=ON \ - -DBUILD_VINEYARD_SERVER=OFF \ - -DBUILD_VINEYARD_IO_OSS=ON -DBUILD_VINEYARD_TESTS=OFF + -DBUILD_VINEYARD_TESTS=OFF else cmake .. -DBUILD_SHARED_LIBS=ON \ - -DBUILD_VINEYARD_IO_OSS=ON -DBUILD_VINEYARD_TESTS=OFF + -DBUILD_VINEYARD_TESTS=OFF fi make -j${NUM_PROC} make vineyard_client_python -j${NUM_PROC} @@ -840,7 +837,10 @@ install_graphscope() { pushd ${SOURCE_DIR} if [[ "${PLATFORM}" == *"Darwin"* ]]; then + # need libomp.dylib to find MPI_CXX + export LDFLAGS=-L/usr/local/opt/llvm/lib make install WITH_LEARNING_ENGINE=OFF INSTALL_PREFIX=${INSTALL_PREFIX} NETWORKX=OFF BUILD_TYPE=${BUILD_TYPE} + unset LDFLAGS else make install WITH_LEARNING_ENGINE=ON INSTALL_PREFIX=${INSTALL_PREFIX} BUILD_TYPE=${BUILD_TYPE} fi