Viewer - add layer indices to graph output

(MCT-985)

diff --git a/readme.md b/readme.md
index 295a61b5fa3e04e09e0c54d1c54317de8fac61ee..500e47dfd68c60a9f2db083b0944cc3c4d1082e4 100644 (file)
--- a/readme.md
+++ b/readme.md
@@ -1,6 +1,4 @@
 TI Deep Learning (TIDL) API
 ---------------------------
 
 TI Deep Learning (TIDL) API
 ---------------------------
 

-TIDL API brings Deep Learning to the edge and enables applications to leverage TI’s proprietary CNN/DNN implementation on Deep Learning Accelerators (DLAs) and C66x DSPs. 
-
-TIDL API requires OpenCL v1.1.15 or newer. Refer TIDL API User's Guide for details.
+TIDL API brings Deep Learning to the edge and enables applications to leverage TI’s proprietary CNN/DNN implementation on Deep Learning Accelerators (DLAs) and C66x DSPs.  It requires OpenCL v1.1.15 or newer. Refer the User's Guide for details.

diff --git a/tidl_api/Makefile b/tidl_api/Makefile
index 73a67f73a357cace26da7d43044db1149d3c43e5..37bbc1b3c74dde5071fee7f3a0dd12a2fd1764ed 100644 (file)
--- a/tidl_api/Makefile
+++ b/tidl_api/Makefile
@@ -24,8 +24,8 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 # THE POSSIBILITY OF SUCH DAMAGE.
 
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 # THE POSSIBILITY OF SUCH DAMAGE.
 

-MAJOR_VER=0
-MINOR_VER=1
+MAJOR_VER=1
+MINOR_VER=0

 PATCH_VER=0
 
 ifeq ($(shell git rev-parse --short HEAD 2>&1 1>/dev/null; echo $$?),0)
 PATCH_VER=0
 
 ifeq ($(shell git rev-parse --short HEAD 2>&1 1>/dev/null; echo $$?),0)

diff --git a/viewer/dot_graph.cpp b/viewer/dot_graph.cpp
index 25b6a97550dd6194d1e3eff0500db88659f8a36e..e281c195c186a281421e822d30fcf167a6ad63d2 100644 (file)
--- a/viewer/dot_graph.cpp
+++ b/viewer/dot_graph.cpp
@@ -102,17 +102,19 @@ void DotGraph::AddVertices()
 
         auto V = add_vertex(i, *sub);
 
 
         auto V = add_vertex(i, *sub);
 

-        AddVertexProperties(V, sub, layer);
+        AddVertexProperties(V, sub, layer, i);

     }
 
 }
 
 void DotGraph::AddVertexProperties(Vertex& V, Graph* g,
     }
 
 }
 
 void DotGraph::AddVertexProperties(Vertex& V, Graph* g,

-                                   const sTIDL_Layer_t& layer)
+                                   const sTIDL_Layer_t& layer,
+                                   int index)

 {
     VertexPropertyMap<Graph> vpm = boost::get(vertex_attribute, *g);
     vpm[V][COLOR] = GetVertexColor(layer.layerType);
     vpm[V][STYLE] = BOLD;
 {
     VertexPropertyMap<Graph> vpm = boost::get(vertex_attribute, *g);
     vpm[V][COLOR] = GetVertexColor(layer.layerType);
     vpm[V][STYLE] = BOLD;

+    vpm[V]["xlabel"] = std::to_string(index);

     vpm[V][LABEL] = "{";
 
     switch (layer.layerType)
     vpm[V][LABEL] = "{";
 
     switch (layer.layerType)


@@ -121,7 +123,7 @@ void DotGraph::AddVertexProperties(Vertex& V, Graph* g,
         {
             vpm[V][LABEL] += TIDL_LayerString[layer.layerType];
             const sTIDL_ConvParams_t& p = layer.layerParams.convParams;
         {
             vpm[V][LABEL] += TIDL_LayerString[layer.layerType];
             const sTIDL_ConvParams_t& p = layer.layerParams.convParams;

-            vpm[V][LABEL] += "\\n" + std::to_string(p.kernelW) + "x" +
+            vpm[V][LABEL] += " " + std::to_string(p.kernelW) + "x" +

                              std::to_string(p.kernelH);
 
             if (p.enablePooling)
                              std::to_string(p.kernelH);
 
             if (p.enablePooling)

diff --git a/viewer/dot_graph.h b/viewer/dot_graph.h
index 914fe4858d5da484c0db23c64fc1a54b34bb8697..f42d6dcd0808196b2fdcedfc8557a1de645b95ea 100644 (file)
--- a/viewer/dot_graph.h
+++ b/viewer/dot_graph.h
@@ -92,7 +92,8 @@ class DotGraph
     void AddVertices();
     void AddEdges();
     void AddMetaData();
     void AddVertices();
     void AddEdges();
     void AddMetaData();

-    void AddVertexProperties(Vertex& V, Graph* g, const sTIDL_Layer_t& layer);
+    void AddVertexProperties(Vertex& V, Graph* g, const sTIDL_Layer_t& layer,
+                             int index);

 
     Graph graph_m;
     const sTIDL_Network_t& net_m;
 
     Graph graph_m;
     const sTIDL_Network_t& net_m;