[matrix-gui-v2-apps][PATCH 1/5] tidl: livecam: DSP only live camera input example adapted for new TIDL_API and command line options

[matrix-gui-v2-apps][PATCH 1/5] tidl: livecam: DSP only live camera input example adapted for new TIDL_API and command line options

[Djordje Senicic]

Signed-off-by: Djordje Senicic <x0157990@ti.com>
---
 tidl_apps/tidl_demo_livecam/runTidlLiveCam.sh         | 3 ++-
 tidl_apps/tidl_demo_livecam/tidl_demo_livecam.desktop | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/tidl_apps/tidl_demo_livecam/runTidlLiveCam.sh b/tidl_apps/tidl_demo_livecam/runTidlLiveCam.sh
index d7372f5..02fb4a2 100644
--- a/tidl_apps/tidl_demo_livecam/runTidlLiveCam.sh
+++ b/tidl_apps/tidl_demo_livecam/runTidlLiveCam.sh
@@ -1,4 +1,5 @@
 cd /usr/share/ti/tidl/examples/classification
 
-./tidl_classification -n 2 -t d -l ./imagenet.txt -s ./classlist.txt -i 1 -c ./stream_config_j11_v2.txt & pid=$!
+./tidl_classification -g 1 -d 2 -e 0 -l ./imagenet.txt -s ./classlist.txt -i 1 -c ./stream_config_j11_v2.txt & pid=$!
+
 { sleep 90; kill $pid; }
diff --git a/tidl_apps/tidl_demo_livecam/tidl_demo_livecam.desktop b/tidl_apps/tidl_demo_livecam/tidl_demo_livecam.desktop
index fe85946..e3d2be4 100644
--- a/tidl_apps/tidl_demo_livecam/tidl_demo_livecam.desktop
+++ b/tidl_apps/tidl_demo_livecam/tidl_demo_livecam.desktop
@@ -1,6 +1,6 @@
 #!/usr/bin/env xdg-open
 [Desktop Entry]
-Name=J11v2 Camera
+Name=J11v2 Camera Input
 Icon=/usr/share/matrix-gui-2.0/apps/images/tidl-icon.png
 Exec=runTidlLiveCam.sh
 Type=Application
-- 
1.9.1

[matrix-gui-v2-apps][PATCH 2/5] tidl: staticimg_dsponly: DSP only example with pre-recorded video input adapted for new TIDL_API and command line options

[Djordje Senicic]

Signed-off-by: Djordje Senicic <x0157990@ti.com>
---
 .../desc_tidl_demo_staticimg_dsponly.html                        | 6 ++++++
 .../tidl_demo_staticimg_dsponly/runTidlStaticImg_dsponly.sh      | 4 ++++
 .../tidl_demo_staticimg_dsponly.desktop                          | 9 +++++++++
 3 files changed, 19 insertions(+)
 create mode 100644 tidl_apps/tidl_demo_staticimg_dsponly/desc_tidl_demo_staticimg_dsponly.html
 create mode 100644 tidl_apps/tidl_demo_staticimg_dsponly/runTidlStaticImg_dsponly.sh
 create mode 100644 tidl_apps/tidl_demo_staticimg_dsponly/tidl_demo_staticimg_dsponly.desktop

diff --git a/tidl_apps/tidl_demo_staticimg_dsponly/desc_tidl_demo_staticimg_dsponly.html b/tidl_apps/tidl_demo_staticimg_dsponly/desc_tidl_demo_staticimg_dsponly.html
new file mode 100644
index 0000000..18856f3
--- /dev/null
+++ b/tidl_apps/tidl_demo_staticimg_dsponly/desc_tidl_demo_staticimg_dsponly.html
@@ -0,0 +1,6 @@
+<h1>TIDL Demo with Classification of Common Objects</h1>
+<h2>Purpose:</h2>
+<p>This application demonstrates Deep Learning Imagenet classification (1000 classes) based on J11 network topology.</p>
+<p>Both DSP cores are used for processing (frame-based pipeline), of pre-recorded clip with live common objects.</p>
+<p>Exit demo by doing right-click on image window</p>
+
diff --git a/tidl_apps/tidl_demo_staticimg_dsponly/runTidlStaticImg_dsponly.sh b/tidl_apps/tidl_demo_staticimg_dsponly/runTidlStaticImg_dsponly.sh
new file mode 100644
index 0000000..d49c289
--- /dev/null
+++ b/tidl_apps/tidl_demo_staticimg_dsponly/runTidlStaticImg_dsponly.sh
@@ -0,0 +1,4 @@
+cd /usr/share/ti/tidl/examples/classification
+
+./tidl_classification -g 1 -d 2 -e 0 -l ./imagenet.txt -s ./classlist.txt -i ./clips/test10.mp4 -c ./stream_config_j11_v2.txt & pid=$!
+{ sleep 90; kill $pid; }
diff --git a/tidl_apps/tidl_demo_staticimg_dsponly/tidl_demo_staticimg_dsponly.desktop b/tidl_apps/tidl_demo_staticimg_dsponly/tidl_demo_staticimg_dsponly.desktop
new file mode 100644
index 0000000..9dfa499
--- /dev/null
+++ b/tidl_apps/tidl_demo_staticimg_dsponly/tidl_demo_staticimg_dsponly.desktop
@@ -0,0 +1,9 @@
+#!/usr/bin/env xdg-open
+[Desktop Entry]
+Name=J11v2 Real Common Objects
+Icon=/usr/share/matrix-gui-2.0/apps/images/tidl-icon.png
+Exec=runTidlStaticImg_dsponly.sh
+Type=Application
+ProgramType=gui
+Categories=tidl
+X-Matrix-Description=/usr/share/matrix-gui-2.0/apps/tidl_demo_staticimg_dsponly/desc_tidl_demo_staticimg_dsponly.html
-- 
1.9.1

