Merge pull request PaddlePaddle#51 from mthreads/caizhi_ci

[MTAI-484] fix(ci): fix ci

Jenkinsfile

@@ -54,7 +54,7 @@ pipeline {
             sh """#!/bin/bash
             cd ${env.paddle_musa_working_dir}
             git config --global --add safe.directory "*"
-            BRANCH=origin/develop /bin/bash tools/codestyle/pre_commit.sh
+            /opt/conda/condabin/conda run -n py38 --no-capture-output BRANCH=origin/develop /bin/bash tools/codestyle/pre_commit.sh
             #git diff --name-only origin/develop..HEAD | xargs pre-commit run --files
             """
         }

docker/Dockerfile.conda.musa

@@ -42,11 +42,6 @@ ENV PATH=/opt/cmake-3.16/bin:${PATH}
 ARG MUSA_TOOLKITS_URL
 ARG MUDNN_URL
 
-# clang-format 3.8
-RUN wget https://paddle-ci.cdn.bcebos.com/clang+llvm-3.8.0-x86_64-linux-gnu-ubuntu-16.04.tar.xz && \ 
-    tar xf clang+llvm-3.8.0-x86_64-linux-gnu-ubuntu-16.04.tar.xz && cd clang+llvm-3.8.0-x86_64-linux-gnu-ubuntu-16.04 && \
-    cp -r * /usr/local && cd .. && rm -rf clang+llvm-3.8.0-x86_64-linux-gnu-ubuntu-16.04 && rm -rf clang+llvm-3.8.0-x86_64-linux-gnu-ubuntu-16.04.tar.xz 
-
 # MUSA deps
 RUN wget --no-check-certificate ${MUSA_TOOLKITS_URL} -O /root/musa_toolkits_install.tar.gz && \
     cd /root && \
@@ -85,8 +80,8 @@ RUN mkdir /opt/conda && ./${CONDA_FILE} -b -f -p "/opt/conda" && rm -rf ${CONDA_
 ENV PATH=/opt/conda/bin:${PATH}
 RUN conda init bash
 
-# install pylint and pre-commit
-RUN /opt/conda/bin/pip install pre-commit pylint pytest astroid
+# install pylint clang-format cpplint and pre-commit
+RUN /opt/conda/bin/pip install pre-commit pylint pytest astroid clang-format==13.0.0 cpplint==1.6.0 -i https://pypi.tuna.tsinghua.edu.cn/simple
 
 # install Paddle requirement
 RUN wget https://raw.githubusercontent.com/PaddlePaddle/Paddle/develop/python/requirements.txt -O /root/requirements.txt

docker/Dockerfile.musa

@@ -84,9 +84,9 @@ RUN pip3.7 --no-cache-dir install --upgrade pip && \
     pip3.8 --no-cache-dir install --upgrade pip && \
     pip3.9 --no-cache-dir install --upgrade pip
 
-RUN pip3.7 --no-cache-dir install pre-commit==2.17.0 pylint==2.12.0 cpplint==1.6.0 && \
-    pip3.8 --no-cache-dir install pre-commit==2.17.0 pylint==2.12.0 cpplint==1.6.0 && \
-    pip3.9 --no-cache-dir install pre-commit==2.17.0 pylint==2.12.0 cpplint==1.6.0
+RUN pip3.7 --no-cache-dir install pre-commit==2.17.0 pylint==2.12.0 cpplint==1.6.0 clang-format==13.0.0 && \
+    pip3.8 --no-cache-dir install pre-commit==2.17.0 pylint==2.12.0 cpplint==1.6.0 clang-format==13.0.0  && \
+    pip3.9 --no-cache-dir install pre-commit==2.17.0 pylint==2.12.0 cpplint==1.6.0 clang-format==13.0.0 
 
 # install Paddle requirements
 RUN wget https://raw.githubusercontent.com/PaddlePaddle/Paddle/develop/python/requirements.txt -O /root/requirements.txt
@@ -101,11 +101,6 @@ RUN pip3.7 --no-cache-dir install -r /root/requirements.txt -i https://pypi.tuna
     pip3.9 --no-cache-dir install -r /root/requirements.txt -i https://pypi.tuna.tsinghua.edu.cn/simple && \
     rm -rf /root/requirements.txt
 
-# clang-format 3.8
-RUN wget https://paddle-ci.cdn.bcebos.com/clang+llvm-3.8.0-x86_64-linux-gnu-ubuntu-16.04.tar.xz && \ 
-    tar xf clang+llvm-3.8.0-x86_64-linux-gnu-ubuntu-16.04.tar.xz && cd clang+llvm-3.8.0-x86_64-linux-gnu-ubuntu-16.04 && \
-    cp -r * /usr/local && cd .. && rm -rf clang+llvm-3.8.0-x86_64-linux-gnu-ubuntu-16.04 && rm -rf clang+llvm-3.8.0-x86_64-linux-gnu-ubuntu-16.04.tar.xz 
-
 # ccache 3.7.9
 RUN cd /opt && wget https://paddle-ci.gz.bcebos.com/ccache-3.7.9.tar.gz && \
     tar xf ccache-3.7.9.tar.gz && mkdir /usr/local/ccache-3.7.9 && cd ccache-3.7.9 && \

paddle/phi/kernels/impl/conv_cudnn_impl.h

@@ -19,7 +19,7 @@
 #include "paddle/phi/core/kernel_registry.h"
 #ifdef PADDLE_WITH_HIP
 #include "paddle/phi/kernels/gpudnn/conv_miopen_helper.h"
-#else
+#elif defined(PADDLE_WITH_CUDA)
 #include "paddle/phi/kernels/gpudnn/conv_cudnn_v7.h"
 #endif