commit bc5f784d34a5315748b56cecb4674f4e546da2cd
author kevmay01 <kevin.may@arm.com> Thu Aug 30 12:34:39 2018 +0100
committer Matthew Bentham <matthew.bentham@arm.com> Tue Sep 18 12:40:38 2018 +0100
tree 70f300c7932301802cc8937531b5cf189e3bd536
parent 69558df6f149647888267caabf72de6b05fb6d53

IVGCVSW-1770: Refactor ModelToINetworkConverter to allow conversion of HAL1.1 operators

Change-Id: I9b10f0a9c88344df108b2325c0233f9660fa6b7c

1.0/ArmnnDriverImpl.cpp

diff --git a/1.0/ArmnnDriverImpl.cpp b/1.0/ArmnnDriverImpl.cpp
index 5429ebe..21a4f2e 100644
--- a/1.0/ArmnnDriverImpl.cpp
+++ b/1.0/ArmnnDriverImpl.cpp
@@ -118,8 +118,8 @@
     }
 
     // Attempt to convert the model to an ArmNN input network (INetwork).
-    ModelToINetworkConverter modelConverter(options.GetComputeDevice(), model,
-        options.GetForcedUnsupportedOperations());
+    armnn_driver::ModelToINetworkConverter<HalVersion_1_0> modelConverter(options.GetComputeDevice(),
+        model, options.GetForcedUnsupportedOperations());
 
     if (modelConverter.GetConversionResult() != ConversionResult::Success
         && modelConverter.GetConversionResult() != ConversionResult::UnsupportedFeature)
@@ -173,7 +173,7 @@
     // at this point we're being asked to prepare a model that we've already declared support for
     // and the operation indices may be different to those in getSupportedOperations anyway.
     set<unsigned int> unsupportedOperations;
-    ModelToINetworkConverter modelConverter(options.GetComputeDevice(), model,
+    armnn_driver::ModelToINetworkConverter<HalVersion_1_0> modelConverter(options.GetComputeDevice(), model,
         unsupportedOperations);
 
     if (modelConverter.GetConversionResult() != ConversionResult::Success)