update

alibaba · Sep 27, 2024 · a7fc259 · a7fc259
1 parent 5317169
commit a7fc259
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 114 deletions.
diff --git a/.github/workflows/build-graphscope-wheels-macos.yml b/.github/workflows/build-graphscope-wheels-macos.yml
@@ -27,7 +27,7 @@ concurrency:
 jobs:
   build-wheels:
     # if: (github.ref == 'refs/heads/main' && github.repository == 'alibaba/GraphScope') || (github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') && github.repository == 'alibaba/GraphScope') || (github.event_name == 'workflow_dispatch')
-    runs-on: macos-12
+    runs-on: macos-13
     strategy:
       matrix:
         python-version: ['3.9']
@@ -42,84 +42,23 @@ jobs:
       with:
         python-version: ${{ matrix.python-version }}
 
-    - name: Install Dependencies
-      run: |
-        python3 -c 'import sys; print(sys.version_info[:])'
-
-        brew update || true
-        brew install bash coreutils
-
-        alias bash=$(brew --prefix)/bin/bash
-        export PATH=$HOME/.local/bin:$HOME/Library/Python/${{ matrix.python-version }}/bin:$PATH
-
-        python3 -m pip install click
-        python3 gsctl.py install-deps dev
-
-        echo "export PATH=/usr/local/opt/coreutils/libexec/gnubin:\$PATH" >> ~/.graphscope_env
-
-        # brew install bash coreutils
-        # alias bash=$(brew --prefix)/bin/bash
-
-        # export PATH=$HOME/.local/bin:$HOME/Library/Python/${{ matrix.python-version }}/bin:$PATH
-
-        # sudo mkdir /opt/graphscope
-        # sudo chown -R $(id -u):$(id -g) /opt/graphscope
-
-        # Not sure when the first installation would fail, saying that the lock of python3.10 is taken
-        # However the second trial would success.
-        # python3 -m pip install click
-        # python3 gsctl.py install-deps dev
-        # python3 gsctl.py install-deps dev || true
-        # echo "export PATH=/usr/local/opt/coreutils/libexec/gnubin:\$PATH" >> ~/.graphscope_env
-
     - name: Install JDK 11
       uses: actions/setup-java@v4
       with:
         distribution: 'zulu' # See 'Supported distributions' for available options
         java-version: '11'
 
-    - name: Reinstall glog
-      if: true
+    - name: Install Dependencies
       run: |
-        # Essential cause glog installed by brew is broken and produce corrupted messages
-        brew uninstall --ignore-dependencies glog
-        . ~/.graphscope_env
-        git clone https://github.com/google/glog.git -b v0.6.0
-        cd glog
-
-        cmake . -DWITH_TLS=OFF -DWITH_SYMBOLIZE=OFF -DWITH_UNWIND=OFF -DWITH_GTEST=OFF -DBUILD_TESTING=OFF
-        make -j
-        sudo make install
-
-        # make delocate-wheel happy
-        sudo mkdir -p /usr/local/opt/glog/lib
-        sudo ln -s /usr/local/lib/libglog*.dylib /usr/local/opt/glog/lib/
+        python3 -c 'import sys; print(sys.version_info[:])'
+        export PATH=$HOME/.local/bin:$HOME/Library/Python/${{ matrix.python-version }}/bin:$PATH
 
-    - name: Install latest libgrape-lite
-      if: false
-      run: |
-        . ~/.graphscope_env
-        git clone --single-branch --depth=1 https://github.com/alibaba/libgrape-lite.git /tmp/libgrape-lite
-        cd /tmp/libgrape-lite
-        cmake . -DCMAKE_INSTALL_PREFIX=/usr/local
-        make -j4
-        sudo make install
+        brew update || true
 
-    - name: Install latest vineyard
-      if: false
-      run: |
-        source ~/.graphscope_env
-        python3 -m pip install libclang
-        git clone --single-branch -b v0.13.4 --depth=1 https://github.com/v6d-io/v6d.git /tmp/v6d
-        cd /tmp/v6d
-        git submodule update --init
-        cmake .  -DCMAKE_INSTALL_PREFIX=/usr/local \
-                 -DCMAKE_PREFIX_PATH=/usr/local \
-                 -DUSE_EXTERNAL_ETCD_LIBS=OFF \
-                 -DBUILD_SHARED_LIBS=ON \
-                 -DBUILD_VINEYARD_TESTS=OFF
-        make -j4
-        sudo make install
+        python3 -m pip install click
+        # install the specific vineyard version:
+        # python3 gsctl.py install-deps dev --v6d-version <branch or tag>
+        python3 gsctl.py install-deps dev
 
     - name: Build Server Wheel
       run: |
@@ -129,15 +68,13 @@ jobs:
         echo ${CC}
 
         # make sure the python's local bin is in PATH (by `pip install --user`)
