update

zz002 · Sep 13, 2024 · beeaf2f · beeaf2f
1 parent 223a0c3
commit beeaf2f
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/cmake/onnxruntime_providers_vitisai.cmake b/cmake/onnxruntime_providers_vitisai.cmake
@@ -12,6 +12,7 @@
   file(GLOB onnxruntime_providers_vitisai_cc_srcs CONFIGURE_DEPENDS
     "${ONNXRUNTIME_ROOT}/core/providers/vitisai/*.cc"
     "${ONNXRUNTIME_ROOT}/core/providers/vitisai/*.h"
+    "${ONNXRUNTIME_ROOT}/core/providers/vitisai/include/vaip/*.h"
     "${ONNXRUNTIME_ROOT}/core/providers/vitisai/imp/*.cc"
     "${ONNXRUNTIME_ROOT}/core/providers/vitisai/imp/*.h"
     "${ONNXRUNTIME_ROOT}/core/providers/shared_library/*.h"

diff --git a/onnxruntime/core/providers/vitisai/include/vaip/custom_op.h b/onnxruntime/core/providers/vitisai/include/vaip/custom_op.h
@@ -25,6 +25,7 @@ class ExecutionProvider {
   virtual DllSafe<std::vector<std::string>> get_meta_def_nodes() const = 0;
   virtual DllSafe<std::vector<std::string>>
   get_meta_def_constant_initializer() const = 0;
+  virtual bool get_meta_def_fallback_CPU() const = 0;
   virtual std::unique_ptr<CustomOp> compile() const = 0;
 
  public:
@@ -44,7 +45,7 @@ class CustomOp {
   VAIP_DLL_SPEC virtual ~CustomOp();
 
  public:
-  virtual void Compute_base(const OrtApi* api, OrtKernelContext* context) const = 0;
+  virtual void Compute(const OrtApi* api, OrtKernelContext* context) const = 0;
 };
 
 }  // namespace vaip_core
diff --git a/onnxruntime/core/providers/vitisai/include/vaip/vaip_ort_api.h b/onnxruntime/core/providers/vitisai/include/vaip/vaip_ort_api.h
@@ -13,7 +13,7 @@ struct OrtApi;
 
 namespace vaip_core {
 
-#define VAIP_ORT_API_MAJOR (9u)
+#define VAIP_ORT_API_MAJOR (10u)
 #define VAIP_ORT_API_MINOR (0u)
 #define VAIP_ORT_API_PATCH (0u)
 struct OrtApiForVaip {

diff --git a/onnxruntime/core/providers/vitisai/vitisai_execution_provider.cc b/onnxruntime/core/providers/vitisai/vitisai_execution_provider.cc
@@ -78,7 +78,7 @@ common::Status VitisAIExecutionProvider::Compile(const std::vector<FusedNodeAndG
     size_t index = attrs.at("index").i();
     auto& ep = (**this->execution_providers_)[index];
     ep->set_fused_node(&fused_node_graph.fused_node.get());
-    {
+    if (ep->get_meta_def_fallback_CPU()) {
       auto& subgraph = fused_node_graph.filtered_graph.get();
       auto& logger = logging::LoggingManager::DefaultLogger();
       auto model_proto = subgraph.CreateModel(logger)->ToProto();
@@ -99,7 +99,7 @@ common::Status VitisAIExecutionProvider::Compile(const std::vector<FusedNodeAndG
       }
     };
     compute_info.compute_func = [](FunctionState state, const OrtApi* api, OrtKernelContext* context) {
-      reinterpret_cast<vaip_core::CustomOp*>(state)->Compute_base(api, context);
+      reinterpret_cast<vaip_core::CustomOp*>(state)->Compute(api, context);
       return Status::OK();
     };
     node_compute_funcs.push_back(compute_info);