diff --git a/ci/images/tugraph-compile-arm64v8-centos7-Dockerfile b/ci/images/tugraph-compile-arm64v8-centos7-Dockerfile index c8d6a06681..a2af698255 100644 --- a/ci/images/tugraph-compile-arm64v8-centos7-Dockerfile +++ b/ci/images/tugraph-compile-arm64v8-centos7-Dockerfile @@ -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 diff --git a/ci/images/tugraph-compile-centos7-Dockerfile b/ci/images/tugraph-compile-centos7-Dockerfile index 498eed3eca..49a557918a 100644 --- a/ci/images/tugraph-compile-centos7-Dockerfile +++ b/ci/images/tugraph-compile-centos7-Dockerfile @@ -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 diff --git a/ci/images/tugraph-compile-centos8-Dockerfile b/ci/images/tugraph-compile-centos8-Dockerfile index 6879f9c025..e05bfd6a0d 100644 --- a/ci/images/tugraph-compile-centos8-Dockerfile +++ b/ci/images/tugraph-compile-centos8-Dockerfile @@ -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 diff --git a/ci/images/tugraph-compile-ubuntu18.04-Dockerfile b/ci/images/tugraph-compile-ubuntu18.04-Dockerfile index 594ab07d20..9ac917374b 100644 --- a/ci/images/tugraph-compile-ubuntu18.04-Dockerfile +++ b/ci/images/tugraph-compile-ubuntu18.04-Dockerfile @@ -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 diff --git a/ci/images/tugraph-mini-runtime-centos7-Dockerfile b/ci/images/tugraph-mini-runtime-centos7-Dockerfile index 163add4dbf..56ddb44ab7 100644 --- a/ci/images/tugraph-mini-runtime-centos7-Dockerfile +++ b/ci/images/tugraph-mini-runtime-centos7-Dockerfile @@ -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 diff --git a/ci/images/tugraph-mini-runtime-centos8-Dockerfile b/ci/images/tugraph-mini-runtime-centos8-Dockerfile index 6952dd1258..f86ae59dbf 100644 --- a/ci/images/tugraph-mini-runtime-centos8-Dockerfile +++ b/ci/images/tugraph-mini-runtime-centos8-Dockerfile @@ -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 diff --git a/ci/images/tugraph-mini-runtime-ubuntu18.04-Dockerfile b/ci/images/tugraph-mini-runtime-ubuntu18.04-Dockerfile index 981276d756..b849417b48 100644 --- a/ci/images/tugraph-mini-runtime-ubuntu18.04-Dockerfile +++ b/ci/images/tugraph-mini-runtime-ubuntu18.04-Dockerfile @@ -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 diff --git a/ci/images/tugraph-runtime-arm64v8-centos7-Dockerfile b/ci/images/tugraph-runtime-arm64v8-centos7-Dockerfile index b17edd5631..07aa3c9ea3 100644 --- a/ci/images/tugraph-runtime-arm64v8-centos7-Dockerfile +++ b/ci/images/tugraph-runtime-arm64v8-centos7-Dockerfile @@ -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 diff --git a/ci/images/tugraph-runtime-centos7-Dockerfile b/ci/images/tugraph-runtime-centos7-Dockerfile index 2aa8972c4f..588e261c2d 100644 --- a/ci/images/tugraph-runtime-centos7-Dockerfile +++ b/ci/images/tugraph-runtime-centos7-Dockerfile @@ -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 diff --git a/ci/images/tugraph-runtime-centos8-Dockerfile b/ci/images/tugraph-runtime-centos8-Dockerfile index d86120bf43..57c637506c 100644 --- a/ci/images/tugraph-runtime-centos8-Dockerfile +++ b/ci/images/tugraph-runtime-centos8-Dockerfile @@ -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 diff --git a/ci/images/tugraph-runtime-ubuntu18.04-Dockerfile b/ci/images/tugraph-runtime-ubuntu18.04-Dockerfile index bbe3997a2f..0f8d42226f 100644 --- a/ci/images/tugraph-runtime-ubuntu18.04-Dockerfile +++ b/ci/images/tugraph-runtime-ubuntu18.04-Dockerfile @@ -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 diff --git a/ci/start_dev.sh b/ci/start_dev.sh index 7c69c5d5da..cbf557a275 100644 --- a/ci/start_dev.sh +++ b/ci/start_dev.sh @@ -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 diff --git a/learn/docker/dockerfile b/learn/docker/dockerfile index e9ba459e88..6a813ee130 100644 --- a/learn/docker/dockerfile +++ b/learn/docker/dockerfile @@ -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 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index abf6d04258..eb80a85a33 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -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 ./)