Rewrite model frontend to be json-driven.

Change-Id: Iac786eff96183938d2fd11cde9313c6e8e1270a5

30 files changed, 88 insertions, 4 deletions

diff --git a/examples/test_add_1x4x4x4_f32/InputTensor-tf0.npy b/examples/test_add_1x4x4x4_f32/InputTensor-tf0.npy
deleted file mode 100644
index 1b3effb..0000000
--- a/examples/test_add_1x4x4x4_f32/InputTensor-tf0.npy
+++ /dev/null
diff --git a/examples/test_add_1x4x4x4_f32/InputTensor-tf1.npy b/examples/test_add_1x4x4x4_f32/InputTensor-tf1.npy
deleted file mode 100644
index f233cd4..0000000
--- a/examples/test_add_1x4x4x4_f32/InputTensor-tf1.npy
+++ /dev/null
diff --git a/examples/test_add_1x4x4x4_f32/InputTensor-tflite0.npy b/examples/test_add_1x4x4x4_f32/InputTensor-tflite0.npy
deleted file mode 100644
index 1b3effb..0000000
--- a/examples/test_add_1x4x4x4_f32/InputTensor-tflite0.npy
+++ /dev/null
diff --git a/examples/test_add_1x4x4x4_f32/InputTensor-tflite1.npy b/examples/test_add_1x4x4x4_f32/InputTensor-tflite1.npy
deleted file mode 100644
index f233cd4..0000000
--- a/examples/test_add_1x4x4x4_f32/InputTensor-tflite1.npy
+++ /dev/null
diff --git a/examples/test_add_1x4x4x4_f32/flatbuffer-tf/desc.json b/examples/test_add_1x4x4x4_f32/flatbuffer-tf/desc.json
new file mode 100644
index 0000000..1a86713
--- /dev/null
+++ b/examples/test_add_1x4x4x4_f32/flatbuffer-tf/desc.json
@@ -0,0 +1,18 @@
+{
+  "tosa_file": "test_add_1x4x4x4_f32.tosa",
+  "ifm_name": [
+    "InputTensor-tf0",
+    "InputTensor-tf1"
+  ],
+  "ifm_file": [
+    "../placeholder_0.npy",
+    "../placeholder_1.npy"
+  ],
+  "ofm_name": [
+    "Result0"
+  ],
+  "ofm_file": [
+    "ref_model_Result0.npy"
+  ],
+  "expected_failure": false
+}
\ No newline at end of file
diff --git a/examples/test_add_1x4x4x4_f32/flatbuffer-tf/ref_model_Result0.npy b/examples/test_add_1x4x4x4_f32/flatbuffer-tf/ref_model_Result0.npy
new file mode 100644
index 0000000..60baeac
--- /dev/null
+++ b/examples/test_add_1x4x4x4_f32/flatbuffer-tf/ref_model_Result0.npy
diff --git a/examples/test_add_1x4x4x4_f32/flatbuffer-tflite/desc.json b/examples/test_add_1x4x4x4_f32/flatbuffer-tflite/desc.json
new file mode 100644
index 0000000..30a447b
--- /dev/null
+++ b/examples/test_add_1x4x4x4_f32/flatbuffer-tflite/desc.json
@@ -0,0 +1,18 @@
+{
+  "tosa_file": "test_add_1x4x4x4_f32.tosa",
+  "ifm_name": [
+    "InputTensor-tflite0",
+    "InputTensor-tflite1"
+  ],
+  "ifm_file": [
+    "../placeholder_0.npy",
+    "../placeholder_1.npy"
+  ],
+  "ofm_name": [
+    "Result0"
+  ],
+  "ofm_file": [
+    "ref_model_Result0.npy"
+  ],
+  "expected_failure": false
+}
\ No newline at end of file
diff --git a/examples/test_add_1x4x4x4_f32/flatbuffer-tflite/ref_model_Result0.npy b/examples/test_add_1x4x4x4_f32/flatbuffer-tflite/ref_model_Result0.npy
new file mode 100644
index 0000000..60baeac
--- /dev/null
+++ b/examples/test_add_1x4x4x4_f32/flatbuffer-tflite/ref_model_Result0.npy
diff --git a/examples/test_add_1x4x4x4_f32/model.pb b/examples/test_add_1x4x4x4_f32/model.pb
index c2570bf..930928d 100644
--- a/examples/test_add_1x4x4x4_f32/model.pb
+++ b/examples/test_add_1x4x4x4_f32/model.pb
@@ -70,7 +70,7 @@ node {
 }
 node {
   name: "result"
-  op: "Add"
+  op: "AddV2"
   input: "placeholder_0"
   input: "placeholder_1"
   attr {
@@ -92,5 +92,5 @@ node {
   }
 }
 versions {
-  producer: 714
+  producer: 772
 }
diff --git a/examples/test_conv2d_1x1_1x32x32x8_f32_st11_padSAME_dilat11/InputTensor-tf0.npy b/examples/test_conv2d_1x1_1x32x32x8_f32_st11_padSAME_dilat11/InputTensor-tf0.npy
deleted file mode 100644
index 328dbd8..0000000
--- a/examples/test_conv2d_1x1_1x32x32x8_f32_st11_padSAME_dilat11/InputTensor-tf0.npy
+++ /dev/null
diff --git a/examples/test_conv2d_1x1_1x32x32x8_f32_st11_padSAME_dilat11/InputTensor-tflite0.npy b/examples/test_conv2d_1x1_1x32x32x8_f32_st11_padSAME_dilat11/InputTensor-tflite0.npy
deleted file mode 100644
index 328dbd8..0000000
--- a/examples/test_conv2d_1x1_1x32x32x8_f32_st11_padSAME_dilat11/InputTensor-tflite0.npy
+++ /dev/null
diff --git a/examples/test_conv2d_1x1_1x32x32x8_f32_st11_padSAME_dilat11/flatbuffer-tf/desc.json b/examples/test_conv2d_1x1_1x32x32x8_f32_st11_padSAME_dilat11/flatbuffer-tf/desc.json
new file mode 100644
index 0000000..b62c528
--- /dev/null
+++ b/examples/test_conv2d_1x1_1x32x32x8_f32_st11_padSAME_dilat11/flatbuffer-tf/desc.json
@@ -0,0 +1,16 @@
+{
+  "tosa_file": "test_conv2d_1x1_1x32x32x8_f32_st11_padSAME_dilat11.tosa",
+  "ifm_name": [
+    "InputTensor-tf0"
+  ],
+  "ifm_file": [
+    "../placeholder_0.npy"
+  ],
+  "ofm_name": [
+    "Result0"
+  ],
+  "ofm_file": [
+    "ref_model_Result0.npy"
+  ],
+  "expected_failure": false
+}
\ No newline at end of file
diff --git a/examples/test_conv2d_1x1_1x32x32x8_f32_st11_padSAME_dilat11/flatbuffer-tf/layer_1.npy b/examples/test_conv2d_1x1_1x32x32x8_f32_st11_padSAME_dilat11/flatbuffer-tf/layer_1.npy
index ec9d526..42ff6d7 100644
--- a/examples/test_conv2d_1x1_1x32x32x8_f32_st11_padSAME_dilat11/flatbuffer-tf/layer_1.npy
+++ b/examples/test_conv2d_1x1_1x32x32x8_f32_st11_padSAME_dilat11/flatbuffer-tf/layer_1.npy
diff --git a/examples/test_conv2d_1x1_1x32x32x8_f32_st11_padSAME_dilat11/flatbuffer-tf/layer_2.npy b/examples/test_conv2d_1x1_1x32x32x8_f32_st11_padSAME_dilat11/flatbuffer-tf/layer_2.npy
index 42ff6d7..ec9d526 100644
--- a/examples/test_conv2d_1x1_1x32x32x8_f32_st11_padSAME_dilat11/flatbuffer-tf/layer_2.npy
+++ b/examples/test_conv2d_1x1_1x32x32x8_f32_st11_padSAME_dilat11/flatbuffer-tf/layer_2.npy
diff --git a/examples/test_conv2d_1x1_1x32x32x8_f32_st11_padSAME_dilat11/flatbuffer-tf/ref_model_Result0.npy b/examples/test_conv2d_1x1_1x32x32x8_f32_st11_padSAME_dilat11/flatbuffer-tf/ref_model_Result0.npy
new file mode 100644
index 0000000..d57e8da
--- /dev/null
+++ b/examples/test_conv2d_1x1_1x32x32x8_f32_st11_padSAME_dilat11/flatbuffer-tf/ref_model_Result0.npy
diff --git a/examples/test_conv2d_1x1_1x32x32x8_f32_st11_padSAME_dilat11/flatbuffer-tf/test_conv2d_1x1_1x32x32x8_f32_st11_padSAME_dilat11.tosa b/examples/test_conv2d_1x1_1x32x32x8_f32_st11_padSAME_dilat11/flatbuffer-tf/test_conv2d_1x1_1x32x32x8_f32_st11_padSAME_dilat11.tosa
index ea794c8..0204756 100644
--- a/examples/test_conv2d_1x1_1x32x32x8_f32_st11_padSAME_dilat11/flatbuffer-tf/test_conv2d_1x1_1x32x32x8_f32_st11_padSAME_dilat11.tosa
+++ b/examples/test_conv2d_1x1_1x32x32x8_f32_st11_padSAME_dilat11/flatbuffer-tf/test_conv2d_1x1_1x32x32x8_f32_st11_padSAME_dilat11.tosa
diff --git a/examples/test_conv2d_1x1_1x32x32x8_f32_st11_padSAME_dilat11/flatbuffer-tflite/desc.json b/examples/test_conv2d_1x1_1x32x32x8_f32_st11_padSAME_dilat11/flatbuffer-tflite/desc.json
new file mode 100644
index 0000000..2849934
--- /dev/null
+++ b/examples/test_conv2d_1x1_1x32x32x8_f32_st11_padSAME_dilat11/flatbuffer-tflite/desc.json
@@ -0,0 +1,16 @@
+{
+  "tosa_file": "test_conv2d_1x1_1x32x32x8_f32_st11_padSAME_dilat11.tosa",
+  "ifm_name": [
+    "InputTensor-tflite0"
+  ],
+  "ifm_file": [
+    "../placeholder_0.npy"
+  ],
+  "ofm_name": [
+    "Result0"
+  ],
+  "ofm_file": [
+    "ref_model_Result0.npy"
+  ],
+  "expected_failure": false
+}
\ No newline at end of file
diff --git a/examples/test_conv2d_1x1_1x32x32x8_f32_st11_padSAME_dilat11/flatbuffer-tflite/layer_1.npy b/examples/test_conv2d_1x1_1x32x32x8_f32_st11_padSAME_dilat11/flatbuffer-tflite/layer_1.npy
index 207be76..ec9d526 100644
--- a/examples/test_conv2d_1x1_1x32x32x8_f32_st11_padSAME_dilat11/flatbuffer-tflite/layer_1.npy
+++ b/examples/test_conv2d_1x1_1x32x32x8_f32_st11_padSAME_dilat11/flatbuffer-tflite/layer_1.npy
diff --git a/examples/test_conv2d_1x1_1x32x32x8_f32_st11_padSAME_dilat11/flatbuffer-tflite/layer_2.npy b/examples/test_conv2d_1x1_1x32x32x8_f32_st11_padSAME_dilat11/flatbuffer-tflite/layer_2.npy
index ec9d526..207be76 100644
--- a/examples/test_conv2d_1x1_1x32x32x8_f32_st11_padSAME_dilat11/flatbuffer-tflite/layer_2.npy
+++ b/examples/test_conv2d_1x1_1x32x32x8_f32_st11_padSAME_dilat11/flatbuffer-tflite/layer_2.npy
diff --git a/examples/test_conv2d_1x1_1x32x32x8_f32_st11_padSAME_dilat11/flatbuffer-tflite/ref_model_Result0.npy b/examples/test_conv2d_1x1_1x32x32x8_f32_st11_padSAME_dilat11/flatbuffer-tflite/ref_model_Result0.npy
new file mode 100644
index 0000000..d57e8da
--- /dev/null
+++ b/examples/test_conv2d_1x1_1x32x32x8_f32_st11_padSAME_dilat11/flatbuffer-tflite/ref_model_Result0.npy
diff --git a/examples/test_conv2d_1x1_1x32x32x8_f32_st11_padSAME_dilat11/flatbuffer-tflite/test_conv2d_1x1_1x32x32x8_f32_st11_padSAME_dilat11.tosa b/examples/test_conv2d_1x1_1x32x32x8_f32_st11_padSAME_dilat11/flatbuffer-tflite/test_conv2d_1x1_1x32x32x8_f32_st11_padSAME_dilat11.tosa
index dfc7c9c..f549d12 100644
--- a/examples/test_conv2d_1x1_1x32x32x8_f32_st11_padSAME_dilat11/flatbuffer-tflite/test_conv2d_1x1_1x32x32x8_f32_st11_padSAME_dilat11.tosa
+++ b/examples/test_conv2d_1x1_1x32x32x8_f32_st11_padSAME_dilat11/flatbuffer-tflite/test_conv2d_1x1_1x32x32x8_f32_st11_padSAME_dilat11.tosa
diff --git a/examples/test_conv2d_1x1_1x32x32x8_f32_st11_padSAME_dilat11/model.pb b/examples/test_conv2d_1x1_1x32x32x8_f32_st11_padSAME_dilat11/model.pb
index 500cc08..6e8a215 100644
--- a/examples/test_conv2d_1x1_1x32x32x8_f32_st11_padSAME_dilat11/model.pb
+++ b/examples/test_conv2d_1x1_1x32x32x8_f32_st11_padSAME_dilat11/model.pb
@@ -137,5 +137,5 @@ node {
   }
 }
 versions {
-  producer: 714
+  producer: 772
 }
