Renaming Gather GTests to gather_ex (#3767)

This patch renames Gather GTests to gather_ex.
This is done to maintain the uniformity.

Signed-off-by: prasannar <prasanna.r@samsung.com>

diff --git a/runtimes/tests/neural_networks_test/generated/all_generated_tests.cpp b/runtimes/tests/neural_networks_test/generated/all_generated_tests.cpp
index b627d49..a56a409 100644 (file)
--- a/runtimes/tests/neural_networks_test/generated/all_generated_tests.cpp
+++ b/runtimes/tests/neural_networks_test/generated/all_generated_tests.cpp
@@ -3277,88 +3277,88 @@ TEST_F(GeneratedTests, exp_ex_2D_float) {
             exp_ex_2D_float::examples);
 }
 
-namespace gather_1D_float {
+namespace gather_ex_1D_float {
 std::vector<MixedTypedExample> examples = {
-// Generated gather_1D_float test
-#include "generated/examples/gather_1D_float.example.cpp"
+// Generated gather_ex_1D_float test
+#include "generated/examples/gather_ex_1D_float.example.cpp"
 };
 // Generated model constructor
-#include "generated/models/gather_1D_float.model.cpp"
-} // namespace gather_1D_float
-TEST_F(GeneratedTests, gather_1D_float) {
-    execute(gather_1D_float::CreateModel,
-            gather_1D_float::is_ignored,
-            gather_1D_float::examples);
+#include "generated/models/gather_ex_1D_float.model.cpp"
+} // namespace gather_ex_1D_float
+TEST_F(GeneratedTests, gather_ex_1D_float) {
+    execute(gather_ex_1D_float::CreateModel,
+            gather_ex_1D_float::is_ignored,
+            gather_ex_1D_float::examples);
 }
 
-namespace gather_1D_int32 {
+namespace gather_ex_1D_int32 {
 std::vector<MixedTypedExample> examples = {
-// Generated gather_1D_int32 test
-#include "generated/examples/gather_1D_int32.example.cpp"
+// Generated gather_ex_1D_int32 test
+#include "generated/examples/gather_ex_1D_int32.example.cpp"
 };
 // Generated model constructor
-#include "generated/models/gather_1D_int32.model.cpp"
-} // namespace gather_1D_int32
-TEST_F(GeneratedTests, gather_1D_int32) {
-    execute(gather_1D_int32::CreateModel,
-            gather_1D_int32::is_ignored,
-            gather_1D_int32::examples);
+#include "generated/models/gather_ex_1D_int32.model.cpp"
+} // namespace gather_ex_1D_int32
+TEST_F(GeneratedTests, gather_ex_1D_int32) {
+    execute(gather_ex_1D_int32::CreateModel,
+            gather_ex_1D_int32::is_ignored,
+            gather_ex_1D_int32::examples);
 }
 
-namespace gather_1D_quant8 {
+namespace gather_ex_1D_quant8 {
 std::vector<MixedTypedExample> examples = {
-// Generated gather_1D_quant8 test
-#include "generated/examples/gather_1D_quant8.example.cpp"
+// Generated gather_ex_1D_quant8 test
+#include "generated/examples/gather_ex_1D_quant8.example.cpp"
 };
 // Generated model constructor
-#include "generated/models/gather_1D_quant8.model.cpp"
-} // namespace gather_1D_quant8
-TEST_F(GeneratedTests, gather_1D_quant8) {
-    execute(gather_1D_quant8::CreateModel,
-            gather_1D_quant8::is_ignored,
-            gather_1D_quant8::examples);
+#include "generated/models/gather_ex_1D_quant8.model.cpp"
+} // namespace gather_ex_1D_quant8
+TEST_F(GeneratedTests, gather_ex_1D_quant8) {
+    execute(gather_ex_1D_quant8::CreateModel,
+            gather_ex_1D_quant8::is_ignored,
+            gather_ex_1D_quant8::examples);
 }
 
-namespace gather_2D_float {
+namespace gather_ex_2D_float {
 std::vector<MixedTypedExample> examples = {
-// Generated gather_2D_float test
-#include "generated/examples/gather_2D_float.example.cpp"
+// Generated gather_ex_2D_float test
+#include "generated/examples/gather_ex_2D_float.example.cpp"
 };
 // Generated model constructor
-#include "generated/models/gather_2D_float.model.cpp"
-} // namespace gather_2D_float
-TEST_F(GeneratedTests, gather_2D_float) {
-    execute(gather_2D_float::CreateModel,
-            gather_2D_float::is_ignored,
-            gather_2D_float::examples);
+#include "generated/models/gather_ex_2D_float.model.cpp"
+} // namespace gather_ex_2D_float
+TEST_F(GeneratedTests, gather_ex_2D_float) {
+    execute(gather_ex_2D_float::CreateModel,
+            gather_ex_2D_float::is_ignored,
+            gather_ex_2D_float::examples);
 }
 
-namespace gather_2D_int32 {
+namespace gather_ex_2D_int32 {
 std::vector<MixedTypedExample> examples = {
-// Generated gather_2D_int32 test
-#include "generated/examples/gather_2D_int32.example.cpp"
+// Generated gather_ex_2D_int32 test
+#include "generated/examples/gather_ex_2D_int32.example.cpp"
 };
 // Generated model constructor
-#include "generated/models/gather_2D_int32.model.cpp"
-} // namespace gather_2D_int32
-TEST_F(GeneratedTests, gather_2D_int32) {
-    execute(gather_2D_int32::CreateModel,
-            gather_2D_int32::is_ignored,
-            gather_2D_int32::examples);
+#include "generated/models/gather_ex_2D_int32.model.cpp"
+} // namespace gather_ex_2D_int32
+TEST_F(GeneratedTests, gather_ex_2D_int32) {
+    execute(gather_ex_2D_int32::CreateModel,
+            gather_ex_2D_int32::is_ignored,
+            gather_ex_2D_int32::examples);
 }
 
-namespace gather_2D_quant8 {
+namespace gather_ex_2D_quant8 {
 std::vector<MixedTypedExample> examples = {
-// Generated gather_2D_quant8 test
-#include "generated/examples/gather_2D_quant8.example.cpp"
+// Generated gather_ex_2D_quant8 test
+#include "generated/examples/gather_ex_2D_quant8.example.cpp"
 };
 // Generated model constructor
-#include "generated/models/gather_2D_quant8.model.cpp"
-} // namespace gather_2D_quant8
-TEST_F(GeneratedTests, gather_2D_quant8) {
-    execute(gather_2D_quant8::CreateModel,
-            gather_2D_quant8::is_ignored,
-            gather_2D_quant8::examples);
+#include "generated/models/gather_ex_2D_quant8.model.cpp"
+} // namespace gather_ex_2D_quant8
+TEST_F(GeneratedTests, gather_ex_2D_quant8) {
+    execute(gather_ex_2D_quant8::CreateModel,
+            gather_ex_2D_quant8::is_ignored,
+            gather_ex_2D_quant8::examples);
 }
 
 namespace logical_and_ex_1D {

diff --git a/runtimes/tests/neural_networks_test/generated/examples/gather_1D_float.example.cpp b/runtimes/tests/neural_networks_test/generated/examples/gather_ex_1D_float.example.cpp
similarity index 87%
rename from runtimes/tests/neural_networks_test/generated/examples/gather_1D_float.example.cpp
rename to runtimes/tests/neural_networks_test/generated/examples/gather_ex_1D_float.example.cpp
index 494968c..7e8f044 100644 (file)
--- a/runtimes/tests/neural_networks_test/generated/examples/gather_1D_float.example.cpp
+++ b/runtimes/tests/neural_networks_test/generated/examples/gather_ex_1D_float.example.cpp
@@ -1,4 +1,4 @@
-// Generated file (from: gather_1D_float.mod.py). Do not edit
+// Generated file (from: gather_ex_1D_float.mod.py). Do not edit
 // Begin of an example
 {
 //Input(s)

diff --git a/runtimes/tests/neural_networks_test/generated/examples/gather_1D_int32.example.cpp b/runtimes/tests/neural_networks_test/generated/examples/gather_ex_1D_int32.example.cpp
similarity index 87%
rename from runtimes/tests/neural_networks_test/generated/examples/gather_1D_int32.example.cpp
rename to runtimes/tests/neural_networks_test/generated/examples/gather_ex_1D_int32.example.cpp
index 305018a..c9167c5 100644 (file)
--- a/runtimes/tests/neural_networks_test/generated/examples/gather_1D_int32.example.cpp
+++ b/runtimes/tests/neural_networks_test/generated/examples/gather_ex_1D_int32.example.cpp
@@ -1,4 +1,4 @@
-// Generated file (from: gather_1D_int32.mod.py). Do not edit
+// Generated file (from: gather_ex_1D_int32.mod.py). Do not edit
 // Begin of an example
 {
 //Input(s)

diff --git a/runtimes/tests/neural_networks_test/generated/examples/gather_1D_quant8.example.cpp b/runtimes/tests/neural_networks_test/generated/examples/gather_ex_1D_quant8.example.cpp
similarity index 86%
rename from runtimes/tests/neural_networks_test/generated/examples/gather_1D_quant8.example.cpp
rename to runtimes/tests/neural_networks_test/generated/examples/gather_ex_1D_quant8.example.cpp
index 325b77b..fb5330b 100644 (file)
--- a/runtimes/tests/neural_networks_test/generated/examples/gather_1D_quant8.example.cpp
+++ b/runtimes/tests/neural_networks_test/generated/examples/gather_ex_1D_quant8.example.cpp
@@ -1,4 +1,4 @@
-// Generated file (from: gather_1D_quant8.mod.py). Do not edit
+// Generated file (from: gather_ex_1D_quant8.mod.py). Do not edit
 // Begin of an example
 {
 //Input(s)

diff --git a/runtimes/tests/neural_networks_test/generated/examples/gather_2D_float.example.cpp b/runtimes/tests/neural_networks_test/generated/examples/gather_ex_2D_float.example.cpp
similarity index 92%
rename from runtimes/tests/neural_networks_test/generated/examples/gather_2D_float.example.cpp
rename to runtimes/tests/neural_networks_test/generated/examples/gather_ex_2D_float.example.cpp
index 0bf46fd..8889e15 100644 (file)
--- a/runtimes/tests/neural_networks_test/generated/examples/gather_2D_float.example.cpp
+++ b/runtimes/tests/neural_networks_test/generated/examples/gather_ex_2D_float.example.cpp
@@ -1,4 +1,4 @@
-// Generated file (from: gather_2D_float.mod.py). Do not edit
+// Generated file (from: gather_ex_2D_float.mod.py). Do not edit
 // Begin of an example
 {
 //Input(s)

diff --git a/runtimes/tests/neural_networks_test/generated/examples/gather_2D_int32.example.cpp b/runtimes/tests/neural_networks_test/generated/examples/gather_ex_2D_int32.example.cpp
similarity index 89%
rename from runtimes/tests/neural_networks_test/generated/examples/gather_2D_int32.example.cpp
rename to runtimes/tests/neural_networks_test/generated/examples/gather_ex_2D_int32.example.cpp
index 052eff5..4809086 100644 (file)
--- a/runtimes/tests/neural_networks_test/generated/examples/gather_2D_int32.example.cpp
+++ b/runtimes/tests/neural_networks_test/generated/examples/gather_ex_2D_int32.example.cpp
@@ -1,4 +1,4 @@
-// Generated file (from: gather_2D_int32.mod.py). Do not edit
+// Generated file (from: gather_ex_2D_int32.mod.py). Do not edit
 // Begin of an example
 {
 //Input(s)

diff --git a/runtimes/tests/neural_networks_test/generated/examples/gather_2D_quant8.example.cpp b/runtimes/tests/neural_networks_test/generated/examples/gather_ex_2D_quant8.example.cpp
similarity index 87%
rename from runtimes/tests/neural_networks_test/generated/examples/gather_2D_quant8.example.cpp
rename to runtimes/tests/neural_networks_test/generated/examples/gather_ex_2D_quant8.example.cpp
index 7b6f699..a30fcfb 100644 (file)
--- a/runtimes/tests/neural_networks_test/generated/examples/gather_2D_quant8.example.cpp
+++ b/runtimes/tests/neural_networks_test/generated/examples/gather_ex_2D_quant8.example.cpp
@@ -1,4 +1,4 @@
-// Generated file (from: gather_2D_quant8.mod.py). Do not edit
+// Generated file (from: gather_ex_2D_quant8.mod.py). Do not edit
 // Begin of an example
 {
 //Input(s)

diff --git a/runtimes/tests/neural_networks_test/generated/models/gather_1D_float.model.cpp b/runtimes/tests/neural_networks_test/generated/models/gather_ex_1D_float.model.cpp
similarity index 92%
rename from runtimes/tests/neural_networks_test/generated/models/gather_1D_float.model.cpp
rename to runtimes/tests/neural_networks_test/generated/models/gather_ex_1D_float.model.cpp
index 8ad1609..ba83ce7 100644 (file)
--- a/runtimes/tests/neural_networks_test/generated/models/gather_1D_float.model.cpp
+++ b/runtimes/tests/neural_networks_test/generated/models/gather_ex_1D_float.model.cpp
@@ -1,4 +1,4 @@
-// Generated file (from: gather_1D_float.mod.py). Do not edit
+// Generated file (from: gather_ex_1D_float.mod.py). Do not edit
 void CreateModel(Model *model) {
   OperandType type2(Type::INT32, {});
   OperandType type3(Type::TENSOR_FLOAT32, {2});

diff --git a/runtimes/tests/neural_networks_test/generated/models/gather_1D_int32.model.cpp b/runtimes/tests/neural_networks_test/generated/models/gather_ex_1D_int32.model.cpp
similarity index 92%
rename from runtimes/tests/neural_networks_test/generated/models/gather_1D_int32.model.cpp
rename to runtimes/tests/neural_networks_test/generated/models/gather_ex_1D_int32.model.cpp
index ae7fa66..7f98c81 100644 (file)
--- a/runtimes/tests/neural_networks_test/generated/models/gather_1D_int32.model.cpp
+++ b/runtimes/tests/neural_networks_test/generated/models/gather_ex_1D_int32.model.cpp
@@ -1,4 +1,4 @@
-// Generated file (from: gather_1D_int32.mod.py). Do not edit
+// Generated file (from: gather_ex_1D_int32.mod.py). Do not edit
 void CreateModel(Model *model) {
   OperandType type2(Type::INT32, {});
   OperandType type1(Type::TENSOR_INT32, {2});

diff --git a/runtimes/tests/neural_networks_test/generated/models/gather_1D_quant8.model.cpp b/runtimes/tests/neural_networks_test/generated/models/gather_ex_1D_quant8.model.cpp
similarity index 92%
rename from runtimes/tests/neural_networks_test/generated/models/gather_1D_quant8.model.cpp
rename to runtimes/tests/neural_networks_test/generated/models/gather_ex_1D_quant8.model.cpp
index e45a820..1d8de86 100644 (file)
--- a/runtimes/tests/neural_networks_test/generated/models/gather_1D_quant8.model.cpp
+++ b/runtimes/tests/neural_networks_test/generated/models/gather_ex_1D_quant8.model.cpp
@@ -1,4 +1,4 @@
-// Generated file (from: gather_1D_quant8.mod.py). Do not edit
+// Generated file (from: gather_ex_1D_quant8.mod.py). Do not edit
 void CreateModel(Model *model) {
   OperandType type2(Type::INT32, {});
   OperandType type1(Type::TENSOR_INT32, {2});

diff --git a/runtimes/tests/neural_networks_test/generated/models/gather_2D_float.model.cpp b/runtimes/tests/neural_networks_test/generated/models/gather_ex_2D_float.model.cpp
similarity index 92%
rename from runtimes/tests/neural_networks_test/generated/models/gather_2D_float.model.cpp
rename to runtimes/tests/neural_networks_test/generated/models/gather_ex_2D_float.model.cpp
index 3d80c44..e7d7272 100644 (file)
--- a/runtimes/tests/neural_networks_test/generated/models/gather_2D_float.model.cpp
+++ b/runtimes/tests/neural_networks_test/generated/models/gather_ex_2D_float.model.cpp
@@ -1,4 +1,4 @@
-// Generated file (from: gather_2D_float.mod.py). Do not edit
+// Generated file (from: gather_ex_2D_float.mod.py). Do not edit
 void CreateModel(Model *model) {
   OperandType type2(Type::INT32, {});
   OperandType type3(Type::TENSOR_FLOAT32, {2,4});

diff --git a/runtimes/tests/neural_networks_test/generated/models/gather_2D_int32.model.cpp b/runtimes/tests/neural_networks_test/generated/models/gather_ex_2D_int32.model.cpp
similarity index 92%
rename from runtimes/tests/neural_networks_test/generated/models/gather_2D_int32.model.cpp
rename to runtimes/tests/neural_networks_test/generated/models/gather_ex_2D_int32.model.cpp
index 50411d5..73ea89e 100644 (file)
--- a/runtimes/tests/neural_networks_test/generated/models/gather_2D_int32.model.cpp
+++ b/runtimes/tests/neural_networks_test/generated/models/gather_ex_2D_int32.model.cpp
@@ -1,4 +1,4 @@
-// Generated file (from: gather_2D_int32.mod.py). Do not edit
+// Generated file (from: gather_ex_2D_int32.mod.py). Do not edit
 void CreateModel(Model *model) {
   OperandType type2(Type::INT32, {});
   OperandType type3(Type::TENSOR_INT32, {2,4});

diff --git a/runtimes/tests/neural_networks_test/generated/models/gather_2D_quant8.model.cpp b/runtimes/tests/neural_networks_test/generated/models/gather_ex_2D_quant8.model.cpp
similarity index 92%
rename from runtimes/tests/neural_networks_test/generated/models/gather_2D_quant8.model.cpp
rename to runtimes/tests/neural_networks_test/generated/models/gather_ex_2D_quant8.model.cpp
index 7797dae..2d8e5ef 100644 (file)
--- a/runtimes/tests/neural_networks_test/generated/models/gather_2D_quant8.model.cpp
+++ b/runtimes/tests/neural_networks_test/generated/models/gather_ex_2D_quant8.model.cpp
@@ -1,4 +1,4 @@
-// Generated file (from: gather_2D_quant8.mod.py). Do not edit
+// Generated file (from: gather_ex_2D_quant8.mod.py). Do not edit
 void CreateModel(Model *model) {
   OperandType type2(Type::INT32, {});
   OperandType type1(Type::TENSOR_INT32, {2});

diff --git a/runtimes/tests/neural_networks_test/runtime_run_android_nn_test.skip.armv7l-linux.neurun b/runtimes/tests/neural_networks_test/runtime_run_android_nn_test.skip.armv7l-linux.neurun
index 4ff21a0..bf60118 100644 (file)
--- a/runtimes/tests/neural_networks_test/runtime_run_android_nn_test.skip.armv7l-linux.neurun
+++ b/runtimes/tests/neural_networks_test/runtime_run_android_nn_test.skip.armv7l-linux.neurun
@@ -102,8 +102,7 @@ GeneratedTests.strided_slice*
 GeneratedTests.sub*
 GeneratedTests.transpose*
 GeneratedTests.cast_ex*
-GeneratedTests.gather_1D*
-GeneratedTests.gather_2D*
+GeneratedTests.gather_ex*
 GeneratedTests.strided_slice_ex*
 GeneratedTests.tensorflowmax_ex*
 GeneratedTests.tensorflowsum_ex*

diff --git a/runtimes/tests/neural_networks_test/runtime_run_android_nn_test.skip.x86_64-linux b/runtimes/tests/neural_networks_test/runtime_run_android_nn_test.skip.x86_64-linux
index 94eaadf..090c1cc 100644 (file)
--- a/runtimes/tests/neural_networks_test/runtime_run_android_nn_test.skip.x86_64-linux
+++ b/runtimes/tests/neural_networks_test/runtime_run_android_nn_test.skip.x86_64-linux
@@ -79,8 +79,8 @@ ValidationTestModel.*
 ValidationTestCompilation.*
 ValidationTestIdentify.*
 ValidationTestExecution.*
-GeneratedTests.gather_1D_quant8
-GeneratedTests.gather_2D_quant8
+GeneratedTests.gather_ex_1D_quant8
+GeneratedTests.gather_ex_2D_quant8
 GeneratedTests.split*
 GeneratedTests.pack*
 GeneratedTests.unpack*

diff --git a/runtimes/tests/neural_networks_test/specs/Ex/gather_1D_float.mod.py b/runtimes/tests/neural_networks_test/specs/Ex/gather_ex_1D_float.mod.py
similarity index 100%
rename from runtimes/tests/neural_networks_test/specs/Ex/gather_1D_float.mod.py
rename to runtimes/tests/neural_networks_test/specs/Ex/gather_ex_1D_float.mod.py

diff --git a/runtimes/tests/neural_networks_test/specs/Ex/gather_1D_int32.mod.py b/runtimes/tests/neural_networks_test/specs/Ex/gather_ex_1D_int32.mod.py
similarity index 100%
rename from runtimes/tests/neural_networks_test/specs/Ex/gather_1D_int32.mod.py
rename to runtimes/tests/neural_networks_test/specs/Ex/gather_ex_1D_int32.mod.py

diff --git a/runtimes/tests/neural_networks_test/specs/Ex/gather_1D_quant8.mod.py b/runtimes/tests/neural_networks_test/specs/Ex/gather_ex_1D_quant8.mod.py
similarity index 100%
rename from runtimes/tests/neural_networks_test/specs/Ex/gather_1D_quant8.mod.py
rename to runtimes/tests/neural_networks_test/specs/Ex/gather_ex_1D_quant8.mod.py

diff --git a/runtimes/tests/neural_networks_test/specs/Ex/gather_2D_float.mod.py b/runtimes/tests/neural_networks_test/specs/Ex/gather_ex_2D_float.mod.py
similarity index 100%
rename from runtimes/tests/neural_networks_test/specs/Ex/gather_2D_float.mod.py
rename to runtimes/tests/neural_networks_test/specs/Ex/gather_ex_2D_float.mod.py

diff --git a/runtimes/tests/neural_networks_test/specs/Ex/gather_2D_int32.mod.py b/runtimes/tests/neural_networks_test/specs/Ex/gather_ex_2D_int32.mod.py
similarity index 100%
rename from runtimes/tests/neural_networks_test/specs/Ex/gather_2D_int32.mod.py
rename to runtimes/tests/neural_networks_test/specs/Ex/gather_ex_2D_int32.mod.py

diff --git a/runtimes/tests/neural_networks_test/specs/Ex/gather_2D_quant8.mod.py b/runtimes/tests/neural_networks_test/specs/Ex/gather_ex_2D_quant8.mod.py
similarity index 100%
rename from runtimes/tests/neural_networks_test/specs/Ex/gather_2D_quant8.mod.py
rename to runtimes/tests/neural_networks_test/specs/Ex/gather_ex_2D_quant8.mod.py