1 files changed, 8 insertions, 43 deletions
diff --git a/runtimes/neurun/src/frontend/wrapper/compilation.cc b/runtimes/neurun/src/frontend/wrapper/compilation.cc
index 4ff33faa5..e4aa99f7a 100644
--- a/runtimes/neurun/src/frontend/wrapper/compilation.cc
+++ b/runtimes/neurun/src/frontend/wrapper/compilation.cc
@@ -14,53 +14,18 @@
  * limitations under the License.
  */
 
-#include <NeuralNetworks.h>
-
-#include <algorithm>
-
-#include <arm_compute/core/CL/ICLTensor.h>
-
-#include <arm_compute/runtime/IFunction.h>
-#include <arm_compute/runtime/CL/CLScheduler.h>
-
-#include "internal/Convert.h"
-#include "backend/acl_cl/kernel/View.h"
-#include "backend/acl_cl/TensorBuilder.h"
-#include "internal/nnapi/kernel/Reader.h"
-#include "internal/Padding.h"
-#include "backend/IInitializerGenerator.h"
-#include "backend/IStageGenerator.h"
-
 #include "compilation.h"
-#include "model.h"
-#include "logging.h"
-
-#include "graph/dumper/Dumper.h"
-#include "codegen/IPlanBuilder.h"
-#include "codegen/Planner.h"
-#include "codegen/PlanBuilder.h"
-
-#include "linear/Linear.h"
 
 int ANeuralNetworksCompilation::finish()
 {
-  auto &plan = this->plan();
-  const auto &operands = plan.model().operands();
-
-  plan.model().lower();
-  auto linear = plan.model().linearize();
-
-  // Dump ops
-  linear->accept(neurun::graph::dumper::Dumper{});
-
-  neurun::codegen::PlanBuilder plan_builder{plan};
-
-  auto tensor_builders = linear->markTensors();
-
-  linear->accept(neurun::codegen::Planner{operands, plan_builder});
-
-  // TODO Add optimization passes
-  plan_builder.finalize(tensor_builders);
+  try
+  {
+    _compiler->compile();
+  }
+  catch (const std::exception &e)
+  {
+    return ANEURALNETWORKS_BAD_STATE;
+  }
 
   return ANEURALNETWORKS_NO_ERROR;
 }