fix /usr/lib/x86_64-linux-gnu/libcudnn.so (#59193)

tianshuo78520a · web-flow · commit f53d6ef20f0b · 2023-11-23T10:38:56.000+08:00
* fix /usr/lib/x86_64-linux-gnu/libcudnn.so

* update gpups cudnn docker

* del test
diff --git a/tools/dockerfile/build_scripts/install_cudnn.sh b/tools/dockerfile/build_scripts/install_cudnn.sh
@@ -82,6 +82,7 @@ elif [[ "$1" == "cudnn896" && "$VERSION" == "12.0" ]]; then
   tar xJvf cudnn-linux-x86_64-8.9.6.50_cuda12-archive.tar.xz && \
   cd cudnn-linux-x86_64-8.9.6.50_cuda12-archive && \
   cp -r include /usr && \
+  cp -r lib/libcudnn* /usr/lib/x86_64-linux-gnu && \
   cp -r lib /usr && cd ../ && \
   rm -f cudnn-linux-x86_64-8.9.6.50_cuda12-archive.tar.xz && \
   rm -rf cudnn-linux-x86_64-8.9.6.50_cuda12-archive
diff --git a/tools/dockerfile/ci_dockerfile.sh b/tools/dockerfile/ci_dockerfile.sh
@@ -118,7 +118,7 @@ function make_unbuntu20_cu12_dockerfile(){
     make -j8 \&\& make install " ${dockerfile_name}
   sed -i "${dockerfile_line}i RUN pip install wheel \&\& pip3 install PyGithub wheel distro \&\& pip3.8 install distro" ${dockerfile_name}
   sed -i 's# && rm /etc/apt/sources.list.d/nvidia-ml.list##g' ${dockerfile_name}
-  sed -i 's#RUN bash /build_scripts/install_cudnn.sh cudnn841#RUN bash /build_scripts/install_cudnn.sh cudnn896#g' ${dockerfile_name}
+  sed -i 's#RUN bash /build_scripts/install_cudnn.sh cudnn841#RUN bash /build_scripts/install_cudnn.sh cudnn896 #g' ${dockerfile_name}
 }
 
 
diff --git a/tools/gpups_test.sh b/tools/gpups_test.sh
@@ -42,7 +42,6 @@ parallel_list="^init_phi_test$|\
 ^test_conv1d_layer$|\
 ^test_conv1d_transpose_layer$|\
 ^test_conv2d_api$|\
-^test_conv2d_fusion_op$|\
 ^test_conv2d_layer$|\
 ^test_conv2d_op_depthwise_conv$|\
 ^test_conv2d_transpose_layer$|\

Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,7 @@ function make_unbuntu20_cu12_dockerfile(){`
`118`	`118`	`make -j8 \&\& make install " ${dockerfile_name}`
`119`	`119`	`sed -i "${dockerfile_line}i RUN pip install wheel \&\& pip3 install PyGithub wheel distro \&\& pip3.8 install distro" ${dockerfile_name}`
`120`	`120`	`sed -i 's# && rm /etc/apt/sources.list.d/nvidia-ml.list##g' ${dockerfile_name}`
`121`		`- sed -i 's#RUN bash /build_scripts/install_cudnn.sh cudnn841#RUN bash /build_scripts/install_cudnn.sh cudnn896#g' ${dockerfile_name}`
	`121`	`+ sed -i 's#RUN bash /build_scripts/install_cudnn.sh cudnn841#RUN bash /build_scripts/install_cudnn.sh cudnn896 #g' ${dockerfile_name}`
`122`	`122`	`}`
`123`	`123`
`124`	`124`