ci(cinn): update cinn ci to support dynamic shape (#58996)

6clc · web-flow · commit 9ffb77ad6fbf · 2023-11-30T09:43:23.000+08:00
* test=cinnunit

* test=cinnunit

* test=cinnunit

* test=cinnunit
diff --git a/cmake/cinn.cmake b/cmake/cinn.cmake
@@ -168,8 +168,8 @@ cinn_cc_library(
 add_dependencies(cinnapi GEN_LLVM_RUNTIME_IR_HEADER ZLIB::ZLIB)
 add_dependencies(cinnapi GEN_LLVM_RUNTIME_IR_HEADER ${core_deps})
 if(NOT CINN_ONLY)
-  target_link_libraries(cinnapi op_dialect_vjp phi)
-  add_dependencies(cinnapi op_dialect_vjp phi)
+  target_link_libraries(cinnapi op_dialect phi)
+  add_dependencies(cinnapi op_dialect phi)
 endif()
 
 target_link_libraries(cinnapi ${PYTHON_LIBRARIES})
@@ -231,8 +231,8 @@ function(gen_cinncore LINKTYPE)
   add_dependencies(${CINNCORE_TARGET} GEN_LLVM_RUNTIME_IR_HEADER ZLIB::ZLIB)
   add_dependencies(${CINNCORE_TARGET} GEN_LLVM_RUNTIME_IR_HEADER ${core_deps})
   if(NOT CINN_ONLY)
-    target_link_libraries(${CINNCORE_TARGET} op_dialect_vjp phi)
-    add_dependencies(${CINNCORE_TARGET} op_dialect_vjp phi)
+    target_link_libraries(${CINNCORE_TARGET} op_dialect phi)
+    add_dependencies(${CINNCORE_TARGET} op_dialect phi)
   endif()
 
   add_dependencies(${CINNCORE_TARGET} pybind)
diff --git a/paddle/fluid/framework/new_executor/instruction/cinn_jit_instruction.cc b/paddle/fluid/framework/new_executor/instruction/cinn_jit_instruction.cc
@@ -18,9 +18,12 @@
 #include "paddle/cinn/hlir/dialect/runtime/ir/runtime_dialect.h"
 #include "paddle/cinn/hlir/framework/instruction.h"
 #include "paddle/cinn/hlir/framework/pir_compiler.h"
-#include "paddle/cinn/runtime/cuda/cuda_util.h"
 #include "paddle/fluid/framework/new_executor/pir_adaptor/pir_adaptor_util.h"
 #include "paddle/fluid/framework/paddle2cinn/transform_type.h"
+#include "paddle/phi/core/errors.h"
+#if defined(PADDLE_WITH_CUDA)
+#include "paddle/cinn/runtime/cuda/cuda_util.h"
+#endif
 
 namespace paddle {
 namespace framework {
@@ -39,6 +42,7 @@ class CinnJitInstruction::FnPtrImpl {
       func_args_.push_back(ptr_storage_.data() + i);
     }
 
+#if defined(PADDLE_WITH_CUDA)
     CUDA_DRIVER_CALL(
         cuLaunchKernel(static_cast<CUfunction>(cuda_jit_info_.fn_ptr),
                        cuda_jit_info_.grid_dims[0],
@@ -51,6 +55,7 @@ class CinnJitInstruction::FnPtrImpl {
                        static_cast<CUstream>(stream),
                        func_args_.data(),
                        nullptr))
+#endif
   }
 
  private:
@@ -108,6 +113,7 @@ CinnJitInstruction::CinnJitInstruction(
 }
 
 void CinnJitInstruction::Run() {
+#if defined(PADDLE_WITH_CUDA)
   auto gpu_ctx = static_cast<phi::GPUContext*>(dev_ctx_);
 
   auto stream = gpu_ctx->stream();
@@ -116,6 +122,12 @@ void CinnJitInstruction::Run() {
   }
 
   fn_ptr_impl_->Run(tensor_args_, static_cast<void*>(stream));
+#endif
+
+#ifndef PADDLE_WITH_CUDA
+  VLOG(phi::FATAL) << "Not Supported: cinn jit instruction currently does not "
+                      "support non-CUDakernel";
+#endif
 }
 
 const std::string& CinnJitInstruction::Name() const {
diff --git a/paddle/fluid/operators/cinn/cinn_launch_op.cc b/paddle/fluid/operators/cinn/cinn_launch_op.cc
@@ -25,7 +25,9 @@
 #include "paddle/phi/core/flags.h"
 #include "paddle/phi/core/generator.h"
 
+#if defined(PADDLE_WITH_CUDA)
 PHI_DECLARE_bool(cudnn_deterministic);
+#endif
 
 namespace paddle {
 namespace operators {
@@ -84,9 +86,11 @@ void LaunchCinnExecution(const CinnCompiledObject& compiled_obj,
 }
 
 void SetCinnRuntimeFlags() {
+#if defined(PADDLE_WITH_CUDA)
   VLOG(4) << "Set FLAGS_cinn_cudnn_deterministic to "
           << FLAGS_cudnn_deterministic;
   ::cinn::runtime::SetCinnCudnnDeterministic(FLAGS_cudnn_deterministic);
+#endif
 }
 
 template <>
diff --git a/tools/cinn/build.sh b/tools/cinn/build.sh
@@ -16,7 +16,7 @@
 
 set -ex
 workspace=$(cd $(dirname ${BASH_SOURCE[0]})/../..; pwd)
-build_dir_name=${cinn_build:-build_cinn}
+build_dir_name=${cinn_build:-build}
 build_dir=$workspace/${build_dir_name}
 py_version=${py_version:-3.10}
 cinn_whl_path=python/dist/cinn-0.0.0-py3-none-any.whl
@@ -103,8 +103,8 @@ function cmake_ {
 function _download_and_untar {
     local tar_file=$1
     if [[ ! -f $tar_file ]]; then
-        wget https://paddle-inference-dist.bj.bcebos.com/CINN/$tar_file
-        tar -zxvf $tar_file
+        wget -q https://paddle-inference-dist.bj.bcebos.com/CINN/$tar_file
+        tar -zxf $tar_file
     fi
 }
 
@@ -119,6 +119,15 @@ function prepare_model {
     _download_and_untar SqueezeNet.tar.gz
     _download_and_untar FaceDet.tar.gz
 
+
+    mkdir -p $build_dir/third_party/model
+    cd $build_dir/third_party/model
+    tar_file="lite_naive_model.tar.gz"
+    if [[ ! -f $tar_file ]]; then
+        wget -q https://paddle-inference-dist.bj.bcebos.com/$tar_file
+        tar -zxf $tar_file
+    fi
+
     proxy_on
     mkdir -p $build_dir/paddle
     cd $build_dir/third_party
diff --git a/tools/cinn/docker/Dockerfile.ci.cuda b/tools/cinn/docker/Dockerfile.ci.cuda
@@ -1,10 +1,5 @@
 # Use SHA to specify the docker image to prevent the use of old cache images
 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/
-RUN apt-key adv --keyserver-options http-proxy=$http_proxy --fetch-keys https://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
+COPY tools/dockerfile/build_scripts /build_scripts
+RUN bash /build_scripts/install_cudnn.sh cudnn860
