Fix

PaddlePaddle · Feb 12, 2025 · 4b12401 · 4b12401
1 parent c86d64c
commit 4b12401
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 8 deletions.
diff --git a/cmake/cinn.cmake b/cmake/cinn.cmake
@@ -177,6 +177,7 @@ cinn_cc_library(
   ginac
   op_fusion
   cinn_op_dialect
+  python
   ${jitify_deps})
 add_dependencies(cinnapi GEN_LLVM_RUNTIME_IR_HEADER ZLIB::ZLIB)
 add_dependencies(cinnapi GEN_LLVM_RUNTIME_IR_HEADER ${core_deps})

diff --git a/tools/dockerfile/Dockerfile.ubuntu20 b/tools/dockerfile/Dockerfile.ubuntu20
@@ -190,7 +190,7 @@ RUN apt-get install pkg-config -y
 RUN apt-get update &&\
     apt install -y clang-12
 
-ARG CC=/usr/bin/clang-12 
+ARG CC=/usr/bin/clang-12
 ARG CXX=/usr/bin/clang++-12
 
 # ccache 4.2.0

diff --git a/tools/dockerfile/Dockerfile.ubuntu22 b/tools/dockerfile/Dockerfile.ubuntu22
@@ -171,4 +171,4 @@ RUN python3.8  -m pip --no-cache-dir install -r  /root/requirements.txt && \
 RUN apt-get update &&\
     apt install -y clang-14
 
-EXPOSE 22
+EXPOSE 22
diff --git a/tools/dockerfile/Dockerfile.ubuntu24 b/tools/dockerfile/Dockerfile.ubuntu24
@@ -75,7 +75,7 @@ RUN python3.13t get-pip.py && \
   mv /usr/local/bin/pip3.13 /usr/local/bin/pip3.13t && \
   python3.13 get-pip.py
 
-RUN python -m pip config set global.break-system-packages true 
+RUN python -m pip config set global.break-system-packages true
 
 RUN python3.8 -m pip install setuptools==50.3.2 && \
     python3.9 -m pip install setuptools==50.3.2 && \
@@ -167,4 +167,4 @@ RUN python3.8  -m pip --no-cache-dir install -r  /root/requirements.txt && \
 RUN apt-get update &&\
     apt install -y clang-14
 
-EXPOSE 22
+EXPOSE 22
diff --git a/tools/dockerfile/ci_dockerfile.sh b/tools/dockerfile/ci_dockerfile.sh
@@ -61,7 +61,7 @@ function make_ce_framework_dockerfile(){
   sed -i "${dockerfile_line}i RUN wget --no-check-certificate -q https://paddle-edl.bj.bcebos.com/hadoop-2.7.7.tar.gz \&\& \
      tar -xzf  hadoop-2.7.7.tar.gz && mv hadoop-2.7.7 /usr/local/" ${dockerfile_name}
   sed -i "${dockerfile_line}i RUN apt-get update && apt install -y zstd pigz libcurl4-openssl-dev gettext ninja-build" ${dockerfile_name}
-  sed -i "${dockerfile_line}i RUN pip3.10 install wheel distro" ${dockerfile_name}
+  sed -i "${dockerfile_line}i RUN pip3.10 install wheel distro jinja2" ${dockerfile_name}
   sed -i "${dockerfile_line}i RUN pip3.10 install nvidia-cuda-cupti-cu11==11.8.87 nvidia-cuda-runtime-cu11==11.8.89 nvidia-cudnn-cu11==8.7.0.84 nvidia-cublas-cu11==11.11.3.6 nvidia-cufft-cu11==10.9.0.58 nvidia-curand-cu11==10.3.0.86 nvidia-cusolver-cu11==11.4.1.48 nvidia-cusparse-cu11==11.7.5.86 nvidia-nccl-cu11==2.19.3" ${dockerfile_name}
   sed -i 's#RUN bash /build_scripts/install_trt.sh#RUN bash /build_scripts/install_trt.sh trt8531#g' ${dockerfile_name}
 

diff --git a/tools/dockerfile/ubuntu22_dev.sh b/tools/dockerfile/ubuntu22_dev.sh
@@ -37,6 +37,6 @@ function base_image(){
 }
 
 export ref_CUDA_MAJOR=12.3
-base_image 
+base_image
 export ref_CUDA_MAJOR=12.4
-base_image 
+base_image
diff --git a/tools/dockerfile/ubuntu24_dev.sh b/tools/dockerfile/ubuntu24_dev.sh
@@ -43,4 +43,4 @@ function base_image(){
 export ref_CUDA_MAJOR=cpu
 base_image
 export ref_CUDA_MAJOR=12.6
-base_image 
+base_image