Skip to content

Commit

Permalink
fix lgraph/lib64 -> lib64/lgraph (TuGraph-family#728)
Browse files Browse the repository at this point in the history
* fix lgraph/lib64 -> lib64/lgraph

* fix lgraph/lib64 -> lib64/lgraph
lipanpan03 authored Nov 5, 2024
1 parent c5205f6 commit f7840ac
Showing 14 changed files with 24 additions and 24 deletions.
4 changes: 2 additions & 2 deletions ci/images/tugraph-compile-arm64v8-centos7-Dockerfile
Original file line number Diff line number Diff line change
@@ -336,8 +336,8 @@ RUN wget https://tugraph-web.oss-cn-beijing.aliyuncs.com/tugraph/deps/tabulate-3
RUN sed -i '3 s/-lgomp/-l:libgomp.a/' /usr/local/lib64/libgomp.spec

ENV JAVA_HOME=/usr/lib/jvm/java-11-openjdk \
LD_LIBRARY_PATH=/usr/local/lgraph/lib64:/usr/local/lib64:/usr/local/lib:/usr/lib/jvm/java-11-openjdk/lib/server:$LD_LIBRARY_PATH \
PYTHONPATH=/usr/local/lgraph/lib64:/usr/local/lib64:$PYTHONPATH \
LD_LIBRARY_PATH=/usr/local/lib64/lgraph:/usr/local/lib64:/usr/local/lib:/usr/lib/jvm/java-11-openjdk/lib/server:$LD_LIBRARY_PATH \
PYTHONPATH=/usr/local/lib64/lgraph:/usr/local/lib64:$PYTHONPATH \
PATH=/opt/apache-maven-3.8.7/bin:$PATH

# set locale
4 changes: 2 additions & 2 deletions ci/images/tugraph-compile-centos7-Dockerfile
Original file line number Diff line number Diff line change
@@ -372,8 +372,8 @@ RUN wget -O /tmp/vsag.tar.gz https://tugraph-web.oss-cn-beijing.aliyuncs.com/tug
&& make install && rm -rf /tmp/vsag /tmp/vsag.tar.gz /opt/intel

ENV JAVA_HOME=/usr/lib/jvm/java-11-openjdk \
LD_LIBRARY_PATH=/usr/local/lgraph/lib64:/usr/local/lib64:/usr/local/lib:/usr/lib/jvm/java-11-openjdk/lib/server:$LD_LIBRARY_PATH \
PYTHONPATH=/usr/local/lgraph/lib64:/usr/local/lib64:$PYTHONPATH \
LD_LIBRARY_PATH=/usr/local/lib64/lgraph:/usr/local/lib64:/usr/local/lib:/usr/lib/jvm/java-11-openjdk/lib/server:$LD_LIBRARY_PATH \
PYTHONPATH=/usr/local/lib64/lgraph:/usr/local/lib64:$PYTHONPATH \
PATH=/opt/apache-maven-3.8.7/bin:$PATH

# set locale
4 changes: 2 additions & 2 deletions ci/images/tugraph-compile-centos8-Dockerfile
Original file line number Diff line number Diff line change
@@ -356,8 +356,8 @@ RUN wget -O /tmp/vsag.tar.gz https://tugraph-web.oss-cn-beijing.aliyuncs.com/tug
&& make install && rm -rf /tmp/vsag /tmp/vsag.tar.gz /opt/intel

ENV JAVA_HOME=/usr/lib/jvm/java-11-openjdk \
LD_LIBRARY_PATH=/usr/local/lgraph/lib64:/usr/lib64:/usr/local/lib64:/usr/local/lib:/usr/lib/jvm/java-11-openjdk/lib/server:$LD_LIBRARY_PATH \
PYTHONPATH=/usr/local/lgraph/lib64:/usr/local/lib64:$PYTHONPATH \
LD_LIBRARY_PATH=/usr/local/lib64/lgraph:/usr/lib64:/usr/local/lib64:/usr/local/lib:/usr/lib/jvm/java-11-openjdk/lib/server:$LD_LIBRARY_PATH \
PYTHONPATH=/usr/local/lib64/lgraph:/usr/local/lib64:$PYTHONPATH \
PATH=/opt/apache-maven-3.8.7/bin:$PATH

# set locale
4 changes: 2 additions & 2 deletions ci/images/tugraph-compile-ubuntu18.04-Dockerfile
Original file line number Diff line number Diff line change
@@ -332,8 +332,8 @@ RUN wget https://tugraph-web.oss-cn-beijing.aliyuncs.com/tugraph/deps/tabulate-3
RUN sed -i '3 s/-lgomp/-l:libgomp.a/' /usr/local/lib64/libgomp.spec

ENV JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64 \
LD_LIBRARY_PATH=/usr/local/lgraph/lib64:/usr/local/lib64:/usr/local/lib:/usr/lib/jvm/java-11-openjdk-amd64/lib/server:$LD_LIBRARY_PATH \
PYTHONPATH=/usr/local/lgraph/lib64:/usr/local/lib64:$PYTHONPATH \
LD_LIBRARY_PATH=/usr/local/lib64/lgraph:/usr/local/lib64:/usr/local/lib:/usr/lib/jvm/java-11-openjdk-amd64/lib/server:$LD_LIBRARY_PATH \
PYTHONPATH=/usr/local/lib64/lgraph:/usr/local/lib64:$PYTHONPATH \
PATH=/opt/apache-maven-3.8.7/bin:$PATH

ENV LANG zh_CN.UTF-8
2 changes: 1 addition & 1 deletion ci/images/tugraph-mini-runtime-centos7-Dockerfile
Original file line number Diff line number Diff line change
@@ -22,6 +22,6 @@ ARG FILENAME
RUN wget ${FILEPATH}/${FILENAME}
RUN rpm -ivh ${FILENAME} && rm /${FILENAME}

ENV LD_LIBRARY_PATH=/usr/local/lgraph/lib64:/usr/local/lib64:/usr/local/lib:$LD_LIBRARY_PATH
ENV LD_LIBRARY_PATH=/usr/local/lib64/lgraph:/usr/local/lib64:/usr/local/lib:$LD_LIBRARY_PATH

CMD lgraph_server -d run
2 changes: 1 addition & 1 deletion ci/images/tugraph-mini-runtime-centos8-Dockerfile
Original file line number Diff line number Diff line change
@@ -20,6 +20,6 @@ ARG FILENAME
RUN wget ${FILEPATH}/${FILENAME}
RUN rpm -ivh ${FILENAME} && rm /${FILENAME}

ENV LD_LIBRARY_PATH=/usr/local/lgraph/lib64:/usr/local/lib64:/usr/local/lib:$LD_LIBRARY_PATH
ENV LD_LIBRARY_PATH=/usr/local/lib64/lgraph:/usr/local/lib64:/usr/local/lib:$LD_LIBRARY_PATH

CMD lgraph_server -d run
2 changes: 1 addition & 1 deletion ci/images/tugraph-mini-runtime-ubuntu18.04-Dockerfile
Original file line number Diff line number Diff line change
@@ -22,4 +22,4 @@ ARG FILENAME
RUN wget ${FILEPATH}/${FILENAME}
RUN dpkg -i ${FILENAME} && rm /${FILENAME}

ENV LD_LIBRARY_PATH=/usr/local/lgraph/lib64:/usr/local/lib64:/usr/local/lib:$LD_LIBRARY_PATH
ENV LD_LIBRARY_PATH=/usr/local/lib64/lgraph:/usr/local/lib64:/usr/local/lib:$LD_LIBRARY_PATH
4 changes: 2 additions & 2 deletions ci/images/tugraph-runtime-arm64v8-centos7-Dockerfile
Original file line number Diff line number Diff line change
@@ -104,7 +104,7 @@ RUN cd /usr/local/share/lgraph/tugraph-db-browser \
&& pnpm run build

ENV JAVA_HOME=/usr/lib/jvm/java-1.8.0-openjdk/jre/ \
LD_LIBRARY_PATH=/usr/local/lgraph/lib64:/usr/local/lib64:/usr/lib/jvm/java-1.8.0/jre/lib/amd64/server:$LD_LIBRARY_PATH \
PYTHONPATH=/usr/local/lgraph/lib64:/usr/local/lib64:$PYTHONPATH \
LD_LIBRARY_PATH=/usr/local/lib64/lgraph:/usr/local/lib64:/usr/lib/jvm/java-1.8.0/jre/lib/amd64/server:$LD_LIBRARY_PATH \
PYTHONPATH=/usr/local/lib64/lgraph:/usr/local/lib64:$PYTHONPATH \
PATH=/opt/apache-maven-3.8.7/bin:$PATH

4 changes: 2 additions & 2 deletions ci/images/tugraph-runtime-centos7-Dockerfile
Original file line number Diff line number Diff line change
@@ -68,7 +68,7 @@ ARG FILEPATH
ARG FILENAME
RUN wget ${FILEPATH}/${FILENAME} && rpm -ivh ${FILENAME} && rm -f /${FILENAME}

ENV LD_LIBRARY_PATH=/usr/local/lgraph/lib64:/usr/local/lib64:$LD_LIBRARY_PATH \
PYTHONPATH=/usr/local/lgraph/lib64:/usr/local/lib64:$PYTHONPATH
ENV LD_LIBRARY_PATH=/usr/local/lib64/lgraph:/usr/local/lib64:$LD_LIBRARY_PATH \
PYTHONPATH=/usr/local/lib64/lgraph:/usr/local/lib64:$PYTHONPATH

CMD lgraph_server -d run
4 changes: 2 additions & 2 deletions ci/images/tugraph-runtime-centos8-Dockerfile
Original file line number Diff line number Diff line change
@@ -66,7 +66,7 @@ ARG FILEPATH
ARG FILENAME
RUN wget ${FILEPATH}/${FILENAME} && rpm -ivh ${FILENAME} && rm -f /${FILENAME}

ENV LD_LIBRARY_PATH=/usr/local/lgraph/lib64:/usr/local/lib64:/usr/local/lib:$LD_LIBRARY_PATH \
PYTHONPATH=/usr/local/lgraph/lib64:/usr/local/lib64:$PYTHONPATH
ENV LD_LIBRARY_PATH=/usr/local/lib64/lgraph:/usr/local/lib64:/usr/local/lib:$LD_LIBRARY_PATH \
PYTHONPATH=/usr/local/lib64/lgraph:/usr/local/lib64:$PYTHONPATH

CMD lgraph_server -d run
4 changes: 2 additions & 2 deletions ci/images/tugraph-runtime-ubuntu18.04-Dockerfile
Original file line number Diff line number Diff line change
@@ -111,7 +111,7 @@ RUN cd /usr/local/share/lgraph/tugraph-db-browser \
&& pnpm run build

ENV JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64/jre \
LD_LIBRARY_PATH=/usr/local/lgraph/lib64:/usr/local/lib64:/usr/local/lib:/usr/lib/jvm/java-8-openjdk-amd64/jre/lib/amd64/server/:$LD_LIBRARY_PATH \
PYTHONPATH=/usr/local/lgraph/lib64:/usr/local/lib64:$PYTHONPATH \
LD_LIBRARY_PATH=/usr/local/lib64/lgraph:/usr/local/lib64:/usr/local/lib:/usr/lib/jvm/java-8-openjdk-amd64/jre/lib/amd64/server/:$LD_LIBRARY_PATH \
PYTHONPATH=/usr/local/lib64/lgraph:/usr/local/lib64:$PYTHONPATH \
PATH=/opt/apache-maven-3.8.7/bin:/usr/lib/jvm/java-8-openjdk-amd64/jre/bin:$PATH

2 changes: 1 addition & 1 deletion ci/start_dev.sh
Original file line number Diff line number Diff line change
@@ -77,7 +77,7 @@ if [ -z "$CONTAINER_ID" ]; then
${DOCKER_IMAGE} \
bash -c "chown ${USER_NAME}:${GROUP_NAME} /home/${USER_NAME} &&
echo 'export JAVA_HOME=/usr/lib/jvm/java-11-openjdk' > /home/${USER_NAME}/.bashrc &&
echo 'export LD_LIBRARY_PATH=/usr/local/lgraph/lib64:/usr/lib64:/usr/local/lib64:/usr/local/lib:/usr/lib/jvm/java-11-openjdk/lib/server' > /home/${USER_NAME}/.bashrc &&
echo 'export LD_LIBRARY_PATH=/usr/local/lib64/lgraph:/usr/lib64:/usr/local/lib64:/usr/local/lib:/usr/lib/jvm/java-11-openjdk/lib/server' > /home/${USER_NAME}/.bashrc &&
echo 'export JAVA_HOME=/usr/lib/jvm/java-11-openjdk' > /home/${USER_NAME}/.bash_profile &&
/usr/sbin/sshd -D"
fi
4 changes: 2 additions & 2 deletions learn/docker/dockerfile
Original file line number Diff line number Diff line change
@@ -237,8 +237,8 @@ RUN sed -i '3 s/-lgomp/-l:libgomp.a/' /usr/local/lib64/libgomp.spec
# RUN sed -i '3 s/-lgomp/-l:libgomp.a/' /usr/lib/gcc/x86_64-linux-gnu/7/libgomp.spec

ENV JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64/jre \
LD_LIBRARY_PATH=/usr/local/lgraph/lib64:/usr/local/lib64:/usr/local/lib:/usr/lib/jvm/java-1.8.0-openjdk-amd64/jre/lib/amd64/:$LD_LIBRARY_PATH \
PYTHONPATH=/usr/local/lgraph/lib64:/usr/local/lib64:$PYTHONPATH \
LD_LIBRARY_PATH=/usr/local/lib64/lgraph:/usr/local/lib64:/usr/local/lib:/usr/lib/jvm/java-1.8.0-openjdk-amd64/jre/lib/amd64/:$LD_LIBRARY_PATH \
PYTHONPATH=/usr/local/lib64/lgraph:/usr/local/lib64:$PYTHONPATH \
PATH=/opt/apache-maven-3.8.7/bin:/usr/lib/jvm/java-8-openjdk-amd64/jre/bin:$PATH


4 changes: 2 additions & 2 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -16,7 +16,7 @@ include(BuildBoltLib.cmake)

install(TARGETS lgraph lgraph_python_api lgraph_server lgraph_db_python
RUNTIME DESTINATION bin
LIBRARY DESTINATION lgraph/lib64)
LIBRARY DESTINATION lib64/lgraph)
install(DIRECTORY
${CMAKE_CURRENT_LIST_DIR}/restful/server/resource
DESTINATION share/lgraph)
@@ -57,7 +57,7 @@ install(FILES
/usr/local/lib64/libiomp5.so
/lib64/libgfortran.so.5
/lib64/libgfortran.so.5.0.0
DESTINATION lgraph/lib64)
DESTINATION lib64/lgraph)
install(DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/../include
DESTINATION ./)

0 comments on commit f7840ac

Please sign in to comment.