Skip to content

Commit

Permalink
Merge branch 'main' into ir_array_map_constructor
Browse files Browse the repository at this point in the history
  • Loading branch information
shirly121 committed Oct 19, 2023
2 parents 94c7ea5 + 944a645 commit 9cac1a9
Show file tree
Hide file tree
Showing 48 changed files with 3,122 additions and 1,151 deletions.
6 changes: 6 additions & 0 deletions .cirrus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,9 @@ macosx_arm64_wheel_task:
# for building GLE
git config --global --add safe.directory .
# make sure the python's local bin is in PATH (by `pip install --user`)
export PATH=$HOME/.local/bin:$PATH
# prepare
pushd ./python
python3 setup.py build_proto
Expand All @@ -100,6 +103,9 @@ macosx_arm64_wheel_task:
build_graphscope_client_script: |
. ~/.graphscope_env
# make sure the python's local bin is in PATH (by `pip install --user`)
export PATH=$HOME/.local/bin:$PATH
for py in 3.8.16 3.9.16 3.10.10 3.11.2; do
current_python=$(pyenv root)/versions/$py/bin/python
echo "Python is: $current_python, $($current_python --version)"
Expand Down
9 changes: 7 additions & 2 deletions .github/workflows/build-graphscope-wheels-macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,9 @@ jobs:
python3 -m pip install libclang
echo ${CC}
# make sure the python's local bin is in PATH (by `pip install --user`)
export PATH=$HOME/.local/bin:$PATH
# change the version for nightly release
# e.g. 0.15.0 -> 0.15.0a20220808
time=$(date "+%Y%m%d")
Expand Down Expand Up @@ -186,6 +189,9 @@ jobs:
python3 -c "import sys; print(sys.version)"
. ~/.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
# change the version for nightly release
# 0.15.0 -> 0.15.0a20220808
time=$(date "+%Y%m%d")
Expand Down Expand Up @@ -298,8 +304,7 @@ jobs:
GS_TEST_DIR: ${{ github.workspace }}/gstest
run: |
export JAVA_HOME=$(/usr/libexec/java_home -v11)
export PATH=$JAVA_HOME/bin:$HOME/.local/bin:$PATH
export PATH=$HOME/Library/Python/${{ matrix.python-version }}/bin:$PATH
export PATH=$JAVA_HOME/bin:$HOME/.local/bin:$HOME/Library/Python/${{ matrix.python-version }}/bin:$PATH
python3 -c "import sys; print(sys.version)"
git clone -b master --single-branch --depth=1 https://github.com/7br/gstest.git ${GS_TEST_DIR}
Expand Down
2 changes: 1 addition & 1 deletion coordinator/gscoordinator/cluster_builder.py
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ def __init__(
learning_start_port,
):
self._instance_id = config.session.instance_id
self._glog_level = parse_as_glog_level(config.session.log_level)
self._glog_level = parse_as_glog_level(config.log_level)
self._num_workers = config.session.num_workers

launcher_config: KubernetesLauncherConfig = config.kubernetes_launcher
Expand Down
Loading

0 comments on commit 9cac1a9

Please sign in to comment.