From 842f56e4a90692d81846025c346e6dcc8562a263 Mon Sep 17 00:00:00 2001
From: tianshuo78520a <707759223@qq.com>
Date: Thu, 3 Aug 2023 10:55:09 +0800
Subject: [PATCH] Update cinn docker (#55888)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

更新CINN docker，CI使用Ubuntu20.04,CUDA18,Python3.10环境
---
 tools/cinn/build.sh                  | 4 ++--
 tools/cinn/docker/Dockerfile.ci      | 3 +--
 tools/cinn/docker/Dockerfile.ci.cuda | 3 +--
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/tools/cinn/build.sh b/tools/cinn/build.sh
index 7e3ab25b72e..6f55f185efe 100755
--- a/tools/cinn/build.sh
+++ b/tools/cinn/build.sh
@@ -18,7 +18,7 @@ set -ex
 workspace=$(cd $(dirname ${BASH_SOURCE[0]})/../..; pwd)
 build_dir_name=${cinn_build:-build_cinn}
 build_dir=$workspace/${build_dir_name}
-py_version=${py_version:-3.8}
+py_version=${py_version:-3.10}
 cinn_whl_path=python/dist/cinn-0.0.0-py3-none-any.whl
 
 
@@ -92,7 +92,7 @@ function prepare_ci {
   python${py_version} -m pip install -U --no-cache-dir pip
   python${py_version} -m pip install wheel
   python${py_version} -m pip install sphinx==3.3.1 sphinx_gallery==0.8.1 recommonmark==0.6.0 exhale scipy breathe==4.24.0 matplotlib sphinx_rtd_theme
-  python${py_version} -m pip install paddlepaddle-gpu==0.0.0.post112 -f https://www.paddlepaddle.org.cn/whl/linux/gpu/develop.html
+  python${py_version} -m pip install paddlepaddle-gpu==0.0.0.post118 -f https://www.paddlepaddle.org.cn/whl/linux/gpu/develop.html
 }
 
 
diff --git a/tools/cinn/docker/Dockerfile.ci b/tools/cinn/docker/Dockerfile.ci
index 95087499127..53e1bbf64ec 100644
--- a/tools/cinn/docker/Dockerfile.ci
+++ b/tools/cinn/docker/Dockerfile.ci
@@ -1,6 +1,5 @@
 # Use SHA to specify the docker image to prevent the use of old cache images
-# TAG: latest-dev-cuda11.2-cudnn8.2-trt8.0-gcc82
-FROM registry.baidubce.com/paddlepaddle/paddle@sha256:ac757bc25c341814284ceafb274c55e36ea7dcf026a265d14f885a0fa60368f8
+FROM registry.baidubce.com/paddlepaddle/paddle:latest-dev-cuda11.8-cudnn8.6-trt8.5-gcc82 
 
 # NVIDIA update GPG key on 04/29/2022. Fetch the public key for CI machine
 # Reference: https://developer.nvidia.com/blog/updating-the-cuda-linux-gpg-repository-key/
diff --git a/tools/cinn/docker/Dockerfile.ci.cuda b/tools/cinn/docker/Dockerfile.ci.cuda
index 95087499127..c91ecbb3641 100755
--- a/tools/cinn/docker/Dockerfile.ci.cuda
+++ b/tools/cinn/docker/Dockerfile.ci.cuda
@@ -1,6 +1,5 @@
 # Use SHA to specify the docker image to prevent the use of old cache images
-# TAG: latest-dev-cuda11.2-cudnn8.2-trt8.0-gcc82
-FROM registry.baidubce.com/paddlepaddle/paddle@sha256:ac757bc25c341814284ceafb274c55e36ea7dcf026a265d14f885a0fa60368f8
+FROM registry.baidubce.com/paddlepaddle/paddle:latest-dev-cuda11.8-cudnn8.6-trt8.5-gcc82
 
 # NVIDIA update GPG key on 04/29/2022. Fetch the public key for CI machine
 # Reference: https://developer.nvidia.com/blog/updating-the-cuda-linux-gpg-repository-key/
-- 
GitLab