From 250e2b794026ba2674b2dac4f887354d20c877b7 Mon Sep 17 00:00:00 2001 From: wwwttt001 Date: Mon, 28 Jul 2025 03:16:47 +0000 Subject: [PATCH 01/10] update RAGSDK/MainRepo/Dockerfile/ubuntu/Dockerfile. Signed-off-by: wwwttt001 --- RAGSDK/MainRepo/Dockerfile/ubuntu/Dockerfile | 61 ++++++-------------- 1 file changed, 17 insertions(+), 44 deletions(-) diff --git a/RAGSDK/MainRepo/Dockerfile/ubuntu/Dockerfile b/RAGSDK/MainRepo/Dockerfile/ubuntu/Dockerfile index bfc7f0346..0771d6bf1 100644 --- a/RAGSDK/MainRepo/Dockerfile/ubuntu/Dockerfile +++ b/RAGSDK/MainRepo/Dockerfile/ubuntu/Dockerfile @@ -7,6 +7,9 @@ ARG PYTHON_VERSION=python3.11 ARG TORCH_VERSION=2.1.0 # 设置时区禁用交互式配置 ENV DEBIAN_FRONTEND=noninteractive + +COPY ./package/setup.ca.sh . +RUN mkdir -p /usr/local/share/ca-certificates && bash setup.ca.sh RUN apt-get update && apt-get install -y software-properties-common && add-apt-repository -y ppa:deadsnakes/ppa && apt-get update RUN apt-get update && apt-get install -y vim tar zip unzip git curl wget dos2unix make gcc g++ ccache gfortran libssl-dev libpq-dev swig ffmpeg @@ -33,29 +36,12 @@ RUN apt-get remove -y python3-blinker && apt-get autoremove -y # 安装cann 依赖 RUN pip3 install --upgrade setuptools && pip3 install numpy==1.26.4 decorator==5.1.1 sympy==1.12 cffi==1.16.0 pyyaml==6.0.1 pathlib2==2.3.7.post1 protobuf==5.26.0 scipy==1.12.0 requests==2.31.0 psutil==5.9.8 absl-py==2.1.0 attrs==23.2.0 -# 安装torch for x86 -# RUN pip3 install torch=="${TORCH_VERSION}" --index-url https://download.pytorch.org/whl/cpu -# 安装torch-npu -# RUN pip3 install torch-npu=="${TORCH_VERSION}".post3 - -# 安装cann-toolkit和kernel -COPY ./package/Ascend-cann*_linux-${ARCH}.run /tmp/ RUN useradd -d /home/HwHiAiUser -u 1000 -m -s /bin/bash HwHiAiUser -RUN bash /tmp/Ascend-cann-toolkit*_linux-${ARCH}.run --install --install-for-all --quiet -RUN bash /tmp/Ascend-cann-kernels*_linux-${ARCH}.run --install --install-for-all --quiet -#安装 nnal -RUN bash -c "source /usr/local/Ascend/ascend-toolkit/set_env.sh && bash /tmp/Ascend-cann-nnal*_linux-${ARCH}.run --install --quiet" - -ENV ASCEND_HOME_PATH=/usr/local/Ascend/ascend-toolkit/latest -ENV TOOLCHAIN_HOME=/usr/local/Ascend/ascend-toolkit/latest/toolkit -ENV ASCEND_TOOLKIT_HOME=/usr/local/Ascend/ascend-toolkit/latest -ENV ASCEND_OPP_PATH=/usr/local/Ascend/ascend-toolkit/latest/opp -ENV ASCEND_AICPU_PATH=/usr/local/Ascend/ascend-toolkit/latest + ENV LD_LIBRARY_PATH=/usr/local/Ascend/driver/lib64:/usr/local/Ascend/driver/lib64/common:/usr/local/Ascend/driver/lib64/driver:$LD_LIBRARY_PATH RUN pip3 install build wheel - # 安装openblas ARG OPENBLAS_INSTALL_PATH=/usr/local/Ascend/OpenBLAS RUN . /tmp/urls.conf && cd /tmp && \ @@ -88,30 +74,13 @@ RUN . /tmp/urls.conf && wget $FAISS_URL && \ # 安装index COPY ./package/Ascend-mindxsdk-mxindex*_linux-${ARCH}.run /tmp/ RUN bash /tmp/Ascend-mindxsdk-mxindex*_linux-${ARCH}.run --quiet --install --install-path=/usr/local/Ascend --platform=${PLATFORM} -ENV MX_INDEX_MODELPATH=/home/ascend/modelpath -RUN cd /usr/local/Ascend/mxIndex/ops && ./custom_opp_${ARCH}.run && mkdir -p /home/ascend/modelpath -# 安装ascendfaiss,到这里了 + +# 安装ascendfaiss ARG FAISS_INSTALL_PATH=/usr/local/faiss/faiss1.10.0 ARG MXINDEX_INSTALL_PATH=/usr/local/Ascend/mxIndex -ARG PYTHON_HEADER=/usr/include/${PYTHON_VERSION}/ -ARG ASCEND_INSTALL_PATH=/usr/local/Ascend/ascend-toolkit/latest -ARG DRIVER_INSTALL_PATH=/usr/local/Ascend COPY ./package/driver /usr/local/Ascend/driver -RUN . /tmp/urls.conf && wget $ASCENDFAISS_URL - - -RUN unzip master.zip && \ - cd mindsdk-referenceapps-master/IndexSDK/faiss-python && \ - swig -python -c++ -Doverride= -module swig_ascendfaiss -I${PYTHON_HEADER} -I${FAISS_INSTALL_PATH}/include -I${MXINDEX_INSTALL_PATH}/include -DSWIGWORDSIZE64 -o swig_ascendfaiss.cpp swig_ascendfaiss.swig && \ - g++ -std=c++11 -DFINTEGER=int -fopenmp -I/usr/local/include -I${ASCEND_INSTALL_PATH}/acllib/include -I${ASCEND_INSTALL_PATH}/runtime/include -I${DRIVER_INSTALL_PATH}/driver/kernel/inc/driver -I${DRIVER_INSTALL_PATH}/driver/kernel/libc_sec/include -fPIC -fstack-protector-all -Wall -Wreturn-type -D_FORTIFY_SOURCE=2 -g -O3 -Wall -Wextra -I${PYTHON_HEADER} -I/usr/local/lib/${PYTHON_VERSION}/dist-packages/numpy/core/include -I${FAISS_INSTALL_PATH}/include -I${MXINDEX_INSTALL_PATH}/include -c swig_ascendfaiss.cpp -o swig_ascendfaiss.o && \ - g++ -std=c++11 -shared -fopenmp -L${ASCEND_INSTALL_PATH}/lib64 -L${ASCEND_INSTALL_PATH}/acllib/lib64 -L${ASCEND_INSTALL_PATH}/runtime/lib64 -L${DRIVER_INSTALL_PATH}/driver/lib64 -L${DRIVER_INSTALL_PATH}/driver/lib64/common -L${DRIVER_INSTALL_PATH}/driver/lib64/driver -L${FAISS_INSTALL_PATH}/lib -L${MXINDEX_INSTALL_PATH}/lib -Wl,-rpath-link=${ASCEND_INSTALL_PATH}/acllib/lib64:${ASCEND_INSTALL_PATH}/runtime/lib64:${DRIVER_INSTALL_PATH}/driver/lib64:${DRIVER_INSTALL_PATH}/driver/lib64/common:${DRIVER_INSTALL_PATH}/driver/lib64/driver -L/usr/local/lib -Wl,-z,relro -Wl,-z,now -Wl,-z,noexecstack -s -o _swig_ascendfaiss.so swig_ascendfaiss.o -L.. -lascendfaiss -lfaiss -lascend_hal -lacl_retr -lascendcl -lc_sec -lacl_op_compiler && \ - ${PYTHON_VERSION} -m build && \ - cd dist && pip3 install ascendfaiss*.whl - - -#ENV LD_LIBRARY_PATH=/usr/local/Ascend/mxIndex/lib:/usr/local/faiss/faiss1.10.0/lib:$LD_LIBRARY_PATH # 安装toch_npu @@ -126,16 +95,17 @@ RUN pip3 install -r /usr/local/Ascend/mxRag/requirements.txt # 安装mxrag第三方依赖 RUN pip3 install ragas==0.1.9 rank_bm25==0.2.2 readability_lxml==0.8.1 html_text==0.6.2 gradio==3.50.2 #清理临时目录 -RUN rm -rf ./* && rm -rf /usr/local/Ascend/driver # 添加环境变量 RUN sed -i '$a\export PYTHONPATH=/root/.local/lib/$PYTHON_VERSION/site-packages/mx_rag/libs/:$PYTHONPATH' /root/.bashrc && \ sed -i '$a\export LD_PRELOAD=$(ls /usr/local/lib/$PYTHON_VERSION/dist-packages/scikit_learn.libs/libgomp-*):$LD_PRELOAD' /root/.bashrc && \ - sed -i '$a\source /usr/local/Ascend/ascend-toolkit/set_env.sh' /root/.bashrc && \ - sed -i '$a\source /usr/local/Ascend/nnal/atb/set_env.sh' /root/.bashrc && \ sed -i '$a\source /usr/local/Ascend/mxRag/script/set_env.sh' /root/.bashrc && \ sed -i '$a\export LD_LIBRARY_PATH=/usr/local/Ascend/mxIndex/lib:/usr/local/faiss/faiss1.10.0/lib:$LD_LIBRARY_PATH' /root/.bashrc && \ sed -i '$a\export PATH=/usr/local/bin:$PATH' /root/.bashrc && \ + sed -i '$a\export ASCEND_HOME=/usr/local/Ascend' /root/.bashrc && \ + sed -i '$a\export ASCEND_VERSION=/usr/local/Ascend/ascend-toolkit/latest' /root/.bashrc && \ + sed -i '$a\export MX_INDEX_MODELPATH=/home/ascend/modelpath' /root/.bashrc && \ + sed -i '$a\export MX_INDEX_INSTALL_PATH=/usr/local/Ascend/mxIndex' /root/.bashrc && \ sed -i 's/$PYTHON_VERSION/'"$PYTHON_VERSION"'/g' /root/.bashrc && \ sed -i '$a\export LOGURU_FORMAT="{time:YYYY-MM-DD HH:mm:ss.SSS} | {level: <8} | {name}:{function}:{line} - {message!r}"' /root/.bashrc @@ -153,11 +123,11 @@ RUN bash /tmp/Ascend-mindxsdk-mxrag_*_linux-${ARCH}.run --install --install-path # 添加环境变量 for HwHiAiUser用户 RUN sed -i '$a\export PYTHONPATH=/home/HwHiAiUser/.local/lib/$PYTHON_VERSION/site-packages/mx_rag/libs/:$PYTHONPATH' /home/HwHiAiUser/.bashrc && \ sed -i '$a\export LD_PRELOAD=$(ls /usr/local/lib/$PYTHON_VERSION/dist-packages/scikit_learn.libs/libgomp-*):$LD_PRELOAD' /home/HwHiAiUser/.bashrc && \ - sed -i '$a\source /usr/local/Ascend/ascend-toolkit/set_env.sh' /home/HwHiAiUser/.bashrc && \ - sed -i '$a\source /usr/local/Ascend/nnal/atb/set_env.sh' /home/HwHiAiUser/.bashrc && \ sed -i '$a\source /home/HwHiAiUser/Ascend/mxRag/script/set_env.sh' /home/HwHiAiUser/.bashrc && \ sed -i '$a\export LD_LIBRARY_PATH=/home/HwHiAiUser/Ascend/mxIndex/lib:/usr/local/faiss/faiss1.10.0/lib:$LD_LIBRARY_PATH' /home/HwHiAiUser/.bashrc && \ sed -i '$a\export PATH=/usr/local/bin:$PATH' /home/HwHiAiUser/.bashrc && \ + sed -i '$a\export MX_INDEX_MODELPATH=/home/HwHiAiUser/Ascend/modelpath' /home/HwHiAiUser/.bashrc && \ + sed -i '$a\export MX_INDEX_INSTALL_PATH=/home/HwHiAiUser/Ascend/mxIndex' /home/HwHiAiUser/.bashrc&& \ sed -i 's/$PYTHON_VERSION/'"$PYTHON_VERSION"'/g' /home/HwHiAiUser/.bashrc && \ sed -i '$a\export LOGURU_FORMAT="{time:YYYY-MM-DD HH:mm:ss.SSS} | {level: <8} | {name}:{function}:{line} - {message!r}"' /home/HwHiAiUser/.bashrc @@ -165,9 +135,12 @@ ENV MX_INDEX_MULTITHREAD=1 ENV MX_INDEX_FINALIZE=0 USER root -RUN chmod +r /usr/local/Ascend/ascend-toolkit/latest/opp/vendors/config.ini +RUN mkdir -p /opt/package/ +COPY ./package/Ascend-cann*_linux-${ARCH}.run /opt/package/ +RUN . /tmp/urls.conf && wget $ASCENDFAISS_URL -P /opt/package/ +COPY ./package/install.sh /opt/package/ + RUN rm -rf /tmp/* USER HwHiAiUser:HwHiAiUser WORKDIR /home/HwHiAiUser - -- Gitee From 0860aefe708352167aadc1ef8b06c2c54169b484 Mon Sep 17 00:00:00 2001 From: wwwttt001 Date: Mon, 28 Jul 2025 03:20:56 +0000 Subject: [PATCH 02/10] add RAGSDK/MainRepo/Dockerfile/ubuntu/install.sh. Signed-off-by: wwwttt001 --- RAGSDK/MainRepo/Dockerfile/ubuntu/install.sh | 67 ++++++++++++++++++++ 1 file changed, 67 insertions(+) create mode 100644 RAGSDK/MainRepo/Dockerfile/ubuntu/install.sh diff --git a/RAGSDK/MainRepo/Dockerfile/ubuntu/install.sh b/RAGSDK/MainRepo/Dockerfile/ubuntu/install.sh new file mode 100644 index 000000000..bdde05920 --- /dev/null +++ b/RAGSDK/MainRepo/Dockerfile/ubuntu/install.sh @@ -0,0 +1,67 @@ +#!/bin/bash +ARCH=$(uname -m) + +if [[ -n $(id | grep uid=0) ]];then + usr_id=0 +else + usr_id=1 +fi + +# 安装cann-toolkit和kernel +bash /opt/package/Ascend-cann-toolkit*_linux-${ARCH}.run --install --install-for-all --quiet +bash /opt/package/Ascend-cann-kernels*_linux-${ARCH}.run --install --install-for-all --quiet +#安装 nnal +if [[ $usr_id -eq 0 ]]; then + bash -c "source /usr/local/Ascend/ascend-toolkit/set_env.sh && bash /opt/package/Ascend-cann-nnal*_linux-${ARCH}.run --install --quiet" + + commands=("source /usr/local/Ascend/ascend-toolkit/set_env.sh", "source /usr/local/Ascend/nnal/atb/set_env.sh","export ASCEND_VERSION=/usr/local/Ascend/ascend-toolkit/latest", "export ASCEND_HOME=/usr/local/Ascend") + for cmd in ${commands[@]}; + do + if ! grep -Fxq "$cmd" "/root/.bashrc"; then + # 如果不存在,将命令追加到文件中 + echo "$cmd" >> "/root/.bashrc" + echo "命令已添加到 /root/.bashrc" + fi + done; + + source /usr/local/Ascend/ascend-toolkit/set_env.sh + source /usr/local/Ascend/nnal/atb/set_env.sh + export ASCEND_VERSION=/usr/local/Ascend/ascend-toolkit/latest + export ASCEND_HOME=/usr/local/Ascend + bash /opt/package/Ascend-cann-nnal*_linux-${ARCH}.run --install --quiet + + cd /usr/local/Ascend/mxIndex/ops && ./custom_opp_${ARCH}.run && mkdir -p ${MX_INDEX_MODELPATH} +else + bash -c "source /home/HwHiAiUser/Ascend/ascend-toolkit/set_env.sh && bash /opt/package/Ascend-cann-nnal*_linux-${ARCH}.run --install --quiet" + commands=("source /home/HwHiAiUser/Ascend/ascend-toolkit/set_env.sh", "source /home/HwHiAiUser/Ascend/nnal/atb/set_env.sh", "export ASCEND_HOME=/home/HwHiAiUser/Ascend", "export ASCEND_VERSION=/home/HwHiAiUser/Ascend/ascend-toolkit/latest") + for cmd in ${commands[@]}; + do + if ! grep -Fxq "$cmd" "/home/HwHiAiUser/.bashrc"; then + # 如果不存在,将命令追加到文件中 + echo "$cmd" >> "/home/HwHiAiUser/.bashrc" + echo "命令已添加到 /home/HwHiAiUser/.bashrc" + fi + done; + + source /home/HwHiAiUser/Ascend/ascend-toolkit/set_env.sh + source /home/HwHiAiUser/Ascend/nnal/atb/set_env.sh + export ASCEND_HOME=/home/HwHiAiUser/Ascend + export ASCEND_VERSION=/home/HwHiAiUser/Ascend/ascend-toolkit/latest + + cd /home/HwHiAiUser/Ascend/mxIndex/ops && ./custom_opp_${ARCH}.run && mkdir -p ${MX_INDEX_MODELPATH} +fi + + +PYTHON_VERSION=python3.11 +PYTHON_HEADER=/usr/include/${PYTHON_VERSION}/ +FAISS_INSTALL_PATH=/usr/local/faiss/faiss1.10.0 +DRIVER_INSTALL_PATH=/usr/local/Ascend + + +rm -rf /tmp/mindsdk-referenceapps-master && unzip -d /tmp /opt/package/master.zip && \ + cd /tmp/mindsdk-referenceapps-master/IndexSDK/faiss-python && \ + swig -python -c++ -Doverride= -module swig_ascendfaiss -I${PYTHON_HEADER} -I${FAISS_INSTALL_PATH}/include -I${MXINDEX_INSTALL_PATH}/include -DSWIGWORDSIZE64 -o swig_ascendfaiss.cpp swig_ascendfaiss.swig && \ + g++ -std=c++11 -DFINTEGER=int -fopenmp -I/usr/local/include -I${ASCEND_TOOLKIT_HOME}/acllib/include -I${ASCEND_TOOLKIT_HOME}/runtime/include -I${DRIVER_INSTALL_PATH}/driver/kernel/inc/driver -I${DRIVER_INSTALL_PATH}/driver/kernel/libc_sec/include -fPIC -fstack-protector-all -Wall -Wreturn-type -D_FORTIFY_SOURCE=2 -g -O3 -Wall -Wextra -I${PYTHON_HEADER} -I/usr/local/lib/${PYTHON_VERSION}/dist-packages/numpy/core/include -I${FAISS_INSTALL_PATH}/include -I${MXINDEX_INSTALL_PATH}/include -c swig_ascendfaiss.cpp -o swig_ascendfaiss.o && \ + g++ -std=c++11 -shared -fopenmp -L${ASCEND_TOOLKIT_HOME}/lib64 -L${ASCEND_TOOLKIT_HOME}/acllib/lib64 -L${ASCEND_TOOLKIT_HOME}/runtime/lib64 -L${DRIVER_INSTALL_PATH}/driver/lib64 -L${DRIVER_INSTALL_PATH}/driver/lib64/common -L${DRIVER_INSTALL_PATH}/driver/lib64/driver -L${FAISS_INSTALL_PATH}/lib -L${MXINDEX_INSTALL_PATH}/lib -Wl,-rpath-link=${ASCEND_TOOLKIT_HOME}/acllib/lib64:${ASCEND_TOOLKIT_HOME}/runtime/lib64:${DRIVER_INSTALL_PATH}/driver/lib64:${DRIVER_INSTALL_PATH}/driver/lib64/common:${DRIVER_INSTALL_PATH}/driver/lib64/driver -L/usr/local/lib -Wl,-z,relro -Wl,-z,now -Wl,-z,noexecstack -s -o _swig_ascendfaiss.so swig_ascendfaiss.o -L.. -lascendfaiss -lfaiss -lascend_hal -lc_sec -lacl_op_compiler && \ + ${PYTHON_VERSION} -m build --no-isolation && \ + cd dist && pip3 install ascendfaiss*.whl && rm -rf /tmp/mindsdk-referenceapps-master/ \ No newline at end of file -- Gitee From 18209152e8fd8f48521cd0ff705f51a94d14e494 Mon Sep 17 00:00:00 2001 From: wwwttt001 Date: Mon, 28 Jul 2025 03:37:08 +0000 Subject: [PATCH 03/10] update RAGSDK/MainRepo/Dockerfile/ubuntu/Dockerfile. Signed-off-by: wwwttt001 --- RAGSDK/MainRepo/Dockerfile/ubuntu/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RAGSDK/MainRepo/Dockerfile/ubuntu/Dockerfile b/RAGSDK/MainRepo/Dockerfile/ubuntu/Dockerfile index 0771d6bf1..7cb2fdf4f 100644 --- a/RAGSDK/MainRepo/Dockerfile/ubuntu/Dockerfile +++ b/RAGSDK/MainRepo/Dockerfile/ubuntu/Dockerfile @@ -93,7 +93,7 @@ RUN bash /tmp/Ascend-mindxsdk-mxrag_*_linux-${ARCH}.run --install --install-path RUN pip3 install -r /usr/local/Ascend/mxRag/requirements.txt # 安装mxrag第三方依赖 -RUN pip3 install ragas==0.1.9 rank_bm25==0.2.2 readability_lxml==0.8.1 html_text==0.6.2 gradio==3.50.2 +RUN pip3 install ragas==0.1.9 rank_bm25==0.2.2 readability_lxml==0.8.1 html_text==0.6.2 gradio==3.50.2 streamlit #清理临时目录 # 添加环境变量 -- Gitee From b9fda54f79589b133ed1791d44ad03e135da25ee Mon Sep 17 00:00:00 2001 From: wwwttt001 Date: Mon, 28 Jul 2025 03:37:35 +0000 Subject: [PATCH 04/10] update RAGSDK/MainRepo/Dockerfile/ubuntu/Dockerfile. Signed-off-by: wwwttt001 --- RAGSDK/MainRepo/Dockerfile/ubuntu/Dockerfile | 3 --- 1 file changed, 3 deletions(-) diff --git a/RAGSDK/MainRepo/Dockerfile/ubuntu/Dockerfile b/RAGSDK/MainRepo/Dockerfile/ubuntu/Dockerfile index 7cb2fdf4f..d973888e5 100644 --- a/RAGSDK/MainRepo/Dockerfile/ubuntu/Dockerfile +++ b/RAGSDK/MainRepo/Dockerfile/ubuntu/Dockerfile @@ -7,9 +7,6 @@ ARG PYTHON_VERSION=python3.11 ARG TORCH_VERSION=2.1.0 # 设置时区禁用交互式配置 ENV DEBIAN_FRONTEND=noninteractive - -COPY ./package/setup.ca.sh . -RUN mkdir -p /usr/local/share/ca-certificates && bash setup.ca.sh RUN apt-get update && apt-get install -y software-properties-common && add-apt-repository -y ppa:deadsnakes/ppa && apt-get update RUN apt-get update && apt-get install -y vim tar zip unzip git curl wget dos2unix make gcc g++ ccache gfortran libssl-dev libpq-dev swig ffmpeg -- Gitee From 3409259d1141f3d53dee52322cdc1a19dc2409b5 Mon Sep 17 00:00:00 2001 From: wwwttt001 Date: Mon, 28 Jul 2025 10:46:20 +0000 Subject: [PATCH 05/10] update RAGSDK/MainRepo/Dockerfile/ubuntu/install.sh. Signed-off-by: wwwttt001 --- RAGSDK/MainRepo/Dockerfile/ubuntu/install.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/RAGSDK/MainRepo/Dockerfile/ubuntu/install.sh b/RAGSDK/MainRepo/Dockerfile/ubuntu/install.sh index bdde05920..54099ad85 100644 --- a/RAGSDK/MainRepo/Dockerfile/ubuntu/install.sh +++ b/RAGSDK/MainRepo/Dockerfile/ubuntu/install.sh @@ -60,8 +60,8 @@ DRIVER_INSTALL_PATH=/usr/local/Ascend rm -rf /tmp/mindsdk-referenceapps-master && unzip -d /tmp /opt/package/master.zip && \ cd /tmp/mindsdk-referenceapps-master/IndexSDK/faiss-python && \ - swig -python -c++ -Doverride= -module swig_ascendfaiss -I${PYTHON_HEADER} -I${FAISS_INSTALL_PATH}/include -I${MXINDEX_INSTALL_PATH}/include -DSWIGWORDSIZE64 -o swig_ascendfaiss.cpp swig_ascendfaiss.swig && \ - g++ -std=c++11 -DFINTEGER=int -fopenmp -I/usr/local/include -I${ASCEND_TOOLKIT_HOME}/acllib/include -I${ASCEND_TOOLKIT_HOME}/runtime/include -I${DRIVER_INSTALL_PATH}/driver/kernel/inc/driver -I${DRIVER_INSTALL_PATH}/driver/kernel/libc_sec/include -fPIC -fstack-protector-all -Wall -Wreturn-type -D_FORTIFY_SOURCE=2 -g -O3 -Wall -Wextra -I${PYTHON_HEADER} -I/usr/local/lib/${PYTHON_VERSION}/dist-packages/numpy/core/include -I${FAISS_INSTALL_PATH}/include -I${MXINDEX_INSTALL_PATH}/include -c swig_ascendfaiss.cpp -o swig_ascendfaiss.o && \ - g++ -std=c++11 -shared -fopenmp -L${ASCEND_TOOLKIT_HOME}/lib64 -L${ASCEND_TOOLKIT_HOME}/acllib/lib64 -L${ASCEND_TOOLKIT_HOME}/runtime/lib64 -L${DRIVER_INSTALL_PATH}/driver/lib64 -L${DRIVER_INSTALL_PATH}/driver/lib64/common -L${DRIVER_INSTALL_PATH}/driver/lib64/driver -L${FAISS_INSTALL_PATH}/lib -L${MXINDEX_INSTALL_PATH}/lib -Wl,-rpath-link=${ASCEND_TOOLKIT_HOME}/acllib/lib64:${ASCEND_TOOLKIT_HOME}/runtime/lib64:${DRIVER_INSTALL_PATH}/driver/lib64:${DRIVER_INSTALL_PATH}/driver/lib64/common:${DRIVER_INSTALL_PATH}/driver/lib64/driver -L/usr/local/lib -Wl,-z,relro -Wl,-z,now -Wl,-z,noexecstack -s -o _swig_ascendfaiss.so swig_ascendfaiss.o -L.. -lascendfaiss -lfaiss -lascend_hal -lc_sec -lacl_op_compiler && \ + swig -python -c++ -Doverride= -module swig_ascendfaiss -I${PYTHON_HEADER} -I${FAISS_INSTALL_PATH}/include -I${MX_INDEX_INSTALL_PATH}/include -DSWIGWORDSIZE64 -o swig_ascendfaiss.cpp swig_ascendfaiss.swig && \ + g++ -std=c++11 -DFINTEGER=int -fopenmp -I/usr/local/include -I${ASCEND_TOOLKIT_HOME}/acllib/include -I${ASCEND_TOOLKIT_HOME}/runtime/include -I${DRIVER_INSTALL_PATH}/driver/kernel/inc/driver -I${DRIVER_INSTALL_PATH}/driver/kernel/libc_sec/include -fPIC -fstack-protector-all -Wall -Wreturn-type -D_FORTIFY_SOURCE=2 -g -O3 -Wall -Wextra -I${PYTHON_HEADER} -I/usr/local/lib/${PYTHON_VERSION}/dist-packages/numpy/core/include -I${FAISS_INSTALL_PATH}/include -I${MX_INDEX_INSTALL_PATH}/include -c swig_ascendfaiss.cpp -o swig_ascendfaiss.o && \ + g++ -std=c++11 -shared -fopenmp -L${ASCEND_TOOLKIT_HOME}/lib64 -L${ASCEND_TOOLKIT_HOME}/acllib/lib64 -L${ASCEND_TOOLKIT_HOME}/runtime/lib64 -L${DRIVER_INSTALL_PATH}/driver/lib64 -L${DRIVER_INSTALL_PATH}/driver/lib64/common -L${DRIVER_INSTALL_PATH}/driver/lib64/driver -L${FAISS_INSTALL_PATH}/lib -L${MX_INDEX_INSTALL_PATH}/lib -Wl,-rpath-link=${ASCEND_TOOLKIT_HOME}/acllib/lib64:${ASCEND_TOOLKIT_HOME}/runtime/lib64:${DRIVER_INSTALL_PATH}/driver/lib64:${DRIVER_INSTALL_PATH}/driver/lib64/common:${DRIVER_INSTALL_PATH}/driver/lib64/driver -L/usr/local/lib -Wl,-z,relro -Wl,-z,now -Wl,-z,noexecstack -s -o _swig_ascendfaiss.so swig_ascendfaiss.o -L.. -lascendfaiss -lfaiss -lascend_hal -lc_sec -lacl_op_compiler && \ ${PYTHON_VERSION} -m build --no-isolation && \ cd dist && pip3 install ascendfaiss*.whl && rm -rf /tmp/mindsdk-referenceapps-master/ \ No newline at end of file -- Gitee From 54ff35baccc39e7dc27d5576ac449e568778f0a2 Mon Sep 17 00:00:00 2001 From: wwwttt001 Date: Mon, 28 Jul 2025 11:09:16 +0000 Subject: [PATCH 06/10] update RAGSDK/MainRepo/Dockerfile/ubuntu/install.sh. Signed-off-by: wwwttt001 --- RAGSDK/MainRepo/Dockerfile/ubuntu/install.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/RAGSDK/MainRepo/Dockerfile/ubuntu/install.sh b/RAGSDK/MainRepo/Dockerfile/ubuntu/install.sh index 54099ad85..d4e858785 100644 --- a/RAGSDK/MainRepo/Dockerfile/ubuntu/install.sh +++ b/RAGSDK/MainRepo/Dockerfile/ubuntu/install.sh @@ -12,10 +12,10 @@ bash /opt/package/Ascend-cann-toolkit*_linux-${ARCH}.run --install --install-for bash /opt/package/Ascend-cann-kernels*_linux-${ARCH}.run --install --install-for-all --quiet #安装 nnal if [[ $usr_id -eq 0 ]]; then - bash -c "source /usr/local/Ascend/ascend-toolkit/set_env.sh && bash /opt/package/Ascend-cann-nnal*_linux-${ARCH}.run --install --quiet" + #bash -c "source /usr/local/Ascend/ascend-toolkit/set_env.sh && bash /opt/package/Ascend-cann-nnal*_linux-${ARCH}.run --install --quiet" - commands=("source /usr/local/Ascend/ascend-toolkit/set_env.sh", "source /usr/local/Ascend/nnal/atb/set_env.sh","export ASCEND_VERSION=/usr/local/Ascend/ascend-toolkit/latest", "export ASCEND_HOME=/usr/local/Ascend") - for cmd in ${commands[@]}; + commands=("source /usr/local/Ascend/ascend-toolkit/set_env.sh" "source /usr/local/Ascend/nnal/atb/set_env.sh" "export ASCEND_VERSION=/usr/local/Ascend/ascend-toolkit/latest" "export ASCEND_HOME=/usr/local/Ascend") + for cmd in "${commands[@]}"; do if ! grep -Fxq "$cmd" "/root/.bashrc"; then # 如果不存在,将命令追加到文件中 @@ -32,9 +32,9 @@ if [[ $usr_id -eq 0 ]]; then cd /usr/local/Ascend/mxIndex/ops && ./custom_opp_${ARCH}.run && mkdir -p ${MX_INDEX_MODELPATH} else - bash -c "source /home/HwHiAiUser/Ascend/ascend-toolkit/set_env.sh && bash /opt/package/Ascend-cann-nnal*_linux-${ARCH}.run --install --quiet" - commands=("source /home/HwHiAiUser/Ascend/ascend-toolkit/set_env.sh", "source /home/HwHiAiUser/Ascend/nnal/atb/set_env.sh", "export ASCEND_HOME=/home/HwHiAiUser/Ascend", "export ASCEND_VERSION=/home/HwHiAiUser/Ascend/ascend-toolkit/latest") - for cmd in ${commands[@]}; + #bash -c "source /home/HwHiAiUser/Ascend/ascend-toolkit/set_env.sh && bash /opt/package/Ascend-cann-nnal*_linux-${ARCH}.run --install --quiet" + commands=("source /home/HwHiAiUser/Ascend/ascend-toolkit/set_env.sh" "source /home/HwHiAiUser/Ascend/nnal/atb/set_env.sh" "export ASCEND_HOME=/home/HwHiAiUser/Ascend" "export ASCEND_VERSION=/home/HwHiAiUser/Ascend/ascend-toolkit/latest") + for cmd in "${commands[@]}"; do if ! grep -Fxq "$cmd" "/home/HwHiAiUser/.bashrc"; then # 如果不存在,将命令追加到文件中 -- Gitee From e49f4ac565ff183c88fc602fd270f25d95a26275 Mon Sep 17 00:00:00 2001 From: wwwttt001 Date: Tue, 29 Jul 2025 08:55:30 +0000 Subject: [PATCH 07/10] update RAGSDK/MainRepo/Dockerfile/ubuntu/install.sh. Signed-off-by: wwwttt001 --- RAGSDK/MainRepo/Dockerfile/ubuntu/install.sh | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/RAGSDK/MainRepo/Dockerfile/ubuntu/install.sh b/RAGSDK/MainRepo/Dockerfile/ubuntu/install.sh index d4e858785..e85e9ec91 100644 --- a/RAGSDK/MainRepo/Dockerfile/ubuntu/install.sh +++ b/RAGSDK/MainRepo/Dockerfile/ubuntu/install.sh @@ -12,10 +12,10 @@ bash /opt/package/Ascend-cann-toolkit*_linux-${ARCH}.run --install --install-for bash /opt/package/Ascend-cann-kernels*_linux-${ARCH}.run --install --install-for-all --quiet #安装 nnal if [[ $usr_id -eq 0 ]]; then - #bash -c "source /usr/local/Ascend/ascend-toolkit/set_env.sh && bash /opt/package/Ascend-cann-nnal*_linux-${ARCH}.run --install --quiet" + bash -c "source /usr/local/Ascend/ascend-toolkit/set_env.sh && bash /opt/package/Ascend-cann-nnal*_linux-${ARCH}.run --install --quiet" - commands=("source /usr/local/Ascend/ascend-toolkit/set_env.sh" "source /usr/local/Ascend/nnal/atb/set_env.sh" "export ASCEND_VERSION=/usr/local/Ascend/ascend-toolkit/latest" "export ASCEND_HOME=/usr/local/Ascend") - for cmd in "${commands[@]}"; + commands=("source /usr/local/Ascend/ascend-toolkit/set_env.sh", "source /usr/local/Ascend/nnal/atb/set_env.sh","export ASCEND_VERSION=/usr/local/Ascend/ascend-toolkit/latest", "export ASCEND_HOME=/usr/local/Ascend") + for cmd in ${commands[@]}; do if ! grep -Fxq "$cmd" "/root/.bashrc"; then # 如果不存在,将命令追加到文件中 @@ -32,9 +32,9 @@ if [[ $usr_id -eq 0 ]]; then cd /usr/local/Ascend/mxIndex/ops && ./custom_opp_${ARCH}.run && mkdir -p ${MX_INDEX_MODELPATH} else - #bash -c "source /home/HwHiAiUser/Ascend/ascend-toolkit/set_env.sh && bash /opt/package/Ascend-cann-nnal*_linux-${ARCH}.run --install --quiet" - commands=("source /home/HwHiAiUser/Ascend/ascend-toolkit/set_env.sh" "source /home/HwHiAiUser/Ascend/nnal/atb/set_env.sh" "export ASCEND_HOME=/home/HwHiAiUser/Ascend" "export ASCEND_VERSION=/home/HwHiAiUser/Ascend/ascend-toolkit/latest") - for cmd in "${commands[@]}"; + bash -c "source /home/HwHiAiUser/Ascend/ascend-toolkit/set_env.sh && bash /opt/package/Ascend-cann-nnal*_linux-${ARCH}.run --install --quiet" + commands=("source /home/HwHiAiUser/Ascend/ascend-toolkit/set_env.sh", "source /home/HwHiAiUser/Ascend/nnal/atb/set_env.sh", "export ASCEND_HOME=/home/HwHiAiUser/Ascend", "export ASCEND_VERSION=/home/HwHiAiUser/Ascend/ascend-toolkit/latest") + for cmd in ${commands[@]}; do if ! grep -Fxq "$cmd" "/home/HwHiAiUser/.bashrc"; then # 如果不存在,将命令追加到文件中 @@ -60,8 +60,8 @@ DRIVER_INSTALL_PATH=/usr/local/Ascend rm -rf /tmp/mindsdk-referenceapps-master && unzip -d /tmp /opt/package/master.zip && \ cd /tmp/mindsdk-referenceapps-master/IndexSDK/faiss-python && \ - swig -python -c++ -Doverride= -module swig_ascendfaiss -I${PYTHON_HEADER} -I${FAISS_INSTALL_PATH}/include -I${MX_INDEX_INSTALL_PATH}/include -DSWIGWORDSIZE64 -o swig_ascendfaiss.cpp swig_ascendfaiss.swig && \ - g++ -std=c++11 -DFINTEGER=int -fopenmp -I/usr/local/include -I${ASCEND_TOOLKIT_HOME}/acllib/include -I${ASCEND_TOOLKIT_HOME}/runtime/include -I${DRIVER_INSTALL_PATH}/driver/kernel/inc/driver -I${DRIVER_INSTALL_PATH}/driver/kernel/libc_sec/include -fPIC -fstack-protector-all -Wall -Wreturn-type -D_FORTIFY_SOURCE=2 -g -O3 -Wall -Wextra -I${PYTHON_HEADER} -I/usr/local/lib/${PYTHON_VERSION}/dist-packages/numpy/core/include -I${FAISS_INSTALL_PATH}/include -I${MX_INDEX_INSTALL_PATH}/include -c swig_ascendfaiss.cpp -o swig_ascendfaiss.o && \ - g++ -std=c++11 -shared -fopenmp -L${ASCEND_TOOLKIT_HOME}/lib64 -L${ASCEND_TOOLKIT_HOME}/acllib/lib64 -L${ASCEND_TOOLKIT_HOME}/runtime/lib64 -L${DRIVER_INSTALL_PATH}/driver/lib64 -L${DRIVER_INSTALL_PATH}/driver/lib64/common -L${DRIVER_INSTALL_PATH}/driver/lib64/driver -L${FAISS_INSTALL_PATH}/lib -L${MX_INDEX_INSTALL_PATH}/lib -Wl,-rpath-link=${ASCEND_TOOLKIT_HOME}/acllib/lib64:${ASCEND_TOOLKIT_HOME}/runtime/lib64:${DRIVER_INSTALL_PATH}/driver/lib64:${DRIVER_INSTALL_PATH}/driver/lib64/common:${DRIVER_INSTALL_PATH}/driver/lib64/driver -L/usr/local/lib -Wl,-z,relro -Wl,-z,now -Wl,-z,noexecstack -s -o _swig_ascendfaiss.so swig_ascendfaiss.o -L.. -lascendfaiss -lfaiss -lascend_hal -lc_sec -lacl_op_compiler && \ + swig -python -c++ -Doverride= -module swig_ascendfaiss -I${PYTHON_HEADER} -I${FAISS_INSTALL_PATH}/include -I${MXINDEX_INSTALL_PATH}/include -DSWIGWORDSIZE64 -o swig_ascendfaiss.cpp swig_ascendfaiss.swig && \ + g++ -std=c++11 -DFINTEGER=int -fopenmp -I/usr/local/include -I${ASCEND_TOOLKIT_HOME}/acllib/include -I${ASCEND_TOOLKIT_HOME}/runtime/include -fPIC -fstack-protector-all -Wall -Wreturn-type -D_FORTIFY_SOURCE=2 -g -O3 -Wall -Wextra -I${PYTHON_HEADER} -I/usr/local/lib/${PYTHON_VERSION}/dist-packages/numpy/core/include -I${FAISS_INSTALL_PATH}/include -I${MXINDEX_INSTALL_PATH}/include -c swig_ascendfaiss.cpp -o swig_ascendfaiss.o && \ + g++ -std=c++11 -shared -fopenmp -L${ASCEND_TOOLKIT_HOME}/lib64 -L${ASCEND_TOOLKIT_HOME}/acllib/lib64 -L${ASCEND_TOOLKIT_HOME}/runtime/lib64 -L${DRIVER_INSTALL_PATH}/driver/lib64 -L${DRIVER_INSTALL_PATH}/driver/lib64/common -L${DRIVER_INSTALL_PATH}/driver/lib64/driver -L${FAISS_INSTALL_PATH}/lib -L${MXINDEX_INSTALL_PATH}/lib -Wl,-rpath-link=${ASCEND_TOOLKIT_HOME}/acllib/lib64:${ASCEND_TOOLKIT_HOME}/runtime/lib64:${DRIVER_INSTALL_PATH}/driver/lib64:${DRIVER_INSTALL_PATH}/driver/lib64/common:${DRIVER_INSTALL_PATH}/driver/lib64/driver -L/usr/local/lib -Wl,-z,relro -Wl,-z,now -Wl,-z,noexecstack -s -o _swig_ascendfaiss.so swig_ascendfaiss.o -L.. -lascendfaiss -lfaiss -lascend_hal -lc_sec -lacl_op_compiler && \ ${PYTHON_VERSION} -m build --no-isolation && \ cd dist && pip3 install ascendfaiss*.whl && rm -rf /tmp/mindsdk-referenceapps-master/ \ No newline at end of file -- Gitee From 91473492d802d2cca4fd4840a82376d558beb63f Mon Sep 17 00:00:00 2001 From: wwwttt001 Date: Tue, 29 Jul 2025 09:12:02 +0000 Subject: [PATCH 08/10] update RAGSDK/MainRepo/Dockerfile/ubuntu/install.sh. Signed-off-by: wwwttt001 --- RAGSDK/MainRepo/Dockerfile/ubuntu/install.sh | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/RAGSDK/MainRepo/Dockerfile/ubuntu/install.sh b/RAGSDK/MainRepo/Dockerfile/ubuntu/install.sh index e85e9ec91..7d3d08f9d 100644 --- a/RAGSDK/MainRepo/Dockerfile/ubuntu/install.sh +++ b/RAGSDK/MainRepo/Dockerfile/ubuntu/install.sh @@ -12,10 +12,10 @@ bash /opt/package/Ascend-cann-toolkit*_linux-${ARCH}.run --install --install-for bash /opt/package/Ascend-cann-kernels*_linux-${ARCH}.run --install --install-for-all --quiet #安装 nnal if [[ $usr_id -eq 0 ]]; then - bash -c "source /usr/local/Ascend/ascend-toolkit/set_env.sh && bash /opt/package/Ascend-cann-nnal*_linux-${ARCH}.run --install --quiet" + #bash -c "source /usr/local/Ascend/ascend-toolkit/set_env.sh && bash /opt/package/Ascend-cann-nnal*_linux-${ARCH}.run --install --quiet" - commands=("source /usr/local/Ascend/ascend-toolkit/set_env.sh", "source /usr/local/Ascend/nnal/atb/set_env.sh","export ASCEND_VERSION=/usr/local/Ascend/ascend-toolkit/latest", "export ASCEND_HOME=/usr/local/Ascend") - for cmd in ${commands[@]}; + commands=("source /usr/local/Ascend/ascend-toolkit/set_env.sh" "source /usr/local/Ascend/nnal/atb/set_env.sh" "export ASCEND_VERSION=/usr/local/Ascend/ascend-toolkit/latest" "export ASCEND_HOME=/usr/local/Ascend") + for cmd in "${commands[@]}"; do if ! grep -Fxq "$cmd" "/root/.bashrc"; then # 如果不存在,将命令追加到文件中 @@ -32,9 +32,9 @@ if [[ $usr_id -eq 0 ]]; then cd /usr/local/Ascend/mxIndex/ops && ./custom_opp_${ARCH}.run && mkdir -p ${MX_INDEX_MODELPATH} else - bash -c "source /home/HwHiAiUser/Ascend/ascend-toolkit/set_env.sh && bash /opt/package/Ascend-cann-nnal*_linux-${ARCH}.run --install --quiet" - commands=("source /home/HwHiAiUser/Ascend/ascend-toolkit/set_env.sh", "source /home/HwHiAiUser/Ascend/nnal/atb/set_env.sh", "export ASCEND_HOME=/home/HwHiAiUser/Ascend", "export ASCEND_VERSION=/home/HwHiAiUser/Ascend/ascend-toolkit/latest") - for cmd in ${commands[@]}; + #bash -c "source /home/HwHiAiUser/Ascend/ascend-toolkit/set_env.sh && bash /opt/package/Ascend-cann-nnal*_linux-${ARCH}.run --install --quiet" + commands=("source /home/HwHiAiUser/Ascend/ascend-toolkit/set_env.sh" "source /home/HwHiAiUser/Ascend/nnal/atb/set_env.sh" "export ASCEND_HOME=/home/HwHiAiUser/Ascend" "export ASCEND_VERSION=/home/HwHiAiUser/Ascend/ascend-toolkit/latest") + for cmd in "${commands[@]}"; do if ! grep -Fxq "$cmd" "/home/HwHiAiUser/.bashrc"; then # 如果不存在,将命令追加到文件中 @@ -60,8 +60,8 @@ DRIVER_INSTALL_PATH=/usr/local/Ascend rm -rf /tmp/mindsdk-referenceapps-master && unzip -d /tmp /opt/package/master.zip && \ cd /tmp/mindsdk-referenceapps-master/IndexSDK/faiss-python && \ - swig -python -c++ -Doverride= -module swig_ascendfaiss -I${PYTHON_HEADER} -I${FAISS_INSTALL_PATH}/include -I${MXINDEX_INSTALL_PATH}/include -DSWIGWORDSIZE64 -o swig_ascendfaiss.cpp swig_ascendfaiss.swig && \ - g++ -std=c++11 -DFINTEGER=int -fopenmp -I/usr/local/include -I${ASCEND_TOOLKIT_HOME}/acllib/include -I${ASCEND_TOOLKIT_HOME}/runtime/include -fPIC -fstack-protector-all -Wall -Wreturn-type -D_FORTIFY_SOURCE=2 -g -O3 -Wall -Wextra -I${PYTHON_HEADER} -I/usr/local/lib/${PYTHON_VERSION}/dist-packages/numpy/core/include -I${FAISS_INSTALL_PATH}/include -I${MXINDEX_INSTALL_PATH}/include -c swig_ascendfaiss.cpp -o swig_ascendfaiss.o && \ - g++ -std=c++11 -shared -fopenmp -L${ASCEND_TOOLKIT_HOME}/lib64 -L${ASCEND_TOOLKIT_HOME}/acllib/lib64 -L${ASCEND_TOOLKIT_HOME}/runtime/lib64 -L${DRIVER_INSTALL_PATH}/driver/lib64 -L${DRIVER_INSTALL_PATH}/driver/lib64/common -L${DRIVER_INSTALL_PATH}/driver/lib64/driver -L${FAISS_INSTALL_PATH}/lib -L${MXINDEX_INSTALL_PATH}/lib -Wl,-rpath-link=${ASCEND_TOOLKIT_HOME}/acllib/lib64:${ASCEND_TOOLKIT_HOME}/runtime/lib64:${DRIVER_INSTALL_PATH}/driver/lib64:${DRIVER_INSTALL_PATH}/driver/lib64/common:${DRIVER_INSTALL_PATH}/driver/lib64/driver -L/usr/local/lib -Wl,-z,relro -Wl,-z,now -Wl,-z,noexecstack -s -o _swig_ascendfaiss.so swig_ascendfaiss.o -L.. -lascendfaiss -lfaiss -lascend_hal -lc_sec -lacl_op_compiler && \ + swig -python -c++ -Doverride= -module swig_ascendfaiss -I${PYTHON_HEADER} -I${FAISS_INSTALL_PATH}/include -I${MX_INDEX_INSTALL_PATH}/include -DSWIGWORDSIZE64 -o swig_ascendfaiss.cpp swig_ascendfaiss.swig && \ + g++ -std=c++11 -DFINTEGER=int -fopenmp -I/usr/local/include -I${ASCEND_TOOLKIT_HOME}/acllib/include -I${ASCEND_TOOLKIT_HOME}/runtime/include -fPIC -fstack-protector-all -Wall -Wreturn-type -D_FORTIFY_SOURCE=2 -g -O3 -Wall -Wextra -I${PYTHON_HEADER} -I/usr/local/lib/${PYTHON_VERSION}/dist-packages/numpy/core/include -I${FAISS_INSTALL_PATH}/include -I${MX_INDEX_INSTALL_PATH}/include -c swig_ascendfaiss.cpp -o swig_ascendfaiss.o && \ + g++ -std=c++11 -shared -fopenmp -L${ASCEND_TOOLKIT_HOME}/lib64 -L${ASCEND_TOOLKIT_HOME}/acllib/lib64 -L${ASCEND_TOOLKIT_HOME}/runtime/lib64 -L${DRIVER_INSTALL_PATH}/driver/lib64 -L${DRIVER_INSTALL_PATH}/driver/lib64/common -L${DRIVER_INSTALL_PATH}/driver/lib64/driver -L${FAISS_INSTALL_PATH}/lib -L${MX_INDEX_INSTALL_PATH}/lib -Wl,-rpath-link=${ASCEND_TOOLKIT_HOME}/acllib/lib64:${ASCEND_TOOLKIT_HOME}/runtime/lib64:${DRIVER_INSTALL_PATH}/driver/lib64:${DRIVER_INSTALL_PATH}/driver/lib64/common:${DRIVER_INSTALL_PATH}/driver/lib64/driver -L/usr/local/lib -Wl,-z,relro -Wl,-z,now -Wl,-z,noexecstack -s -o _swig_ascendfaiss.so swig_ascendfaiss.o -L.. -lascendfaiss -lfaiss -lascend_hal -lc_sec -lacl_op_compiler && \ ${PYTHON_VERSION} -m build --no-isolation && \ cd dist && pip3 install ascendfaiss*.whl && rm -rf /tmp/mindsdk-referenceapps-master/ \ No newline at end of file -- Gitee From 30bbec77bc99fb8842c1f2a36eae806ab7d5381d Mon Sep 17 00:00:00 2001 From: wwwttt001 Date: Tue, 29 Jul 2025 10:29:46 +0000 Subject: [PATCH 09/10] update RAGSDK/MainRepo/Dockerfile/ubuntu/install.sh. Signed-off-by: wwwttt001 --- RAGSDK/MainRepo/Dockerfile/ubuntu/install.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/RAGSDK/MainRepo/Dockerfile/ubuntu/install.sh b/RAGSDK/MainRepo/Dockerfile/ubuntu/install.sh index 7d3d08f9d..fa43ea6bb 100644 --- a/RAGSDK/MainRepo/Dockerfile/ubuntu/install.sh +++ b/RAGSDK/MainRepo/Dockerfile/ubuntu/install.sh @@ -12,7 +12,7 @@ bash /opt/package/Ascend-cann-toolkit*_linux-${ARCH}.run --install --install-for bash /opt/package/Ascend-cann-kernels*_linux-${ARCH}.run --install --install-for-all --quiet #安装 nnal if [[ $usr_id -eq 0 ]]; then - #bash -c "source /usr/local/Ascend/ascend-toolkit/set_env.sh && bash /opt/package/Ascend-cann-nnal*_linux-${ARCH}.run --install --quiet" + bash -c "source /usr/local/Ascend/ascend-toolkit/set_env.sh && bash /opt/package/Ascend-cann-nnal*_linux-${ARCH}.run --install --quiet" commands=("source /usr/local/Ascend/ascend-toolkit/set_env.sh" "source /usr/local/Ascend/nnal/atb/set_env.sh" "export ASCEND_VERSION=/usr/local/Ascend/ascend-toolkit/latest" "export ASCEND_HOME=/usr/local/Ascend") for cmd in "${commands[@]}"; @@ -32,7 +32,7 @@ if [[ $usr_id -eq 0 ]]; then cd /usr/local/Ascend/mxIndex/ops && ./custom_opp_${ARCH}.run && mkdir -p ${MX_INDEX_MODELPATH} else - #bash -c "source /home/HwHiAiUser/Ascend/ascend-toolkit/set_env.sh && bash /opt/package/Ascend-cann-nnal*_linux-${ARCH}.run --install --quiet" + bash -c "source /home/HwHiAiUser/Ascend/ascend-toolkit/set_env.sh && bash /opt/package/Ascend-cann-nnal*_linux-${ARCH}.run --install --quiet" commands=("source /home/HwHiAiUser/Ascend/ascend-toolkit/set_env.sh" "source /home/HwHiAiUser/Ascend/nnal/atb/set_env.sh" "export ASCEND_HOME=/home/HwHiAiUser/Ascend" "export ASCEND_VERSION=/home/HwHiAiUser/Ascend/ascend-toolkit/latest") for cmd in "${commands[@]}"; do @@ -62,6 +62,6 @@ rm -rf /tmp/mindsdk-referenceapps-master && unzip -d /tmp /opt/package/master.zi cd /tmp/mindsdk-referenceapps-master/IndexSDK/faiss-python && \ swig -python -c++ -Doverride= -module swig_ascendfaiss -I${PYTHON_HEADER} -I${FAISS_INSTALL_PATH}/include -I${MX_INDEX_INSTALL_PATH}/include -DSWIGWORDSIZE64 -o swig_ascendfaiss.cpp swig_ascendfaiss.swig && \ g++ -std=c++11 -DFINTEGER=int -fopenmp -I/usr/local/include -I${ASCEND_TOOLKIT_HOME}/acllib/include -I${ASCEND_TOOLKIT_HOME}/runtime/include -fPIC -fstack-protector-all -Wall -Wreturn-type -D_FORTIFY_SOURCE=2 -g -O3 -Wall -Wextra -I${PYTHON_HEADER} -I/usr/local/lib/${PYTHON_VERSION}/dist-packages/numpy/core/include -I${FAISS_INSTALL_PATH}/include -I${MX_INDEX_INSTALL_PATH}/include -c swig_ascendfaiss.cpp -o swig_ascendfaiss.o && \ - g++ -std=c++11 -shared -fopenmp -L${ASCEND_TOOLKIT_HOME}/lib64 -L${ASCEND_TOOLKIT_HOME}/acllib/lib64 -L${ASCEND_TOOLKIT_HOME}/runtime/lib64 -L${DRIVER_INSTALL_PATH}/driver/lib64 -L${DRIVER_INSTALL_PATH}/driver/lib64/common -L${DRIVER_INSTALL_PATH}/driver/lib64/driver -L${FAISS_INSTALL_PATH}/lib -L${MX_INDEX_INSTALL_PATH}/lib -Wl,-rpath-link=${ASCEND_TOOLKIT_HOME}/acllib/lib64:${ASCEND_TOOLKIT_HOME}/runtime/lib64:${DRIVER_INSTALL_PATH}/driver/lib64:${DRIVER_INSTALL_PATH}/driver/lib64/common:${DRIVER_INSTALL_PATH}/driver/lib64/driver -L/usr/local/lib -Wl,-z,relro -Wl,-z,now -Wl,-z,noexecstack -s -o _swig_ascendfaiss.so swig_ascendfaiss.o -L.. -lascendfaiss -lfaiss -lascend_hal -lc_sec -lacl_op_compiler && \ + g++ -std=c++11 -shared -fopenmp -L${ASCEND_TOOLKIT_HOME}/lib64 -L${ASCEND_TOOLKIT_HOME}/acllib/lib64 -L${ASCEND_TOOLKIT_HOME}/runtime/lib64 -L${DRIVER_INSTALL_PATH}/driver/lib64 -L${DRIVER_INSTALL_PATH}/driver/lib64/common -L${DRIVER_INSTALL_PATH}/driver/lib64/driver -L${FAISS_INSTALL_PATH}/lib -L${MX_INDEX_INSTALL_PATH}/lib -Wl,-rpath-link=${ASCEND_TOOLKIT_HOME}/acllib/lib64:${ASCEND_TOOLKIT_HOME}/runtime/lib64:${DRIVER_INSTALL_PATH}/driver/lib64:${DRIVER_INSTALL_PATH}/driver/lib64/common:${DRIVER_INSTALL_PATH}/driver/lib64/driver -L/usr/local/lib -Wl,-z,relro -Wl,-z,now -Wl,-z,noexecstack -s -o _swig_ascendfaiss.so swig_ascendfaiss.o -L.. -lascendfaiss -lfaiss -lascend_hal -lc_sec && \ ${PYTHON_VERSION} -m build --no-isolation && \ cd dist && pip3 install ascendfaiss*.whl && rm -rf /tmp/mindsdk-referenceapps-master/ \ No newline at end of file -- Gitee From 03475795853bc1a97dba76fe6d9edd9b9e7823cc Mon Sep 17 00:00:00 2001 From: wwwttt001 Date: Tue, 29 Jul 2025 10:32:33 +0000 Subject: [PATCH 10/10] update RAGSDK/MainRepo/Dockerfile/ubuntu/Dockerfile. Signed-off-by: wwwttt001 --- RAGSDK/MainRepo/Dockerfile/ubuntu/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RAGSDK/MainRepo/Dockerfile/ubuntu/Dockerfile b/RAGSDK/MainRepo/Dockerfile/ubuntu/Dockerfile index d973888e5..f8cb4ef61 100644 --- a/RAGSDK/MainRepo/Dockerfile/ubuntu/Dockerfile +++ b/RAGSDK/MainRepo/Dockerfile/ubuntu/Dockerfile @@ -88,7 +88,7 @@ RUN pip3 install torch-npu=="${TORCH_VERSION}".post8 COPY ./package/Ascend-mindxsdk-mxrag_*_linux-${ARCH}.run /tmp/ RUN bash /tmp/Ascend-mindxsdk-mxrag_*_linux-${ARCH}.run --install --install-path=/usr/local/Ascend --quiet --platform=${PLATFORM} RUN pip3 install -r /usr/local/Ascend/mxRag/requirements.txt - +RUN pip3 install torch-npu=="${TORCH_VERSION}".post12 pymilvus==2.5.12 # 安装mxrag第三方依赖 RUN pip3 install ragas==0.1.9 rank_bm25==0.2.2 readability_lxml==0.8.1 html_text==0.6.2 gradio==3.50.2 streamlit #清理临时目录 -- Gitee