[matrix-gui-v2-apps][PATCH 3/5] tidl: livecam_lg2: EVE and DSP example with two layer groups and live camera input

[Djordje Senicic]

Signed-off-by: Djordje Senicic <x0157990@ti.com>
---
 tidl_apps/tidl_demo_livecam_lg2/desc_tidl_demo_livecam_lg2.html | 5 +++++
 tidl_apps/tidl_demo_livecam_lg2/runTidlLiveCam_lg2.sh           | 5 +++++
 tidl_apps/tidl_demo_livecam_lg2/tidl_demo_livecam_lg2.desktop   | 9 +++++++++
 3 files changed, 19 insertions(+)
 create mode 100644 tidl_apps/tidl_demo_livecam_lg2/desc_tidl_demo_livecam_lg2.html
 create mode 100644 tidl_apps/tidl_demo_livecam_lg2/runTidlLiveCam_lg2.sh
 create mode 100644 tidl_apps/tidl_demo_livecam_lg2/tidl_demo_livecam_lg2.desktop

diff --git a/tidl_apps/tidl_demo_livecam_lg2/desc_tidl_demo_livecam_lg2.html b/tidl_apps/tidl_demo_livecam_lg2/desc_tidl_demo_livecam_lg2.html
new file mode 100644
index 0000000..0cf7c85
--- /dev/null
+++ b/tidl_apps/tidl_demo_livecam_lg2/desc_tidl_demo_livecam_lg2.html
@@ -0,0 +1,5 @@
+<h1>TIDL Demo with Live Camera Input (1xDSP+2xEVE)</h1>
+<h2>Purpose:</h2>
+<p>This application demonstrates Deep Learning Imagenet classification (1000 classes) based on J11 network topology.</p>
+<p>Both EVE cores and one DSP core are used for processing (frame-based pipeline), of live camera input (at 640x480 resolution).</p>
+<p>Exit demo by doing right-click on image window</p>
diff --git a/tidl_apps/tidl_demo_livecam_lg2/runTidlLiveCam_lg2.sh b/tidl_apps/tidl_demo_livecam_lg2/runTidlLiveCam_lg2.sh
new file mode 100644
index 0000000..5feabc3
--- /dev/null
+++ b/tidl_apps/tidl_demo_livecam_lg2/runTidlLiveCam_lg2.sh
@@ -0,0 +1,5 @@
+cd /usr/share/ti/tidl/examples/classification
+
+./tidl_classification -g 2 -d 1 -e 2 -l ./imagenet.txt -s ./classlist.txt -i 1 -c ./stream_config_j11_v2.txt & pid=$!
+
+{ sleep 90; kill $pid; }
diff --git a/tidl_apps/tidl_demo_livecam_lg2/tidl_demo_livecam_lg2.desktop b/tidl_apps/tidl_demo_livecam_lg2/tidl_demo_livecam_lg2.desktop
new file mode 100644
index 0000000..69a4e8e
--- /dev/null
+++ b/tidl_apps/tidl_demo_livecam_lg2/tidl_demo_livecam_lg2.desktop
@@ -0,0 +1,9 @@
+#!/usr/bin/env xdg-open
+[Desktop Entry]
+Name=J11v2 Camera Input (1xDSP+2xEVE)
+Icon=/usr/share/matrix-gui-2.0/apps/images/tidl-icon.png
+Exec=runTidlLiveCam_lg2.sh
+Type=Application
+ProgramType=gui
+Categories=tidl
+X-Matrix-Description=/usr/share/matrix-gui-2.0/apps/tidl_demo_livecam_lg2/desc_tidl_demo_livecam_lg2.html
-- 
1.9.1

[matrix-gui-v2-apps][PATCH 4/5] tidl: staticimg_lg2: Using 2xEVE and 1xDSP in demo with two layer groups and pre-recorded video input

