From 4abd707998dcdbfe9ad2293cc1c3eec9ff9c39d3 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=EC=9C=A4=EC=A7=80=EC=98=81/=EB=8F=99=EC=9E=91=EC=A0=9C?= =?utf8?q?=EC=96=B4Lab=28SR=29/Engineer/=EC=82=BC=EC=84=B1=EC=A0=84?= =?utf8?q?=EC=9E=90?= Date: Tue, 10 Jul 2018 10:49:32 +0900 Subject: [PATCH] tools/nnapi_unittest runs as GTest (#1810) Some unittest have not been modified yet, so these cases are changed to GTest. Signed-off-by: Jiyoung Yun --- tools/nnapi_unittests/tests/add_4.cpp | 8 ++++++-- tools/nnapi_unittests/tests/add_5.cpp | 8 ++++++-- tools/nnapi_unittests/tests/add_6.cpp | 8 ++++++-- tools/nnapi_unittests/tests/add_7.cpp | 8 ++++++-- tools/nnapi_unittests/tests/add_8.cpp | 8 ++++++-- tools/nnapi_unittests/tests/dequantize_1.cpp | 8 ++++++-- tools/nnapi_unittests/tests/relu6_1.cpp | 8 ++++++-- tools/nnapi_unittests/tests/relu_1.cpp | 8 ++++++-- tools/nnapi_unittests/tests/relu_2.cpp | 8 ++++++-- tools/nnapi_unittests/tests/relu_3.cpp | 8 ++++++-- tools/nnapi_unittests/tests/softmax_2.cpp | 8 ++++++-- tools/nnapi_unittests/tests/tanh_1.cpp | 8 ++++++-- 12 files changed, 72 insertions(+), 24 deletions(-) diff --git a/tools/nnapi_unittests/tests/add_4.cpp b/tools/nnapi_unittests/tests/add_4.cpp index 56f2932..9a10185 100644 --- a/tools/nnapi_unittests/tests/add_4.cpp +++ b/tools/nnapi_unittests/tests/add_4.cpp @@ -14,6 +14,8 @@ * limitations under the License. */ +#include "gtest/gtest.h" + #include "support/tflite/kernels/register.h" #include "tensorflow/contrib/lite/model.h" #include "tensorflow/contrib/lite/builtin_op_data.h" @@ -35,7 +37,7 @@ using namespace tflite; using namespace tflite::ops::builtin; -int main(int argc, char **argv) +TEST(NNAPI_Unittest_add_4, simple_test) { int verbose = 0; int tolerance = 1; @@ -151,5 +153,7 @@ int main(int argc, char **argv) param.verbose = verbose; param.tolerance = tolerance; - return RandomTestRunner{SEED, param}.run(builder); + int res = RandomTestRunner{SEED, param}.run(builder); + + EXPECT_EQ(res, 0); } diff --git a/tools/nnapi_unittests/tests/add_5.cpp b/tools/nnapi_unittests/tests/add_5.cpp index 2957e41..e4690ed 100644 --- a/tools/nnapi_unittests/tests/add_5.cpp +++ b/tools/nnapi_unittests/tests/add_5.cpp @@ -14,6 +14,8 @@ * limitations under the License. */ +#include "gtest/gtest.h" + #include "support/tflite/kernels/register.h" #include "tensorflow/contrib/lite/model.h" #include "tensorflow/contrib/lite/builtin_op_data.h" @@ -35,7 +37,7 @@ using namespace tflite; using namespace tflite::ops::builtin; -int main(int argc, char **argv) +TEST(NNAPI_Unittest_add_5, simple_test) { int verbose = 0; int tolerance = 1; @@ -144,5 +146,7 @@ int main(int argc, char **argv) param.verbose = verbose; param.tolerance = tolerance; - return RandomTestRunner{SEED, param}.run(builder); + int res = RandomTestRunner{SEED, param}.run(builder); + + EXPECT_EQ(res, 0); } diff --git a/tools/nnapi_unittests/tests/add_6.cpp b/tools/nnapi_unittests/tests/add_6.cpp index 81ab842..7153d26 100644 --- a/tools/nnapi_unittests/tests/add_6.cpp +++ b/tools/nnapi_unittests/tests/add_6.cpp @@ -14,6 +14,8 @@ * limitations under the License. */ +#include "gtest/gtest.h" + #include "support/tflite/kernels/register.h" #include "tensorflow/contrib/lite/model.h" #include "tensorflow/contrib/lite/builtin_op_data.h" @@ -35,7 +37,7 @@ using namespace tflite; using namespace tflite::ops::builtin; -int main(int argc, char **argv) +TEST(NNAPI_Unittest_add_6, simple_test) { int verbose = 1; int tolerance = 1; @@ -136,5 +138,7 @@ int main(int argc, char **argv) param.verbose = verbose; param.tolerance = tolerance; - return RandomTestRunner{SEED, param}.run(builder); + int res = RandomTestRunner{SEED, param}.run(builder); + + EXPECT_EQ(res, 0); } diff --git a/tools/nnapi_unittests/tests/add_7.cpp b/tools/nnapi_unittests/tests/add_7.cpp index 8903ee5..12999ab 100644 --- a/tools/nnapi_unittests/tests/add_7.cpp +++ b/tools/nnapi_unittests/tests/add_7.cpp @@ -14,6 +14,8 @@ * limitations under the License. */ +#include "gtest/gtest.h" + #include "support/tflite/kernels/register.h" #include "tensorflow/contrib/lite/model.h" #include "tensorflow/contrib/lite/builtin_op_data.h" @@ -35,7 +37,7 @@ using namespace tflite; using namespace tflite::ops::builtin; -int main(int argc, char **argv) +TEST(NNAPI_Unittest_add_7, simple_test) { int verbose = 0; int tolerance = 1; @@ -144,5 +146,7 @@ int main(int argc, char **argv) param.verbose = verbose; param.tolerance = tolerance; - return RandomTestRunner{SEED, param}.run(builder); + int res = RandomTestRunner{SEED, param}.run(builder); + + EXPECT_EQ(res, 0); } diff --git a/tools/nnapi_unittests/tests/add_8.cpp b/tools/nnapi_unittests/tests/add_8.cpp index a9b77ae..d7936e6 100644 --- a/tools/nnapi_unittests/tests/add_8.cpp +++ b/tools/nnapi_unittests/tests/add_8.cpp @@ -14,6 +14,8 @@ * limitations under the License. */ +#include "gtest/gtest.h" + #include "support/tflite/kernels/register.h" #include "tensorflow/contrib/lite/model.h" #include "tensorflow/contrib/lite/builtin_op_data.h" @@ -35,7 +37,7 @@ using namespace tflite; using namespace tflite::ops::builtin; -int main(int argc, char **argv) +TEST(NNAPI_Unittest_add_8, simple_test) { int verbose = 1; int tolerance = 1; @@ -182,5 +184,7 @@ int main(int argc, char **argv) param.verbose = verbose; param.tolerance = tolerance; - return RandomTestRunner{SEED, param}.run(builder); + int res = RandomTestRunner{SEED, param}.run(builder); + + EXPECT_EQ(res, 0); } diff --git a/tools/nnapi_unittests/tests/dequantize_1.cpp b/tools/nnapi_unittests/tests/dequantize_1.cpp index 97e35ab..ade6fc5 100644 --- a/tools/nnapi_unittests/tests/dequantize_1.cpp +++ b/tools/nnapi_unittests/tests/dequantize_1.cpp @@ -14,6 +14,8 @@ * limitations under the License. */ +#include "gtest/gtest.h" + #include "support/tflite/kernels/register.h" #include "tensorflow/contrib/lite/model.h" #include "tensorflow/contrib/lite/builtin_op_data.h" @@ -34,7 +36,7 @@ using namespace tflite; using namespace tflite::ops::builtin; -int main(int argc, char **argv) +TEST(NNAPI_Unittest_dequantize_1, simple_test) { int verbose = 0; int tolerance = 1; @@ -128,5 +130,7 @@ int main(int argc, char **argv) param.verbose = verbose; param.tolerance = tolerance; - return RandomTestRunner{SEED, param}.run(builder); + int res = RandomTestRunner{SEED, param}.run(builder); + + EXPECT_EQ(res, 0); } diff --git a/tools/nnapi_unittests/tests/relu6_1.cpp b/tools/nnapi_unittests/tests/relu6_1.cpp index 1a77c91..debcfbc 100644 --- a/tools/nnapi_unittests/tests/relu6_1.cpp +++ b/tools/nnapi_unittests/tests/relu6_1.cpp @@ -14,6 +14,8 @@ * limitations under the License. */ +#include "gtest/gtest.h" + #include "support/tflite/kernels/register.h" #include "tensorflow/contrib/lite/model.h" #include "tensorflow/contrib/lite/builtin_op_data.h" @@ -35,7 +37,7 @@ using namespace tflite; using namespace tflite::ops::builtin; -int main(int argc, char **argv) +TEST(NNAPI_Unittest_relu6_1, simple_test) { int verbose = 0; int tolerance = 1; @@ -117,5 +119,7 @@ int main(int argc, char **argv) param.verbose = verbose; param.tolerance = tolerance; - return RandomTestRunner{SEED, param}.run(builder); + int res = RandomTestRunner{SEED, param}.run(builder); + + EXPECT_EQ(res, 0); } diff --git a/tools/nnapi_unittests/tests/relu_1.cpp b/tools/nnapi_unittests/tests/relu_1.cpp index 31f55f6..32eb909 100644 --- a/tools/nnapi_unittests/tests/relu_1.cpp +++ b/tools/nnapi_unittests/tests/relu_1.cpp @@ -14,6 +14,8 @@ * limitations under the License. */ +#include "gtest/gtest.h" + #include "support/tflite/kernels/register.h" #include "tensorflow/contrib/lite/model.h" #include "tensorflow/contrib/lite/builtin_op_data.h" @@ -35,7 +37,7 @@ using namespace tflite; using namespace tflite::ops::builtin; -int main(int argc, char **argv) +TEST(NNAPI_Unittest_relu_1, simple_test) { int verbose = 0; int tolerance = 1; @@ -117,5 +119,7 @@ int main(int argc, char **argv) param.verbose = verbose; param.tolerance = tolerance; - return RandomTestRunner{SEED, param}.run(builder); + int res = RandomTestRunner{SEED, param}.run(builder); + + EXPECT_EQ(res, 0); } diff --git a/tools/nnapi_unittests/tests/relu_2.cpp b/tools/nnapi_unittests/tests/relu_2.cpp index 481993f..293b272 100644 --- a/tools/nnapi_unittests/tests/relu_2.cpp +++ b/tools/nnapi_unittests/tests/relu_2.cpp @@ -14,6 +14,8 @@ * limitations under the License. */ +#include "gtest/gtest.h" + #include "support/tflite/kernels/register.h" #include "tensorflow/contrib/lite/model.h" #include "tensorflow/contrib/lite/builtin_op_data.h" @@ -35,7 +37,7 @@ using namespace tflite; using namespace tflite::ops::builtin; -int main(int argc, char **argv) +TEST(NNAPI_Unittest_relu_2, simple_test) { int verbose = 0; int tolerance = 1; @@ -120,5 +122,7 @@ int main(int argc, char **argv) param.verbose = verbose; param.tolerance = tolerance; - return RandomTestRunner{SEED, param}.run(builder); + int res = RandomTestRunner{SEED, param}.run(builder); + + EXPECT_EQ(res, 0); } diff --git a/tools/nnapi_unittests/tests/relu_3.cpp b/tools/nnapi_unittests/tests/relu_3.cpp index c848d30..77abb94 100644 --- a/tools/nnapi_unittests/tests/relu_3.cpp +++ b/tools/nnapi_unittests/tests/relu_3.cpp @@ -14,6 +14,8 @@ * limitations under the License. */ +#include "gtest/gtest.h" + #include "support/tflite/kernels/register.h" #include "tensorflow/contrib/lite/model.h" #include "tensorflow/contrib/lite/builtin_op_data.h" @@ -35,7 +37,7 @@ using namespace tflite; using namespace tflite::ops::builtin; -int main(int argc, char **argv) +TEST(NNAPI_Unittest_relu_3, simple_test) { int verbose = 0; int tolerance = 1; @@ -123,5 +125,7 @@ int main(int argc, char **argv) param.verbose = verbose; param.tolerance = tolerance; - return RandomTestRunner{SEED, param}.run(builder); + int res = RandomTestRunner{SEED, param}.run(builder); + + EXPECT_EQ(res, 0); } diff --git a/tools/nnapi_unittests/tests/softmax_2.cpp b/tools/nnapi_unittests/tests/softmax_2.cpp index 29c885f..a75dc7d 100644 --- a/tools/nnapi_unittests/tests/softmax_2.cpp +++ b/tools/nnapi_unittests/tests/softmax_2.cpp @@ -14,6 +14,8 @@ * limitations under the License. */ +#include "gtest/gtest.h" + #include "support/tflite/kernels/register.h" #include "tensorflow/contrib/lite/model.h" #include "tensorflow/contrib/lite/builtin_op_data.h" @@ -35,7 +37,7 @@ using namespace tflite; using namespace tflite::ops::builtin; -int main(int argc, char **argv) +TEST(NNAPI_Unittest_softmax_2, simple_test) { int verbose = 0; int tolerance = 1; @@ -131,5 +133,7 @@ int main(int argc, char **argv) param.verbose = verbose; param.tolerance = tolerance; - return RandomTestRunner{SEED, param}.run(builder); + int res = RandomTestRunner{SEED, param}.run(builder); + + EXPECT_EQ(res, 0); } diff --git a/tools/nnapi_unittests/tests/tanh_1.cpp b/tools/nnapi_unittests/tests/tanh_1.cpp index 87798e6..221e223 100644 --- a/tools/nnapi_unittests/tests/tanh_1.cpp +++ b/tools/nnapi_unittests/tests/tanh_1.cpp @@ -14,6 +14,8 @@ * limitations under the License. */ +#include "gtest/gtest.h" + #include "support/tflite/kernels/register.h" #include "tensorflow/contrib/lite/model.h" #include "tensorflow/contrib/lite/builtin_op_data.h" @@ -35,7 +37,7 @@ using namespace tflite; using namespace tflite::ops::builtin; -int main(int argc, char **argv) +TEST(NNAPI_Unittest_tanh_1, simple_test) { int verbose = 0; int tolerance = 1; @@ -126,5 +128,7 @@ int main(int argc, char **argv) param.verbose = verbose; param.tolerance = tolerance; - return RandomTestRunner{SEED, param}.run(builder); + int res = RandomTestRunner{SEED, param}.run(builder); + + EXPECT_EQ(res, 0); } -- 2.7.4