-        # TODO /Library/Frameworks/Python.framework/Versions/3.12/bin
         export PATH=$HOME/.local/bin:$HOME/Library/Python/${{ matrix.python-version }}/bin:$PATH
 
         # change the version for nightly release
         # e.g. 0.15.0 -> 0.15.0a20220808
         time=$(date "+%Y%m%d")
         version=$(cat ${GITHUB_WORKSPACE}/VERSION)
-        if [[ "${{ GITHUB.REF }}" == "refs/heads/main" ]];
-        then
+        if [[ "${{ GITHUB.REF }}" == "refs/heads/main" ]]; then
           echo "${version}a${time}" > ${GITHUB_WORKSPACE}/VERSION;
         fi
 
@@ -152,7 +89,7 @@ jobs:
         tar -zcf graphscope.tar.gz coordinator/dist/wheelhouse/*.whl
 
     - name: Setup tmate session
-      if: false
+      if: always()
       uses: mxschmitt/action-tmate@v3
 
     - name: Upload Artifact
@@ -164,7 +101,7 @@ jobs:
 
   build-client-wheels:
     # if: (github.ref == 'refs/heads/main' && github.repository == 'alibaba/GraphScope') || (github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') && github.repository == 'alibaba/GraphScope') || (github.event_name == 'workflow_dispatch')
-    runs-on: macos-12
+    runs-on: macos-13
     strategy:
       matrix:
         python-version: ['3.9', '3.10', '3.11']
@@ -182,41 +119,10 @@ jobs:
     - name: Install Dependencies
       run: |
         brew update || true
-        brew install bash coreutils
-        alias bash=$(brew --prefix)/bin/bash
-        # sudo mkdir /opt/graphscope
-        # sudo chown -R $(id -u):$(id -g) /opt/graphscope
 
         python3 -m pip install click
-        python3 gsctl.py install-deps dev || true
         python3 gsctl.py install-deps dev
 
-    - name: Install latest libgrape-lite
-      if: false
-      run: |
-        . ~/.graphscope_env
-        git clone --single-branch --depth=1 https://github.com/alibaba/libgrape-lite.git /tmp/libgrape-lite
-        cd /tmp/libgrape-lite
-        cmake . -DCMAKE_INSTALL_PREFIX=/usr/local
-        make -j4
-        sudo make install
-
-    - name: Install latest vineyard
-      if: false
-      run: |
-        . ~/.graphscope_env
-        python3 -m pip install libclang
-        git clone --single-branch -b v0.23.0 --depth=1 https://github.com/v6d-io/v6d.git /tmp/v6d
-        cd /tmp/v6d
-        git submodule update --init
-        cmake .  -DCMAKE_INSTALL_PREFIX=/usr/local \
-                 -DCMAKE_PREFIX_PATH=/usr/local \
-                 -DUSE_EXTERNAL_ETCD_LIBS=OFF \
-                 -DBUILD_SHARED_LIBS=ON \
-                 -DBUILD_VINEYARD_TESTS=OFF
-        make -j4
-        sudo make install
-
     - name: Build Client Wheels
       run: |
         python3 -c "import sys; print(sys.version)"
@@ -255,7 +161,7 @@ jobs:
     needs: [build-wheels, build-client-wheels]
     strategy:
       matrix:
-        python-version: ['3.8', '3.9', '3.10', '3.11']
+        python-version: ['3.9', '3.10', '3.11']
 
     steps:
     - uses: actions/download-artifact@v4
@@ -273,7 +179,7 @@ jobs:
         tar -zxf ./wheel-macos-${{ github.sha }}-${{ matrix.python-version }}/client.tar.gz
         mv ${GITHUB_WORKSPACE}/artifacts/python/dist/wheelhouse/*.whl ${GITHUB_WORKSPACE}/upload_pypi/
 
-        if [ "$PYTHON" == "3.8" ]; then
+        if [ "$PYTHON" == "3.9" ]; then
           tar -zxf ./wheel-macos-${{ github.sha }}/graphscope.tar.gz
           mv ${GITHUB_WORKSPACE}/artifacts/coordinator/dist/wheelhouse/*.whl ${GITHUB_WORKSPACE}/upload_pypi/
         fi
@@ -303,7 +209,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ['3.8', '3.9', '3.10', '3.11']
+        python-version: ['3.9', '3.10', '3.11']
 
     steps:
     - uses: actions/download-artifact@v4

diff --git a/python/graphscope/gsctl/scripts/install_deps.sh b/python/graphscope/gsctl/scripts/install_deps.sh
@@ -813,11 +813,12 @@ install_analytical_dependencies() {
   install_java_and_maven
   # install vineyard
   if [[ "${no_v6d}" != true ]]; then
-    if [[ "${OS_PLATFORM}" == *"Darwin"* ]]; then
-      brew install vineyard
-    else
-      install_vineyard
-    fi
+    install_vineyard
+    # if [[ "${OS_PLATFORM}" == *"Darwin"* ]]; then
+    #   brew install vineyard
+    # else
+    #   install_vineyard
+    # fi
   fi
 }