[Djordje Senicic]

Signed-off-by: Djordje Senicic <x0157990@ti.com>
---
 .../tidl_demo_staticimg_lg2/desc_tidl_demo_staticimg_lg2.html    | 7 +++++++
 tidl_apps/tidl_demo_staticimg_lg2/runTidlStaticImg_lg2.sh        | 5 +++++
 .../tidl_demo_staticimg_lg2/tidl_demo_staticimg_lg2.desktop      | 9 +++++++++
 3 files changed, 21 insertions(+)
 create mode 100644 tidl_apps/tidl_demo_staticimg_lg2/desc_tidl_demo_staticimg_lg2.html
 create mode 100755 tidl_apps/tidl_demo_staticimg_lg2/runTidlStaticImg_lg2.sh
 create mode 100644 tidl_apps/tidl_demo_staticimg_lg2/tidl_demo_staticimg_lg2.desktop

diff --git a/tidl_apps/tidl_demo_staticimg_lg2/desc_tidl_demo_staticimg_lg2.html b/tidl_apps/tidl_demo_staticimg_lg2/desc_tidl_demo_staticimg_lg2.html
new file mode 100644
index 0000000..1d40d85
--- /dev/null
+++ b/tidl_apps/tidl_demo_staticimg_lg2/desc_tidl_demo_staticimg_lg2.html
@@ -0,0 +1,7 @@
+<h1>TIDL Demo with Classification of Common Objects, with Two Layers Groups, 2xEVE+1xDSP</h1>
+<h2>Purpose:</h2>
+<p>This application demonstrates Deep Learning Imagenet classification (1000 classes) based on J11 network topology.</p>
+<p>Both EVE cores and one DSP core are used for processing (frame-based pipeline), of pre-recorded clip with common objects.</p>
+<p>Clip is created from static images. Last 3 layers are executed on DSP, forming layers group 2. </p>
+<p>Exit demo by doing right-click on image window</p>
+
diff --git a/tidl_apps/tidl_demo_staticimg_lg2/runTidlStaticImg_lg2.sh b/tidl_apps/tidl_demo_staticimg_lg2/runTidlStaticImg_lg2.sh
new file mode 100755
index 0000000..197c218
--- /dev/null
+++ b/tidl_apps/tidl_demo_staticimg_lg2/runTidlStaticImg_lg2.sh
@@ -0,0 +1,5 @@
+cd /usr/share/ti/tidl/examples/classification
+
+./tidl_classification -g 2 -d 1 -e 2 -l ./imagenet.txt -s ./classlist.txt -i ./clips/test10.mp4 -c ./stream_config_j11_v2.txt & pid=$!
+
+{ sleep 90; kill $pid; }
diff --git a/tidl_apps/tidl_demo_staticimg_lg2/tidl_demo_staticimg_lg2.desktop b/tidl_apps/tidl_demo_staticimg_lg2/tidl_demo_staticimg_lg2.desktop
new file mode 100644
index 0000000..aa07fc3
--- /dev/null
+++ b/tidl_apps/tidl_demo_staticimg_lg2/tidl_demo_staticimg_lg2.desktop
@@ -0,0 +1,9 @@
+#!/usr/bin/env xdg-open
+[Desktop Entry]
+Name=J11v2 Static Image
+Icon=/usr/share/matrix-gui-2.0/apps/images/tidl-icon.png
+Exec=runTidlStaticImg_lg2.sh
+Type=Application
+ProgramType=gui
+Categories=tidl
+X-Matrix-Description=/usr/share/matrix-gui-2.0/apps/tidl_demo_staticimg_lg2/desc_tidl_demo_staticimg_lg2.html
-- 
1.9.1

[matrix-gui-v2-apps][PATCH 5/5] tidl: pnexamples and staticimg demos adapted for new TIDL_API and new command line options

[Djordje Senicic]

Signed-off-by: Djordje Senicic <x0157990@ti.com>
---
 tidl_apps/tidl_demo_pnexamples/desc_tidl_demo_pnexamples.html | 6 +++---
 tidl_apps/tidl_demo_pnexamples/runTidlPnExamples.sh           | 3 ++-
 tidl_apps/tidl_demo_staticimg/desc_tidl_demo_staticimg.html   | 5 ++---
 tidl_apps/tidl_demo_staticimg/runTidlStaticImg.sh             | 2 +-
 tidl_apps/tidl_demo_staticimg/tidl_demo_staticimg.desktop     | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/tidl_apps/tidl_demo_pnexamples/desc_tidl_demo_pnexamples.html b/tidl_apps/tidl_demo_pnexamples/desc_tidl_demo_pnexamples.html
