implement API

Author: hseok-oh

runtime/onert/api/nnfw/include/nnfw_experimental.h

@@ -226,7 +226,7 @@ NNFW_STATUS nnfw_set_signature_prepare(nnfw_session *session, const char *signat
  * If this function is not called, default entry (ex. 0th subgraph in circle/tflite model)
  * will be selected.
  *
- * All input and output setting after {@link nnfw_prepare} and before calling this function
+ * All input, output, and config setting after {@link nnfw_prepare} and before calling this function
  * will be invalidated.
  *
  * @param[in] session   session to set the entry signature

runtime/onert/api/nnfw/src/nnfw_api.cc

@@ -245,6 +245,12 @@ NNFW_STATUS nnfw_set_workspace(nnfw_session *session, const char *dir)
   return session->set_workspace(dir);
 }
 
+NNFW_STATUS nnfw_set_signature_run(nnfw_session *session, const char *signature)
+{
+  NNFW_RETURN_ERROR_IF_NULL(session);
+  return session->set_signature_run(signature);
+}
+
 // Training
 
 NNFW_STATUS nnfw_train_get_traininfo(nnfw_session *session, nnfw_train_info *info)

runtime/onert/api/nnfw/src/nnfw_session.cc

@@ -242,7 +242,8 @@ nnfw_session::nnfw_session()
   : _nnpkg{nullptr}, _coptions{onert::compiler::CompilerOptions::fromGlobalConfig()},
     _compiler_artifact{nullptr}, _execution{nullptr}, _kernel_registry{nullptr},
     _train_info{nullptr}, _quant_manager{std::make_unique<onert::odc::QuantizeManager>()},
-    _codegen_manager{std::make_unique<onert::odc::CodegenManager>()}, _model_path{}
+    _codegen_manager{std::make_unique<onert::odc::CodegenManager>()}, _model_path{},
+    _signature_map{}
 {
   // DO NOTHING
 }
@@ -970,6 +971,30 @@ NNFW_STATUS nnfw_session::set_workspace(const char *dir)
   return NNFW_STATUS_NO_ERROR;
 }
 
