Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build-graphscope-wheels-macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ jobs:
echo "${version}a${time}" > ${GITHUB_WORKSPACE}/VERSION;
fi

python3 -m pip install numpy pandas "grpcio>=1.49" "grpcio-tools>=1.49" "mypy-protobuf>=3.4.0" wheel
python3 -m pip install numpy pandas "grpcio>=1.49" "grpcio-tools>=1.49" "mypy-protobuf>=3.4.0,<3.7" wheel

# build graphscope server wheel
cd ${GITHUB_WORKSPACE}/k8s/internal
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/gaia.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ jobs:
- name: Install Rust
uses: actions-rs/toolchain@v1
with:
toolchain: 1.87.0
toolchain: 1.88.0
override: true

- name: Rust Format Check
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/gss.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,8 @@ jobs:
. ${HOME}/.graphscope_env
export SCCACHE_DIR=~/.cache/sccache
export RUSTC_WRAPPER=/usr/local/bin/sccache
rustup toolchain install 1.87.0
rustup default 1.87.0
rustup toolchain install 1.88.0
rustup default 1.88.0
cd ${GITHUB_WORKSPACE}/interactive_engine
mvn clean install -P groot -Drust.compile.mode=debug -DskipTests --quiet
mvn clean install -Pgroot-data-load --quiet
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/interactive.yml
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ jobs:
. /home/graphscope/.cargo/env
which cargo

rustup toolchain install 1.87.0 && rustup default 1.87.0
rustup toolchain install 1.88.0 && rustup default 1.88.0
# build compiler
cd ${GIE_HOME}/
mvn clean install -Pexperimental -DskipTests -q
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/k8s-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@ jobs:
- name: Install Rust
uses: actions-rs/toolchain@v1
with:
toolchain: 1.87.0
toolchain: 1.88.0
override: true

- name: Build Artifact
Expand Down Expand Up @@ -649,7 +649,7 @@ jobs:
- name: Install Rust
uses: actions-rs/toolchain@v1
with:
toolchain: 1.87.0
toolchain: 1.88.0
override: true

- name: Build GIE Experimental Artifacts
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@ jobs:
with:
submodules: true

- uses: actions/setup-python@v6
with:
python-version: '3.11'

- name: Install Dependencies of GraphScope
run: |
# Due to an observation of changing hostname in github runners,
Expand All @@ -43,7 +47,7 @@ jobs:
fi
sudo mkdir /opt/graphscope
sudo chown -R $(id -u):$(id -g) /opt/graphscope
python3 -m pip install click
python3 -m pip install click
python3 gsctl.py install-deps dev --v6d-version v0.23.0

- name: Setup tmate session
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/pages-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,5 @@ jobs:
- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v4
with:
timeout: 1800000
2 changes: 1 addition & 1 deletion flex/interactive/sdk/python/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ gremlinpython >= 3.4.10
protobuf>=4
grpcio>=1.49
grpcio-tools>=1.49
mypy-protobuf>=3.4.0
mypy-protobuf>=3.4.0,<3.7
4 changes: 3 additions & 1 deletion k8s/dockerfiles/flex-interactive.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ ARG ENABLE_COORDINATOR="false"
ARG OPTIMIZE_FOR_HOST=OFF
ARG ENABLE_OPENTELMETRY=false
ARG PARALLEL=8
ARG RUST_VERSION=1.88.0

RUN sudo mkdir -p /opt/flex && sudo chown -R graphscope:graphscope /opt/flex/
USER graphscope
Expand All @@ -26,7 +27,8 @@ RUN if [ "${ENABLE_OPENTELMETRY}" = "true" ]; then \
COPY --chown=graphscope:graphscope . /home/graphscope/GraphScope

# install flex
RUN . ${HOME}/.cargo/env && cd ${HOME}/GraphScope/flex && \
RUN . ${HOME}/.cargo/env && rustup toolchain install ${RUST_VERSION} && rustup default ${RUST_VERSION} && \
cd ${HOME}/GraphScope/flex && \
git submodule update --init && mkdir build && cd build && cmake .. -DCMAKE_INSTALL_PREFIX=/opt/flex -DBUILD_DOC=OFF -DBUILD_TEST=OFF -DOPTIMIZE_FOR_HOST=${OPTIMIZE_FOR_HOST} -DUSE_STATIC_ARROW=ON && make -j ${PARALLEL} && make install && \
cd ~/GraphScope/interactive_engine/ && mvn clean package -Pexperimental -DskipTests && \
cd ~/GraphScope/interactive_engine/compiler && cp target/compiler-0.0.1-SNAPSHOT.jar /opt/flex/lib/ && \
Expand Down
2 changes: 1 addition & 1 deletion k8s/dockerfiles/graphscope-store.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ COPY --chown=graphscope:graphscope . /home/graphscope/graphscope
COPY --chown=graphscope:graphscope ./interactive_engine/assembly/src/conf/maven.settings.xml /home/graphscope/.m2/settings.xml