index abf9814..81a0a6b 100644
--- a/tidl_apps/tidl_demo_pnexamples/desc_tidl_demo_pnexamples.html
+++ b/tidl_apps/tidl_demo_pnexamples/desc_tidl_demo_pnexamples.html
@@ -1,7 +1,7 @@
-<h1>TIDL Demo with Positive and Negative Detection Examples</h1>
+<h1>TIDL Demo with Positive and Negative Detection Examples (1xDSP+1xEVE)</h1>
 <h2>Purpose:</h2>
 <p>This application demonstrates Deep Learning Imagenet classification (1000 classes) based on J11 network topology.</p>
-<p>Both DSP cores are used for processing (frame-based pipeline), of pre-recorded clip with common objects.</p>
-<p>This clip includes positive and negative detection examples (i.e. objects that are not recognized as expected)</p>
+<p>One DSP and one EVE cores are used for processing (frame-based pipeline), of pre-recorded clip made from static images. </p>
+<p>This clip includes positive and negative detection examples (i.e. objects that are not in the list of 'expected' classes)</p>
 <p>Exit demo by doing right-click on image window</p>
 
diff --git a/tidl_apps/tidl_demo_pnexamples/runTidlPnExamples.sh b/tidl_apps/tidl_demo_pnexamples/runTidlPnExamples.sh
index 4633f20..0033fde 100644
--- a/tidl_apps/tidl_demo_pnexamples/runTidlPnExamples.sh
+++ b/tidl_apps/tidl_demo_pnexamples/runTidlPnExamples.sh
@@ -1,5 +1,6 @@
 cd /usr/share/ti/tidl/examples/classification
 
-./tidl_classification -n 2 -t d -l ./imagenet.txt -s ./classlist.txt -i ./clips/test2.mp4 -c ./stream_config_j11_v2.txt & pid=$!
+./tidl_classification -g 2 -d 1 -e 1 -l ./imagenet.txt -s ./classlist.txt -i ./clips/test2.mp4 -c ./stream_config_j11_v2.txt & pid=$!
+
 { sleep 90; kill $pid; }
 
diff --git a/tidl_apps/tidl_demo_staticimg/desc_tidl_demo_staticimg.html b/tidl_apps/tidl_demo_staticimg/desc_tidl_demo_staticimg.html
index 679c9b8..1861837 100644
--- a/tidl_apps/tidl_demo_staticimg/desc_tidl_demo_staticimg.html
+++ b/tidl_apps/tidl_demo_staticimg/desc_tidl_demo_staticimg.html
@@ -1,7 +1,6 @@
-<h1>TIDL Demo with Static Image Sequence</h1>
+<h1>TIDL Demo with Classification of Common Objects, 2xEVE+2xDSP</h1>
 <h2>Purpose:</h2>
 <p>This application demonstrates Deep Learning Imagenet classification (1000 classes) based on J11 network topology.</p>
-<p>Both DSP cores are used for processing (frame-based pipeline), of pre-recorded clip with common objects.</p>
-<p>Clip is created from static images </p>
+<p>Both EVE and both DSP cores are used for processing (frame-based pipeline), of pre-recorded clip with live common objects.</p>
 <p>Exit demo by doing right-click on image window</p>
 
diff --git a/tidl_apps/tidl_demo_staticimg/runTidlStaticImg.sh b/tidl_apps/tidl_demo_staticimg/runTidlStaticImg.sh
index 12f80a5..30ece7a 100644
--- a/tidl_apps/tidl_demo_staticimg/runTidlStaticImg.sh
+++ b/tidl_apps/tidl_demo_staticimg/runTidlStaticImg.sh
@@ -1,4 +1,4 @@
 cd /usr/share/ti/tidl/examples/classification
 
-./tidl_classification -n 2 -t d -l ./imagenet.txt -s ./classlist.txt -i ./clips/test1.mp4 -c ./stream_config_j11_v2.txt & pid=$!
+./tidl_classification -g 1 -d 2 -e 2 -l ./imagenet.txt -s ./classlist.txt -i ./clips/test10.mp4 -c ./stream_config_j11_v2.txt & pid=$!
 { sleep 90; kill $pid; }
diff --git a/tidl_apps/tidl_demo_staticimg/tidl_demo_staticimg.desktop b/tidl_apps/tidl_demo_staticimg/tidl_demo_staticimg.desktop
index 1d91173..47324fa 100644
--- a/tidl_apps/tidl_demo_staticimg/tidl_demo_staticimg.desktop
+++ b/tidl_apps/tidl_demo_staticimg/tidl_demo_staticimg.desktop
@@ -1,6 +1,6 @@
 #!/usr/bin/env xdg-open
 [Desktop Entry]
-Name=J11v2 Static Image
+Name=J11v2 Real Common Objects
 Icon=/usr/share/matrix-gui-2.0/apps/images/tidl-icon.png
 Exec=runTidlStaticImg.sh
 Type=Application
-- 
1.9.1