From ba0cc700cda90ac2d64093962d5d1442369ed910 Mon Sep 17 00:00:00 2001 From: cord Date: Thu, 3 Jul 2025 15:49:33 +0800 Subject: [PATCH 1/2] update docker --- IndexSDK/Dockerfile/DockerFile-index | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/IndexSDK/Dockerfile/DockerFile-index b/IndexSDK/Dockerfile/DockerFile-index index bc0f4ce11..2e887fdc5 100644 --- a/IndexSDK/Dockerfile/DockerFile-index +++ b/IndexSDK/Dockerfile/DockerFile-index @@ -114,9 +114,9 @@ ENV ASCEND_HOME=/home/HwHiAiUser/Ascend/ RUN sed -i '$a\source /home/HwHiAiUser/Ascend/ascend-toolkit/set_env.sh' /home/HwHiAiUser/.bashrc && \ sed -i '$a\export LD_LIBRARY_PATH=/home/HwHiAiUser/Ascend/mxIndex/host/lib:$LD_LIBRARY_PATH' /home/HwHiAiUser/.bashrc && \ - sed -i '$a\export LD_LIBRARY_PATH=usr/local/faiss/faiss1.10.0/lib:$LD_LIBRARY_PATH' /home/HwHiAiUser/.bashrc && \ + sed -i '$a\export LD_LIBRARY_PATH=/usr/local/faiss/faiss1.10.0/lib:$LD_LIBRARY_PATH' /home/HwHiAiUser/.bashrc && \ sed -i '$a\export LD_LIBRARY_PATH=/opt/OpenBLAS/lib:$LD_LIBRARY_PATH' /home/HwHiAiUser/.bashrc && \ - sed -i '$a\export LD_LIBRARY_PATH=/home/HwHiAiUser/Ascend/driver/lib64/driver' /home/HwHiAiUser/.bashrc + sed -i '$a\export LD_LIBRARY_PATH=/home/HwHiAiUser/Ascend/driver/lib64/driver:$LD_LIBRARY_PATH' /home/HwHiAiUser/.bashrc RUN pip3 install numpy==1.26.4 -- Gitee From 08cb24e95fa87767e455812037a6036add4eb854 Mon Sep 17 00:00:00 2001 From: cord Date: Thu, 3 Jul 2025 15:58:31 +0800 Subject: [PATCH 2/2] update docker --- IndexSDK/Dockerfile/DockerFile-index | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/IndexSDK/Dockerfile/DockerFile-index b/IndexSDK/Dockerfile/DockerFile-index index 2e887fdc5..9851bf288 100644 --- a/IndexSDK/Dockerfile/DockerFile-index +++ b/IndexSDK/Dockerfile/DockerFile-index @@ -71,13 +71,6 @@ RUN wget https://github.com/facebookresearch/faiss/archive/v1.10.0.tar.gz -O fai cd build && make -j && make install && \ cd ../.. && rm -f v1.10.0.tar.gz && rm -rf faiss-1.10.0 -RUN sed -i '$a\export LD_LIBRARY_PATH=/usr/local/faiss/faiss1.10.0/lib:$LD_LIBRARY_PATH' ~/.bashrc - -RUN wget https://github.com/google/googletest/archive/refs/tags/release-1.8.1.tar.gz && \ - cp release-1.8.1.tar.gz /tmp/googletest-release-1.8.1.tar.gz && \ - tar xf release-1.8.1.tar.gz && cd googletest-release-1.8.1 && \ - cmake -DBUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_PREFIX=/usr/local/gtest . && make -j && make install && \ - cd .. && rm -rf release-1.8.1.tar.gz googletest-release-1.8.1 # 清理临时目录 RUN rm -rf ./* @@ -112,9 +105,16 @@ ENV MX_INDEX_MODELPATH=/home/HwHiAiUser/Ascend/modelpath RUN cd /home/HwHiAiUser/Ascend/mxIndex/ops && ./custom_opp_${ARCH}.run && mkdir -p ${MX_INDEX_MODELPATH} ENV ASCEND_HOME=/home/HwHiAiUser/Ascend/ +RUN wget https://github.com/google/googletest/archive/refs/tags/release-1.8.1.tar.gz && \ + cp release-1.8.1.tar.gz /tmp/googletest-release-1.8.1.tar.gz && \ + tar xf release-1.8.1.tar.gz && cd googletest-release-1.8.1 && \ + cmake -DBUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_PREFIX=/home/HwHiAiUser/gtest . && make -j && make install && \ + cd .. && rm -rf release-1.8.1.tar.gz googletest-release-1.8.1 + RUN sed -i '$a\source /home/HwHiAiUser/Ascend/ascend-toolkit/set_env.sh' /home/HwHiAiUser/.bashrc && \ sed -i '$a\export LD_LIBRARY_PATH=/home/HwHiAiUser/Ascend/mxIndex/host/lib:$LD_LIBRARY_PATH' /home/HwHiAiUser/.bashrc && \ sed -i '$a\export LD_LIBRARY_PATH=/usr/local/faiss/faiss1.10.0/lib:$LD_LIBRARY_PATH' /home/HwHiAiUser/.bashrc && \ + sed -i '$a\export LD_LIBRARY_PATH=/home/HwHiAiUser/gtest/lib:$LD_LIBRARY_PATH' /home/HwHiAiUser/.bashrc && \ sed -i '$a\export LD_LIBRARY_PATH=/opt/OpenBLAS/lib:$LD_LIBRARY_PATH' /home/HwHiAiUser/.bashrc && \ sed -i '$a\export LD_LIBRARY_PATH=/home/HwHiAiUser/Ascend/driver/lib64/driver:$LD_LIBRARY_PATH' /home/HwHiAiUser/.bashrc -- Gitee