+NNFW_STATUS nnfw_session::set_signature_run(const char *signature)
+{
+  if (!signature)
+    return NNFW_STATUS_UNEXPECTED_NULL;
+
+  if (!isStatePreparedOrFinishedRun())
+  {
+    std::cerr << "Error during nnfw_session::set_signature_run : invalid state" << std::endl;
+    return NNFW_STATUS_INVALID_STATE;
+  }
+
+  for (auto &sig : _signature_map)
+  {
+    if (sig.second == std::string(signature))
+    {
+      _execution = std::make_unique<onert::exec::Execution>(_compiler_artifact->_executors,
+                                                            sig.second, sig.first);
+      return NNFW_STATUS_NO_ERROR;
+    }
+  }
+
+  return NNFW_STATUS_ERROR;
+}
+
 NNFW_STATUS nnfw_session::deprecated(const char *msg)
 {
   std::cerr << msg << std::endl;
@@ -1072,6 +1097,7 @@ NNFW_STATUS nnfw_session::loadModelFile(const std::string &model_file_path,
   if (model == nullptr)
     return NNFW_STATUS_ERROR;
 
+  _signature_map = model->signatureMap();
   _nnpkg = std::make_unique<onert::ir::NNPkg>(std::move(model));
   _model_path = std::filesystem::path(model_file_path);
   _compiler_artifact.reset();

runtime/onert/api/nnfw/src/nnfw_session.h

@@ -35,6 +35,7 @@
 #include <string>
 #include <thread>
 #include <vector>
+#include <unordered_map>
 
 struct nnfw_session
 {
@@ -132,6 +133,8 @@ struct nnfw_session
 
   NNFW_STATUS set_workspace(const char *dir);
 
+  NNFW_STATUS set_signature_run(const char *signature);
+
   static NNFW_STATUS deprecated(const char *msg);
 
   //
@@ -230,6 +233,7 @@ struct nnfw_session
   //     const uint8 *buf;
   //   }
   std::filesystem::path _model_path;
+  std::unordered_map<onert::ir::SubgraphIndex, std::string> _signature_map;
 };
 
 #endif // __API_NNFW_SESSION_H__

runtime/onert/core/include/exec/Execution.h

@@ -47,6 +47,15 @@ class Execution
    */
   Execution(const std::shared_ptr<IExecutors> &executors);
 
+  /**
+   * @brief     Construct a new Execution object for signature
+   * @param[in] executors   Model executors
+   * @param[in] signature   Signature name
+   * @param[in] entry_index Entry subgraph index
+   */
+  Execution(const std::shared_ptr<IExecutors> &executors, const std::string &signature,
+            const ir::SubgraphIndex &entry_index);
+
 public:
   /**
    * @brief   Returns primary graph object

runtime/onert/core/include/ir/Model.h

@@ -197,6 +197,11 @@ class Model
     _signature_map[index] = name;
   }
 
+  const std::unordered_map<ir::SubgraphIndex, std::string> &signatureMap() const
+  {
+    return _signature_map;
+  }
+
 private:
   // TODO: Apply Heterogeneous lookup for unordered containers (transparent hashing) since C++20
   //       to use `std::string_view` with lookup functions in unordered containers

runtime/onert/core/src/exec/Execution.cc

@@ -16,6 +16,7 @@
 
 #include "exec/Execution.h"
 
+#include "SignatureExecutors.h"
 #include "../backend/builtin/IOTensor.h"
 #include "ir/DataType.h"
 #include "train/TrainableExecutors.h"
@@ -43,7 +44,7 @@ Execution::Execution(const std::shared_ptr<IExecutors> &executors) : _executors{
   for (uint32_t i = 0; i < _executors->outputSize(); ++i)
   {
     const auto output_tensor =
-      dynamic_cast<const backend::builtin::IOTensor *>(executors->outputTensor(ir::IOIndex{i}));
+      dynamic_cast<const backend::builtin::IOTensor *>(_executors->outputTensor(ir::IOIndex{i}));
     if (!output_tensor)
       throw std::runtime_error("Output tensor must be IOTensor");
 
@@ -54,6 +55,13 @@ Execution::Execution(const std::shared_ptr<IExecutors> &executors) : _executors{
   ExecutionOptions::fromGlobalConfig(_ctx.options);
 }
 
+Execution::Execution(const std::shared_ptr<IExecutors> &executors, const std::string &signature,
+                     const ir::SubgraphIndex &entry_index)
+  : Execution(std::make_shared<SignatureExecutors>(executors, signature, entry_index))
+{
+  // DO NOTHING
+}
+
 void Execution::changeInputShape(const ir::IOIndex &index, const ir::Shape &new_shape)
 {
   // This will be used later to set input tensor dynamic

runtime/onert/core/src/exec/SignatureExecutors.cc

@@ -19,12 +19,14 @@
 namespace onert::exec
 {
 
-SignatureExecutors::SignatureExecutors(std::shared_ptr<SingleModelExecutors> &executors,
+SignatureExecutors::SignatureExecutors(const std::shared_ptr<IExecutors> &executors,
                                        const std::string &signature,
                                        const ir::SubgraphIndex &entry_index)
   : _executors(executors), _signature(signature), _entry_index(entry_index)
 {
-  // TODO Set _entry_index
+  // Check single model
+  // TODO Support multimodel
+  assert(dynamic_cast<SingleModelExecutors *>(executors.get()) != nullptr);
 }
 
 IExecutor *SignatureExecutors::entryExecutor() const

runtime/onert/core/src/exec/SignatureExecutors.h

@@ -27,13 +27,13 @@ namespace onert::exec
 
 /**
  * @brief Class to gather executor set for signature entry
- *        Actually it is wrapper of SingleModelExecutors
+ *        Actually it is wrapper of IExecutors(SignatureExecutors)
  */
 class SignatureExecutors : public SingleModelExecutors
 {
 public:
   /**
-   * @brief Construct a new SingleModelExecutors object
+   * @brief Construct a new SignatureExecutors object
    */
   SignatureExecutors(void) = default;
   SignatureExecutors(const SignatureExecutors &) = delete;
@@ -45,19 +45,19 @@ class SignatureExecutors : public SingleModelExecutors
   ~SignatureExecutors() = default;
 
   /**
-   * @brief     Convert SingleModelExecutors to SignatureExecutors
-   * @param[in] executors SingleModelExecutors object to convert
+   * @brief     Convert IExecutors to SignatureExecutors
+   * @param[in] executors Executors object to convert
    * @param[in] signature signature name of the executors
    * @param[in] index     subgraph index of the signature
    */
-  SignatureExecutors(std::shared_ptr<SingleModelExecutors> &executors, const std::string &signature,
+  SignatureExecutors(const std::shared_ptr<IExecutors> &executors, const std::string &signature,
                      const ir::SubgraphIndex &entry_index);
 
 public:
   IExecutor *entryExecutor() const override;
 
 private:
-  std::shared_ptr<SingleModelExecutors> _executors;
+  const std::shared_ptr<IExecutors> _executors;
   std::string _signature;
   ir::SubgraphIndex _entry_index;
 };