USER graphscope
RUN rustup toolchain install 1.87.0 && rustup default 1.87.0
RUN rustup toolchain install 1.88.0 && rustup default 1.88.0

RUN cd /home/graphscope/graphscope \
&& . ~/.graphscope_env \
Expand Down
2 changes: 1 addition & 1 deletion k8s/dockerfiles/interactive.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ RUN cd /home/graphscope/GraphScope/ && \
else \
mkdir /home/graphscope/install; \
. /home/graphscope/.graphscope_env; \
rustup toolchain install 1.87.0 && rustup default 1.87.0; \
rustup toolchain install 1.88.0 && rustup default 1.88.0; \
make interactive-install BUILD_TYPE="$profile" INSTALL_PREFIX=/home/graphscope/install; \
fi

Expand Down
22 changes: 11 additions & 11 deletions k8s/internal/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ graphscope-manylinux2014-py3-nodocker:
sudo sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-* && \
sudo yum install java-11-openjdk-devel -y && \
sudo yum remove java-1.8.0-openjdk-devel java-1.8.0-openjdk java-1.8.0-openjdk-headless -y && \
rustup toolchain install 1.87.0 && rustup default 1.87.0 && \
rustup toolchain install 1.88.0 && rustup default 1.88.0 && \
cd $(WORKING_DIR)/../.. && \
if [[ "${PLATFORM}" == "aarch64" ]]; then \
export AUDITWHEEL_PLAT=manylinux2014_${PLATFORM}; \
Expand Down Expand Up @@ -186,31 +186,31 @@ graphscope-client-manylinux2014-py3-nodocker:
else \
python3 -m pip install ${PIP_ARGS} "grpcio" "grpcio-tools"; \
fi; \
python3 -m pip install ${PIP_ARGS} mypy-protobuf "numpy==1.23.2" "pandas" wheel "auditwheel==5.2.0"; \
python3 -m pip install ${PIP_ARGS} "mypy-protobuf>=3.4.0,<3.7" "numpy==1.23.2" "pandas" wheel "auditwheel==5.2.0"; \
elif [[ "$$py" == "cp310-cp310" ]]; then \
if [[ "${PLATFORM}" == "aarch64" ]]; then \
python3 -m pip install ${PIP_ARGS} grpcio==1.49.1 --no-binary grpcio; \
python3 -m pip install ${PIP_ARGS} grpcio-tools==1.49.1 --no-binary grpcio-tools; \
else \
python3 -m pip install ${PIP_ARGS} "grpcio>=1.49" "grpcio-tools>=1.49"; \
fi; \
python3 -m pip install ${PIP_ARGS} mypy-protobuf "numpy==1.21.2" "pandas" wheel "auditwheel==5.2.0"; \
python3 -m pip install ${PIP_ARGS} "mypy-protobuf>=3.4.0,<3.7" "numpy==1.21.2" "pandas" wheel "auditwheel==5.2.0"; \
elif [[ "$$py" == "cp39-cp39" ]]; then \
if [[ "${PLATFORM}" == "aarch64" ]]; then \
python3 -m pip install ${PIP_ARGS} grpcio==1.49.1 --no-binary grpcio; \
python3 -m pip install ${PIP_ARGS} grpcio-tools==1.49.1 --no-binary grpcio-tools; \
else \
python3 -m pip install ${PIP_ARGS} "grpcio>=1.49" "grpcio-tools>=1.49"; \
fi; \
python3 -m pip install ${PIP_ARGS} mypy-protobuf "numpy==1.19.3" "pandas" wheel "auditwheel==5.2.0"; \
python3 -m pip install ${PIP_ARGS} "mypy-protobuf>=3.4.0,<3.7" "numpy==1.19.3" "pandas" wheel "auditwheel==5.2.0"; \
else \
if [[ "${PLATFORM}" == "aarch64" ]]; then \
python3 -m pip install ${PIP_ARGS} grpcio==1.49.1 --no-binary grpcio; \
python3 -m pip install ${PIP_ARGS} grpcio-tools==1.49.1 --no-binary grpcio-tools; \
else \
python3 -m pip install ${PIP_ARGS} "grpcio>=1.49" "grpcio-tools>=1.49"; \
fi; \
python3 -m pip install ${PIP_ARGS} mypy-protobuf "numpy" "pandas" wheel "auditwheel==5.2.0"; \
python3 -m pip install ${PIP_ARGS} "mypy-protobuf>=3.4.0,<3.7" "numpy" "pandas" wheel "auditwheel==5.2.0"; \
fi; \
sudo rm -rf build; \
sudo rm -rf dist/*.whl; \
Expand Down Expand Up @@ -240,20 +240,20 @@ graphscope-client-darwin-py3:
py=$$(python3 -V 2>&1 | awk '{print $$2}' | awk -F '.' '{print $$1$$2}') && \
pip3 install ${PIP_ARGS} -U pip && \
if [[ "$$py" == "311" ]]; then \
pip3 install ${PIP_ARGS} mypy-protobuf "numpy==1.23.2" "pandas" "grpcio>=1.49" "grpcio-tools>=1.49" delocate wheel; \
pip3 install ${PIP_ARGS} "mypy-protobuf>=3.4.0,<3.7" "numpy==1.23.2" "pandas" "grpcio>=1.49" "grpcio-tools>=1.49" delocate wheel; \
elif [[ "$$py" == "310" ]]; then \
pip3 install ${PIP_ARGS} mypy-protobuf "numpy==1.21.2" "pandas" "grpcio>=1.49" "grpcio-tools>=1.49" delocate wheel; \
pip3 install ${PIP_ARGS} "mypy-protobuf>=3.4.0,<3.7" "numpy==1.21.2" "pandas" "grpcio>=1.49" "grpcio-tools>=1.49" delocate wheel; \
elif [[ "$$py" == "39" ]]; then \
if [[ "${PLATFORM}" == "arm64" ]]; then \
pip3 install ${PIP_ARGS} mypy-protobuf "numpy==1.21.0" "pandas" "grpcio>=1.49" "grpcio-tools>=1.49" delocate wheel; \
pip3 install ${PIP_ARGS} "mypy-protobuf>=3.4.0,<3.7" "numpy==1.21.0" "pandas" "grpcio>=1.49" "grpcio-tools>=1.49" delocate wheel; \
else \
pip3 install ${PIP_ARGS} mypy-protobuf "numpy==1.19.3" "pandas" "grpcio>=1.49" "grpcio-tools>=1.49" delocate wheel; \
pip3 install ${PIP_ARGS} "mypy-protobuf>=3.4.0,<3.7" "numpy==1.19.3" "pandas" "grpcio>=1.49" "grpcio-tools>=1.49" delocate wheel; \
fi; \
else \
if [[ "${PLATFORM}" == "arm64" ]]; then \
pip3 install ${PIP_ARGS} mypy-protobuf "numpy==1.21.0" "pandas" "grpcio>=1.49" "grpcio-tools>=1.49" delocate wheel; \
pip3 install ${PIP_ARGS} "mypy-protobuf>=3.4.0,<3.7" "numpy==1.21.0" "pandas" "grpcio>=1.49" "grpcio-tools>=1.49" delocate wheel; \
else \
pip3 install ${PIP_ARGS} mypy-protobuf "numpy==1.18.5" "pandas" "grpcio>=1.49" "grpcio-tools>=1.49" delocate wheel; \
pip3 install ${PIP_ARGS} "mypy-protobuf>=3.4.0,<3.7" "numpy==1.18.5" "pandas" "grpcio>=1.49" "grpcio-tools>=1.49" delocate wheel; \
fi; \
fi; \
rm -rf build dist/*.whl || true && \
Expand Down
6 changes: 3 additions & 3 deletions python/graphscope/gsctl/scripts/install_deps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -899,10 +899,10 @@ install_interactive_dependencies() {
if ! command -v rustup &>/dev/null; then
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
source $HOME/.cargo/env
rustup install 1.87.0
rustup default 1.87.0
rustc --version
fi
rustup install 1.88.0
rustup default 1.88.0
rustc --version
# opentelemetry
if [[ "${OS_PLATFORM}" != *"Darwin"* ]]; then
# opentelemetry expect libprotoc >= 3.13.0, see https://github.com/open-telemetry/opentelemetry-cpp/discussions/2223
Expand Down
2 changes: 1 addition & 1 deletion python/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[build-system]
requires = ["setuptools", "setuptools_scm>=5.0.0,<8", "wheel", "grpcio>=1.49", "grpcio-tools>=1.49", "mypy-protobuf", "numpy"]
requires = ["setuptools", "setuptools_scm>=5.0.0,<8", "wheel", "grpcio>=1.49", "grpcio-tools>=1.49", "mypy-protobuf>=3.4.0,<3.7", "numpy"]
build-backend = "setuptools.build_meta"

[tool.black]
Expand Down
2 changes: 1 addition & 1 deletion python/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ grpcio>=1.49
grpcio-tools>=1.49
kubernetes>=24.2.0
msgpack>=1.0.5
mypy-protobuf>=3.4.0
mypy-protobuf>=3.4.0,<3.7
neo4j==5.21.0
nest_asyncio
networkx==2.8.0;python_version>="3.8"
Expand Down
Loading