diff --git a/tools/cinn/build.sh b/tools/cinn/build.sh index 9c7fb660f979b6c6ab8f449ee784f80af157f0d4..7e3ab25b72e488af975062fbf359fe5c37012f06 100755 --- a/tools/cinn/build.sh +++ b/tools/cinn/build.sh @@ -45,17 +45,6 @@ function gpu_on { cudnn_config=ON } -function test_doc { - mkdir -p $build_dir - cd $build_dir - export runtime_include_dir=$workspace/paddle/cinn/runtime/cuda - - prepare_ci - cmake_ - build - make_doc -} - function cudnn_off { cudnn_config=OFF } @@ -93,25 +82,7 @@ function prepare_ci { return fi - # 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/ - set +x - apt-key adv --keyserver-options http-proxy=$http_proxy --fetch-keys http://developer.download.nvidia.com/compute/cuda/repos/ubuntu1804/x86_64/3bf863cc.pub - set -x - - apt update echo "the current user EUID=$EUID: $(whoami)" - if ! command -v doxygen &> /dev/null; then - apt install -y doxygen - fi - - if ! command -v python${py_version}-config &> /dev/null; then - apt install -y python${py_version}-dev - fi - - if ! command -v virtualenv &> /dev/null; then - apt install -y virtualenv - fi if [[ ! -e $build_dir/ci-env/bin/activate ]]; then virtualenv ${build_dir}/ci-env -p python${py_version} @@ -119,8 +90,6 @@ function prepare_ci { source $build_dir/ci-env/bin/activate python${py_version} -m pip install -U --no-cache-dir pip - python${py_version} -m pip install pre-commit - python${py_version} -m pip install clang-format==13.0.0 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 @@ -220,14 +189,11 @@ function CI { export runtime_include_dir=$workspace/paddle/cinn/runtime/cuda prepare_ci -# codestyle_check - cmake_ build run_demo prepare_model run_test - # make_doc } function CINNRT { @@ -236,7 +202,6 @@ function CINNRT { export runtime_include_dir=$workspace/paddle/cinn/runtime/cuda prepare_ci - # codestyle_check proxy_off mkdir -p $build_dir diff --git a/tools/cinn/docker/Dockerfile.ci b/tools/cinn/docker/Dockerfile.ci index bc15c3e8d2ba2d39ee653b8595395f3fedccb24a..950874991275939ef4242b125fc67602d8642854 100644 --- a/tools/cinn/docker/Dockerfile.ci +++ b/tools/cinn/docker/Dockerfile.ci @@ -1,3 +1,11 @@ # 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 + +# 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/ +RUN apt-key adv --keyserver-options http-proxy=$http_proxy --fetch-keys http://developer.download.nvidia.com/compute/cuda/repos/ubuntu1804/x86_64/3bf863cc.pub +RUN apt update +RUN if ! command -v virtualenv &> /dev/null; then \ + apt install -y virtualenv; \ + fi diff --git a/tools/cinn/docker/Dockerfile.ci.cuda b/tools/cinn/docker/Dockerfile.ci.cuda index bc15c3e8d2ba2d39ee653b8595395f3fedccb24a..950874991275939ef4242b125fc67602d8642854 100755 --- a/tools/cinn/docker/Dockerfile.ci.cuda +++ b/tools/cinn/docker/Dockerfile.ci.cuda @@ -1,3 +1,11 @@ # 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 + +# 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/ +RUN apt-key adv --keyserver-options http-proxy=$http_proxy --fetch-keys http://developer.download.nvidia.com/compute/cuda/repos/ubuntu1804/x86_64/3bf863cc.pub +RUN apt update +RUN if ! command -v virtualenv &> /dev/null; then \ + apt install -y virtualenv; \ + fi