Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
lidongze0629 committed Sep 7, 2021
1 parent 1cac9ce commit cd19acd
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 17 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@ jobs:
# install vineyard into /usr/local
sudo cp -r -n opt/vineyard/* /usr/local/
# link and install graphscope into /opt/graphscope
# Install to /opt/graphscope and link them to /usr/local
sudo mkdir -p /opt/graphscope
sudo chown -R $(id -u):$(id -g) /opt/graphscope
cp -r opt/graphscope/* /opt/graphscope/
Expand Down
14 changes: 14 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,17 @@ gae:
cmake -DCMAKE_INSTALL_PREFIX=$(INSTALL_PREFIX) -DNETWORKX=$(NETWORKX) -DBUILD_TESTS=${BUILD_TEST} .. && \
make -j$(NUM_PROC) && \
sudo make install
ifneq ($(INSTALL_PREFIX), /usr/local)
sudo ln -sf $(INSTALL_PREFIX)/bin/* /usr/local/bin/ && \
sudo ln -sfn $(INSTALL_PREFIX)/include/graphscope /usr/local/include/graphscope && \
sudo ln -sf ${INSTALL_PREFIX}/lib/*so* /usr/local/lib && \
if [ -d "${INSTALL_PREFIX}/lib64/cmake/graphscope-analytical" ]; then \
sudo ln -sfn ${INSTALL_PREFIX}/lib64/cmake/graphscope-analytical /usr/local/lib64/cmake/graphscope-analytical; \
else \
sudo ln -sfn ${INSTALL_PREFIX}/lib/cmake/graphscope-analytical /usr/local/lib/cmake/graphscope-analytical; \
fi
endif


.PHONY: gie
gie:
Expand Down Expand Up @@ -96,6 +107,9 @@ ifeq ($(WITH_LEARNING_ENGINE), ON)
cmake -DCMAKE_INSTALL_PREFIX=$(INSTALL_PREFIX) -DWITH_VINEYARD=ON -DTESTING=${BUILD_TEST} .. && \
make -j$(NUM_PROC) && \
sudo make install
ifneq ($(INSTALL_PREFIX), /usr/local)
sudo ln -sf ${INSTALL_PREFIX}/lib/*so* /usr/local/lib
endif
endif

.PHONY: prepare-client
Expand Down
2 changes: 1 addition & 1 deletion k8s/graphscope.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ RUN sudo tar -xf /opt/graphscope/0.0.1-SNAPSHOT.tar.gz -C /opt/graphscope \
&& sudo ln -sf /opt/graphscope/lib/*so* /usr/local/lib \
&& sudo ln -sf /opt/graphscope/lib64/*so* /usr/local/lib64 \
&& sudo ln -sfn /opt/graphscope/lib64/cmake/graphscope-analytical /usr/local/lib64/cmake/graphscope-analytical \
&& python3 /tmp/precompile.py && rm /tmp/precompile.py
&& python3 /tmp/precompile.py && sudo rm -fr /tmp/precompile.py /usr/local/dist /opt/graphscope/dist/*.whl

# enable debugging
ENV RUST_BACKTRACE=1
Expand Down
5 changes: 1 addition & 4 deletions k8s/precompile.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,7 @@ def compute_sig(s):
COORDINATOR_HOME / "gscoordinator" / "builtin" / "app" / "builtin_app.gar"
)
CMAKELISTS_TEMPLATE = TEMPLATE_DIR / "CMakeLists.template"
if "GRAPHSCOPE_HOME" in os.environ:
GRAPHSCOPE_HOME = os.environ["GRAPHSCOPE_HOME"]
else:
GRAPHSCOPE_HOME = "/opt/graphscope"
GRAPHSCOPE_HOME = os.environ["GRAPHSCOPE_HOME"] if "GRAPHSCOPE_HOME" in os.environ else "/opt/graphscope"
WORKSPACE = Path("/tmp/gs/builtin")


Expand Down
2 changes: 2 additions & 0 deletions python/graphscope/analytical/app/sssp.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@
def sssp(graph, src=0):
"""Compute single source shortest path on the `graph`.
Note that SSSP requires an numerical property on the edge.
Args:
graph (:class:`Graph`): A projected simple graph.
src (int, optional): The source vertex. Defaults to 0.
Expand Down
11 changes: 0 additions & 11 deletions scripts/deploy_local.sh
Original file line number Diff line number Diff line change
Expand Up @@ -786,17 +786,6 @@ install_graphscope() {
make install WITH_LEARNING_ENGINE=ON INSTALL_PREFIX=${INSTALL_PREFIX}
fi

# link to /usr/local
sudo ln -sf ${INSTALL_PREFIX}/bin/* /usr/local/bin/
sudo ln -sfn ${INSTALL_PREFIX}/include/graphscope /usr/local/include/graphscope
sudo ln -sf ${INSTALL_PREFIX}/lib/*so* /usr/local/lib
sudo ln -sf ${INSTALL_PREFIX}/lib64/*so* /usr/local/lib64

if [[ -d "${INSTALL_PREFIX}/lib64/cmake" ]]; then
sudo ln -sfn ${INSTALL_PREFIX}/lib64/cmake/graphscope-analytical /usr/local/lib64/cmake/graphscope-analytical
else
sudo ln -sfn ${INSTALL_PREFIX}/lib/cmake/graphscope-analytical /usr/local/lib/cmake/graphscope-analytical
fi
popd
}

Expand Down

0 comments on commit cd19acd

Please sign in to comment.