update

alibaba · Sep 27, 2024 · 4b9e253 · 4b9e253
1 parent d3ed976
commit 4b9e253
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 22 deletions.
diff --git a/.github/workflows/build-graphscope-wheels-macos.yml b/.github/workflows/build-graphscope-wheels-macos.yml
@@ -30,36 +30,42 @@ jobs:
     runs-on: macos-13
     strategy:
       matrix:
-        python-version: ['3.11']
+        python-version: ['3.9']
 
     steps:
     - uses: actions/checkout@v4
       with:
         submodules: true
 
     - name: Set up Python
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       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
+        python3 -m pip install click
+        python3 gsctl.py install-deps dev
+
+        # brew install bash coreutils
 
-        alias bash=$(brew --prefix)/bin/bash
+        # alias bash=$(brew --prefix)/bin/bash
 
-        export PATH=$HOME/.local/bin:$HOME/Library/Python/${{ matrix.python-version }}/bin:$PATH
+        # 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
+        # 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 -m pip install click
+        # python3 gsctl.py install-deps dev
         # python3 gsctl.py install-deps dev || true
-        python3 gsctl.py install-deps dev
-        echo "export PATH=/usr/local/opt/coreutils/libexec/gnubin:\$PATH" >> ~/.graphscope_env
+        # python3 gsctl.py install-deps dev
+        # echo "export PATH=/usr/local/opt/coreutils/libexec/gnubin:\$PATH" >> ~/.graphscope_env
 
     - name: Install JDK 11
       uses: actions/setup-java@v4
@@ -68,6 +74,7 @@ jobs:
         java-version: '11'
 
     - name: Reinstall glog
+      if: false
       run: |
         # Essential cause glog installed by brew is broken and produce corrupted messages
         brew uninstall --ignore-dependencies glog
@@ -117,7 +124,8 @@ jobs:
         echo ${CC}
 
         # make sure the python's local bin is in PATH (by `pip install --user`)
-        export PATH=$HOME/.local/bin:$HOME/Library/Python/${{ matrix.python-version }}/bin:$PATH
+        # 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
@@ -154,28 +162,28 @@ jobs:
     runs-on: macos-13
     strategy:
       matrix:
-        python-version: ['3.8', '3.9', '3.10', '3.11']
+        python-version: ['3.9', '3.10', '3.11']
 
     steps:
     - uses: actions/checkout@v4
       with:
         submodules: true
 
     - name: Set up Python
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
 
     - 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
+        # 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 || true
         python3 gsctl.py install-deps dev
 
     - name: Install latest libgrape-lite
@@ -210,7 +218,7 @@ jobs:
         . ~/.graphscope_env
 
         # make sure the python's local bin is in PATH (by `pip install --user`)
-        export PATH=$HOME/.local/bin:$HOME/Library/Python/${{ matrix.python-version }}/bin:$PATH
+        # export PATH=$HOME/.local/bin:$HOME/Library/Python/${{ matrix.python-version }}/bin:$PATH
 
         # change the version for nightly release
         # 0.15.0 -> 0.15.0a20220808

diff --git a/python/graphscope/gsctl/scripts/install_deps.sh b/python/graphscope/gsctl/scripts/install_deps.sh
@@ -574,8 +574,14 @@ install_patchelf() {
 
 # libgrape-lite
 install_libgrape_lite() {
-  if [[ -f "${install_prefix}/include/grape/grape.h" ]]; then
-    return 0
+  if [[ "${OS_PLATFORM}" == *"Darwin"* ]]; then
+    if [[ -f "${HOMEBREW_PREFIX}/include/grape/grape.h" ]]; then
+      return 0
+    fi
+  else
+    if [[ -f "${install_prefix}/include/grape/grape.h" ]]; then
+      return 0
+    fi
   fi
   local branch=$1
   pushd "${tempdir}" || exit
@@ -870,7 +876,9 @@ install_interactive_dependencies() {
     rustc --version
   fi
   # opentelemetry
-  install_opentelemetry
+  if [[ "${OS_PLATFORM}" != *"Darwin"* ]]; then
+    install_opentelemetry
+  fi
 }
 
 install_learning_dependencies() {