Rewrite model frontend to be json-driven.

Change-Id: Iac786eff96183938d2fd11cde9313c6e8e1270a5

9 files changed, 38 insertions, 2 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
 }