diff --git a/examples/test_conv2d_1x1_1x32x32x8_qi8_st11_padSAME_dilat11/InputTensor-tflite0.npy b/examples/test_conv2d_1x1_1x32x32x8_qi8_st11_padSAME_dilat11/InputTensor-tflite0.npy
deleted file mode 100644
index a61baf4..0000000
--- a/examples/test_conv2d_1x1_1x32x32x8_qi8_st11_padSAME_dilat11/InputTensor-tflite0.npy
+++ /dev/null
diff --git a/examples/test_conv2d_1x1_1x32x32x8_qi8_st11_padSAME_dilat11/flatbuffer-tflite/desc.json b/examples/test_conv2d_1x1_1x32x32x8_qi8_st11_padSAME_dilat11/flatbuffer-tflite/desc.json
new file mode 100644
index 0000000..c935e0a
--- /dev/null
+++ b/examples/test_conv2d_1x1_1x32x32x8_qi8_st11_padSAME_dilat11/flatbuffer-tflite/desc.json
@@ -0,0 +1,16 @@
+{
+  "tosa_file": "test_conv2d_1x1_1x32x32x8_qi8_st11_padSAME_dilat11.tosa",
+  "ifm_name": [
+    "InputTensor-tflite0"
+  ],
+  "ifm_file": [
+    "../placeholder_0.npy"
+  ],
+  "ofm_name": [
+    "Result0"
+  ],
+  "ofm_file": [
+    "ref_model_Result0.npy"
+  ],
+  "expected_failure": false
+}
\ No newline at end of file
diff --git a/examples/test_conv2d_1x1_1x32x32x8_qi8_st11_padSAME_dilat11/flatbuffer-tflite/layer_1.npy b/examples/test_conv2d_1x1_1x32x32x8_qi8_st11_padSAME_dilat11/flatbuffer-tflite/layer_1.npy
index 7494934..67c2421 100644
--- a/examples/test_conv2d_1x1_1x32x32x8_qi8_st11_padSAME_dilat11/flatbuffer-tflite/layer_1.npy
+++ b/examples/test_conv2d_1x1_1x32x32x8_qi8_st11_padSAME_dilat11/flatbuffer-tflite/layer_1.npy
diff --git a/examples/test_conv2d_1x1_1x32x32x8_qi8_st11_padSAME_dilat11/flatbuffer-tflite/layer_2.npy b/examples/test_conv2d_1x1_1x32x32x8_qi8_st11_padSAME_dilat11/flatbuffer-tflite/layer_2.npy
index 67c2421..7494934 100644
--- a/examples/test_conv2d_1x1_1x32x32x8_qi8_st11_padSAME_dilat11/flatbuffer-tflite/layer_2.npy
+++ b/examples/test_conv2d_1x1_1x32x32x8_qi8_st11_padSAME_dilat11/flatbuffer-tflite/layer_2.npy
diff --git a/examples/test_conv2d_1x1_1x32x32x8_qi8_st11_padSAME_dilat11/flatbuffer-tflite/ref_model_Result0.npy b/examples/test_conv2d_1x1_1x32x32x8_qi8_st11_padSAME_dilat11/flatbuffer-tflite/ref_model_Result0.npy
new file mode 100644
index 0000000..5c9ff1d
--- /dev/null
+++ b/examples/test_conv2d_1x1_1x32x32x8_qi8_st11_padSAME_dilat11/flatbuffer-tflite/ref_model_Result0.npy
diff --git a/examples/test_conv2d_1x1_1x32x32x8_qi8_st11_padSAME_dilat11/flatbuffer-tflite/test_conv2d_1x1_1x32x32x8_qi8_st11_padSAME_dilat11.tosa b/examples/test_conv2d_1x1_1x32x32x8_qi8_st11_padSAME_dilat11/flatbuffer-tflite/test_conv2d_1x1_1x32x32x8_qi8_st11_padSAME_dilat11.tosa
index 1e21d49..248dace 100644
--- a/examples/test_conv2d_1x1_1x32x32x8_qi8_st11_padSAME_dilat11/flatbuffer-tflite/test_conv2d_1x1_1x32x32x8_qi8_st11_padSAME_dilat11.tosa
+++ b/examples/test_conv2d_1x1_1x32x32x8_qi8_st11_padSAME_dilat11/flatbuffer-tflite/test_conv2d_1x1_1x32x32x8_qi8_st11_padSAME_dilat11.tosa
diff --git a/examples/test_conv2d_1x1_1x32x32x8_qi8_st11_padSAME_dilat11/model.tflite b/examples/test_conv2d_1x1_1x32x32x8_qi8_st11_padSAME_dilat11/model.tflite
index 4c6f35e..840fdb9 100644
--- a/examples/test_conv2d_1x1_1x32x32x8_qi8_st11_padSAME_dilat11/model.tflite
+++ b/examples/test_conv2d_1x1_1x32x32x8_qi8_st11_padSAME_dilat11/model.tflite
diff --git a/examples/test_conv2d_1x1_1x32x32x8_qi8_st11_padSAME_dilat11/test.json b/examples/test_conv2d_1x1_1x32x32x8_qi8_st11_padSAME_dilat11/test.json
index f7a007d..5124ff9 100644
--- a/examples/test_conv2d_1x1_1x32x32x8_qi8_st11_padSAME_dilat11/test.json
+++ b/examples/test_conv2d_1x1_1x32x32x8_qi8_st11_padSAME_dilat11/test.json
@@ -1,7 +1,7 @@
 {
   "tflite_model_filename": "model.tflite",
   "tflite_result_npy_filename": "tflite_result.npy",
-  "tflite_result_name": "Identity_int8",
+  "tflite_result_name": "Identity",
   "ifm_file": [
     "placeholder_0.npy"
   ],