Support layer group id assignment updates

Provide API support for updating layer -> layer group id assignments
before executing network.

(MCT-1028)

3 files changed, 72 insertions, 13 deletions

diff --git a/tidl_api/inc/configuration.h b/tidl_api/inc/configuration.h
index 4bd3754..d1ebf09 100644
--- a/tidl_api/inc/configuration.h
+++ b/tidl_api/inc/configuration.h
@@ -31,6 +31,7 @@
 //! @file configuration.h
 
 #include <string>
+#include <map>
 #include <iostream>
 
 namespace tidl {
@@ -53,6 +54,8 @@ class Configuration
 
     //! Number of channels in the input frame (e.g. 3 for BGR)
     int     inNumChannels;
+
+    //! @private
     int     noZeroCoeffsPercentage;
 
     //! Pre-processing type applied to the input frame
@@ -89,6 +92,11 @@ class Configuration
     //! Enable tracing of output buffers associated with each layer
     bool enableOutputTrace;
 
+    //! Map of layer index to layer group id. Used to override layer group
+    //! assigment for layers. Any layer not specified in this map will
+    //! retain its existing mapping.
+    std::map<int, int> layerIndex2LayerGroupId;
+
     //! Default constructor.
     Configuration();
 
@@ -100,6 +108,7 @@ class Configuration
 
     //! Read a configuration from the specified file and validate
     bool ReadFromFile(const std::string& file_name);
+
 };
 
 }
diff --git a/tidl_api/src/configuration_parser.cpp b/tidl_api/src/configuration_parser.cpp
index e9df4c8..5871e71 100644
--- a/tidl_api/src/configuration_parser.cpp
+++ b/tidl_api/src/configuration_parser.cpp
@@ -28,12 +28,15 @@
 
 #include <boost/spirit/include/qi.hpp>
 #include <boost/spirit/include/phoenix_operator.hpp>
+#include <boost/fusion/include/std_pair.hpp>
 
 #include <string>
 #include <fstream>
 #include <iostream>
 #include <algorithm>
 #include <cctype>
+#include <utility>
+#include <map>
 
 #include "configuration.h"
 
@@ -55,29 +58,38 @@ struct ConfigParser : qi::grammar<Iterator, ascii::space_type>
         using ascii::char_;
         using qi::_1;
 
-        path %= lexeme[+(char_ - '"')];
+        // Rules for parsing layer id assignments: { {int, int}, ... }
+        id2group  = '{' >> int_ >> ',' >> int_ >> '}';
+        id2groups = '{' >> id2group >> *(qi::lit(',') >> id2group) >> '}';
 
-        // Discard '"'
+        // Rules for parsing paths. Discard '"'
+        path %= lexeme[+(char_ - '"')];
         q_path = qi::omit[*char_('"')] >> path >> qi::omit[*char_('"')];
 
+        // Grammar for parsing configuration file
         entry %=
-         lit("#") >> *(char_) /* discard comments */                         |
-         lit("numFrames")   >> '=' >> int_[ph::ref(x.numFrames) = _1]        |
-         lit("preProcType") >> '=' >> int_[ph::ref(x.preProcType) = _1]      |
-         lit("inWidth")     >> '=' >> int_[ph::ref(x.inWidth) = _1]          |
-         lit("inHeight")    >> '=' >> int_[ph::ref(x.inHeight) = _1]         |
-         lit("inNumChannels") >> '=' >> int_[ph::ref(x.inNumChannels) = _1]  |
-         lit("inData")     >> "=" >>  q_path[ph::ref(x.inData) = _1]         |
-         lit("outData")    >> "=" >> q_path[ph::ref(x.outData) = _1]         |
-         lit("netBinFile") >> "=" >> q_path[ph::ref(x.netBinFile) = _1]      |
-         lit("paramsBinFile") >> "=" >> q_path[ph::ref(x.paramsBinFile) = _1] |
-         lit("enableTrace") >> "=" >> bool_[ph::ref(x.enableOutputTrace) = _1]
+         lit("layerIndex2LayerGroupId") >> '=' >>
+                        id2groups[ph::ref(x.layerIndex2LayerGroupId) = _1]    |
+         lit("#")             >>  *(char_) /* discard comments */             |
+         lit("numFrames")     >> '=' >> int_[ph::ref(x.numFrames) = _1]       |
+         lit("preProcType")   >> '=' >> int_[ph::ref(x.preProcType) = _1]     |
+         lit("inWidth")       >> '=' >> int_[ph::ref(x.inWidth) = _1]         |
+         lit("inHeight")      >> '=' >> int_[ph::ref(x.inHeight) = _1]        |
+         lit("inNumChannels") >> '=' >> int_[ph::ref(x.inNumChannels) = _1]   |
+         lit("inData")        >> '=' >> q_path[ph::ref(x.inData) = _1]        |
+         lit("outData")       >> '=' >> q_path[ph::ref(x.outData) = _1]       |
+         lit("netBinFile")    >> '=' >> q_path[ph::ref(x.netBinFile) = _1]    |
+         lit("paramsBinFile") >> '=' >> q_path[ph::ref(x.paramsBinFile) = _1] |
+         lit("enableTrace")   >> '=' >> bool_[ph::ref(x.enableOutputTrace)= _1]
          ;
     }
 
     qi::rule<Iterator, std::string(), ascii::space_type> path;
     qi::rule<Iterator, std::string(), ascii::space_type> q_path;
     qi::rule<Iterator, ascii::space_type> entry;
+
+    qi::rule<Iterator, std::pair<int, int>(), ascii::space_type> id2group;
+    qi::rule<Iterator, std::map<int, int>(), ascii::space_type> id2groups;
 };
 
 bool Configuration::ReadFromFile(const std::string &file_name)
@@ -126,3 +138,33 @@ bool Configuration::ReadFromFile(const std::string &file_name)
 
     return true;
 }
+
+#if 0
+--- test.cfg ---
+numFrames     = 1
+preProcType   = 0
+inData        = ../test/testvecs/input/preproc_0_224x224.y
+outData       = stats_tool_out.bin
+netBinFile    = ../test/testvecs/config/tidl_models/tidl_net_imagenet_jacintonet11v2.bin
+paramsBinFile = ../test/testvecs/config/tidl_models/tidl_param_imagenet_jacintonet11v2.bin
+inWidth       = 224
+inHeight      = 224
+inNumChannels = 3
+
+# Enable tracing of output buffers
+enableTrace = true
+
+# Override layer group id assignments in the network
+layerIndex2LayerGroupId = { {12, 2}, {13, 2}, {14, 2} }
+----------------
+#endif
+
+#if TEST_PARSING
+int main()
+{
+    Configuration c;
+    c.ReadFromFile("test.cfg");
+
+    return 0;
+}
+#endif
diff --git a/tidl_api/src/executor.cpp b/tidl_api/src/executor.cpp
index d67f683..7929c42 100644
--- a/tidl_api/src/executor.cpp
+++ b/tidl_api/src/executor.cpp
@@ -122,6 +122,14 @@ bool ExecutorImpl::Initialize(const Configuration& configuration)
                 net->TIDLLayers[i].layersGroupId = layers_group_id_m;
     }
 
+    // If the user has specified an override mapping, apply it
+    else if (!configuration.layerIndex2LayerGroupId.empty())
+    {
+        for (const auto &item : configuration.layerIndex2LayerGroupId)
+            if (item.first < net->numLayers)
+                net->TIDLLayers[item.first].layersGroupId = item.second;
+    }
+
     // Call a setup kernel to allocate and fill network parameters
     InitializeNetworkParams(shared_createparam.get());