Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add local python script path to PATH #2804

Merged
merged 2 commits into from
Jun 5, 2023
Merged
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/gae.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
- uses: actions/checkout@v3

- name: Install latest vineyard
if: true
if: false
run: |
. /home/graphscope/.graphscope_env
sudo pip3 install libclang
Expand Down
2 changes: 1 addition & 1 deletion gs
Original file line number Diff line number Diff line change
Expand Up @@ -1030,7 +1030,7 @@ install_vineyard() {
-DCMAKE_INSTALL_PREFIX="${V6D_PREFIX}" \
-DBUILD_VINEYARD_TESTS=OFF \
-DBUILD_SHARED_LIBS=ON \
-DBUILD_VINEYARD_PYTHON_BINDINGS=ON \
-DBUILD_VINEYARD_PYTHON_BINDINGS=ON \
-DBUILD_VINEYARD_GRAPH_WITH_GAR=ON
make -j"${jobs}"
make install
Expand Down
2 changes: 2 additions & 0 deletions k8s/dockerfiles/analytical.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -81,3 +81,5 @@ RUN chmod +x /opt/graphscope/bin/*

USER graphscope
WORKDIR /home/graphscope

ENV PATH=${PATH}:/home/graphscope/.local/bin
2 changes: 1 addition & 1 deletion k8s/dockerfiles/coordinator.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ RUN sudo chmod a+wrx /tmp
USER graphscope
WORKDIR /home/graphscope

ENV PATH ${PATH}:/home/graphscope/.local/bin:/opt/graphscope/bin
ENV PATH=${PATH}:/home/graphscope/.local/bin

COPY --from=builder /home/graphscope/install /opt/graphscope/
RUN python3 -m pip install --user --no-cache-dir /opt/graphscope/*.whl && sudo rm -rf /opt/graphscope/*.whl
2 changes: 2 additions & 0 deletions k8s/dockerfiles/graphscope-store.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ RUN sudo chmod a+wrx /tmp
USER graphscope
WORKDIR /home/graphscope

ENV PATH=${PATH}:/home/graphscope/.local/bin

# init log directory
RUN sudo mkdir /var/log/graphscope \
&& sudo chown -R $(id -u):$(id -g) /var/log/graphscope
1 change: 1 addition & 0 deletions k8s/dockerfiles/interactive-experimental.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,4 @@ RUN sudo chown -R graphscope:graphscope /opt/graphscope
USER graphscope
WORKDIR /home/graphscope

ENV PATH=${PATH}:/home/graphscope/.local/bin
2 changes: 1 addition & 1 deletion k8s/dockerfiles/interactive.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -87,4 +87,4 @@ RUN python3 -m pip install --no-cache-dir vineyard vineyard-io --user
USER graphscope
WORKDIR /home/graphscope


ENV PATH=${PATH}:/home/graphscope/.local/bin
2 changes: 2 additions & 0 deletions k8s/dockerfiles/learning.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -40,3 +40,5 @@ RUN sudo chmod a+wrx /tmp

COPY --from=builder /home/graphscope/install /opt/graphscope/
RUN python3 -m pip install --no-cache-dir /opt/graphscope/*.whl && sudo rm -rf /opt/graphscope/*.whl

ENV PATH=${PATH}:/home/graphscope/.local/bin
15 changes: 0 additions & 15 deletions k8s/internal/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -101,21 +101,6 @@ graphscope-darwin-py3:
done

graphscope-manylinux2014-py3-nodocker:
cd /tmp && \
git clone --single-branch --depth=1 https://github.com/v6d-io/v6d.git /tmp/v6d && \
cd /tmp/v6d && \
git submodule update --init && \
mkdir -p build && cd build && \
cmake .. \
-DCMAKE_INSTALL_PREFIX=/opt/vineyard \
-DCMAKE_PREFIX_PATH=/opt/graphscope \
-DOPENSSL_ROOT_DIR=/opt/graphscope \
-DUSE_EXTERNAL_ETCD_LIBS=OFF \
-DBUILD_SHARED_LIBS=ON \
-DBUILD_VINEYARD_TESTS=OFF && \
make -j$(nproc) && \
sudo make install && \
sudo rsync -av /opt/vineyard/ ${GRAPHSCOPE_HOME}/ && \
cd $(WORKING_DIR)/../.. && \
if [[ "${ARCH}" == "aarch64" ]]; then python3 -m pip install grpcio==1.49.1 --no-binary grpcio; \
export AUDITWHEEL_PLAT=manylinux2014_${ARCH}; \
Expand Down
Loading