From 9238fa523f65fb120d08fcd6266cb4016245b0af Mon Sep 17 00:00:00 2001 From: =?utf8?q?=EB=B0=95=EC=A2=85=ED=98=84/On-Device=20Lab=28SR=29/Staff?= =?utf8?q?=20Engineer/=EC=82=BC=EC=84=B1=EC=A0=84=EC=9E=90?= Date: Fri, 21 Jun 2019 13:22:17 +0900 Subject: [PATCH] Extract moco tests from moco (#3907) This commit extracts mocotest projects (mocotest-tf and moctest-onnx) from moco in order to break dependency cycle between moco and nnkit. Signed-off-by: Jonghyun Park --- contrib/moco/test/CMakeLists.txt | 3 +-- contrib/{moco/test/onnx => mocotest-onnx}/CMakeLists.txt | 0 contrib/{moco/test/onnx => mocotest-onnx}/Const_000/test.pbtxt | 0 contrib/{moco/test/onnx => mocotest-onnx}/Identity_000/test.pbtxt | 0 contrib/mocotest-onnx/requires.cmake | 1 + contrib/{moco/test/tf => mocotest-tf}/AvgPool_000/test.info | 0 contrib/{moco/test/tf => mocotest-tf}/AvgPool_000/test.pbtxt | 0 contrib/{moco/test/tf => mocotest-tf}/CMakeLists.txt | 0 contrib/{moco/test/tf/Relu_000 => mocotest-tf/Concat_000}/INFERENCE | 0 contrib/{moco/test/tf => mocotest-tf}/Concat_000/test.info | 0 contrib/{moco/test/tf => mocotest-tf}/Concat_000/test.pbtxt | 0 .../test/tf/Placeholder_000 => mocotest-tf/Concat_001}/INFERENCE | 0 contrib/{moco/test/tf => mocotest-tf}/Concat_001/test.info | 0 contrib/{moco/test/tf => mocotest-tf}/Concat_001/test.pbtxt | 0 .../{moco/test/tf/MaxPool_000 => mocotest-tf/Concat_002}/INFERENCE | 0 contrib/{moco/test/tf => mocotest-tf}/Concat_002/test.info | 0 contrib/{moco/test/tf => mocotest-tf}/Concat_002/test.pbtxt | 0 contrib/{moco/test/tf => mocotest-tf}/Const_000/INFERENCE | 0 contrib/{moco/test/tf => mocotest-tf}/Const_000/test.info | 0 contrib/{moco/test/tf => mocotest-tf}/Const_000/test.pbtxt | 0 contrib/{moco/test/tf => mocotest-tf}/Const_001/test.info | 0 contrib/{moco/test/tf => mocotest-tf}/Const_001/test.pbtxt | 0 contrib/{moco/test/tf => mocotest-tf}/Conv2D_000/test.info | 0 contrib/{moco/test/tf => mocotest-tf}/Conv2D_000/test.pbtxt | 0 contrib/{moco/test/tf => mocotest-tf}/Inception_v3_000/test.info | 0 contrib/{moco/test/tf => mocotest-tf}/Inception_v3_000/test.pbtxt | 0 contrib/{moco/test/tf => mocotest-tf}/Inception_v3_001/test.info | 0 contrib/{moco/test/tf => mocotest-tf}/Inception_v3_001/test.pbtxt | 0 contrib/{moco/test/tf => mocotest-tf}/Inception_v3_002/test.info | 0 contrib/{moco/test/tf => mocotest-tf}/Inception_v3_002/test.pbtxt | 0 .../{moco/test/tf/Concat_002 => mocotest-tf/MaxPool_000}/INFERENCE | 0 contrib/{moco/test/tf => mocotest-tf}/MaxPool_000/test.info | 0 contrib/{moco/test/tf => mocotest-tf}/MaxPool_000/test.pbtxt | 0 contrib/{moco/test/tf => mocotest-tf}/Multiple_IO_000/test.info | 0 contrib/{moco/test/tf => mocotest-tf}/Multiple_IO_000/test.pbtxt | 0 contrib/{moco/test/tf => mocotest-tf}/Multiple_IO_001/test.info | 0 contrib/{moco/test/tf => mocotest-tf}/Multiple_IO_001/test.pbtxt | 0 .../test/tf/Concat_001 => mocotest-tf/Placeholder_000}/INFERENCE | 0 contrib/{moco/test/tf => mocotest-tf}/Placeholder_000/test.info | 0 contrib/{moco/test/tf => mocotest-tf}/Placeholder_000/test.pbtxt | 0 contrib/{moco/test/tf => mocotest-tf}/README.md | 4 +++- contrib/{moco/test/tf/Concat_000 => mocotest-tf/Relu_000}/INFERENCE | 0 contrib/{moco/test/tf => mocotest-tf}/Relu_000/test.info | 0 contrib/{moco/test/tf => mocotest-tf}/Relu_000/test.pbtxt | 0 contrib/{moco/test/tf => mocotest-tf}/Reshape_000/test.info | 0 contrib/{moco/test/tf => mocotest-tf}/Reshape_000/test.pbtxt | 0 contrib/mocotest-tf/requires.cmake | 2 ++ contrib/{moco/test/tf => mocotest-tf}/runall | 0 48 files changed, 7 insertions(+), 3 deletions(-) rename contrib/{moco/test/onnx => mocotest-onnx}/CMakeLists.txt (100%) rename contrib/{moco/test/onnx => mocotest-onnx}/Const_000/test.pbtxt (100%) rename contrib/{moco/test/onnx => mocotest-onnx}/Identity_000/test.pbtxt (100%) create mode 100644 contrib/mocotest-onnx/requires.cmake rename contrib/{moco/test/tf => mocotest-tf}/AvgPool_000/test.info (100%) rename contrib/{moco/test/tf => mocotest-tf}/AvgPool_000/test.pbtxt (100%) rename contrib/{moco/test/tf => mocotest-tf}/CMakeLists.txt (100%) rename contrib/{moco/test/tf/Relu_000 => mocotest-tf/Concat_000}/INFERENCE (100%) rename contrib/{moco/test/tf => mocotest-tf}/Concat_000/test.info (100%) rename contrib/{moco/test/tf => mocotest-tf}/Concat_000/test.pbtxt (100%) rename contrib/{moco/test/tf/Placeholder_000 => mocotest-tf/Concat_001}/INFERENCE (100%) rename contrib/{moco/test/tf => mocotest-tf}/Concat_001/test.info (100%) rename contrib/{moco/test/tf => mocotest-tf}/Concat_001/test.pbtxt (100%) rename contrib/{moco/test/tf/MaxPool_000 => mocotest-tf/Concat_002}/INFERENCE (100%) rename contrib/{moco/test/tf => mocotest-tf}/Concat_002/test.info (100%) rename contrib/{moco/test/tf => mocotest-tf}/Concat_002/test.pbtxt (100%) rename contrib/{moco/test/tf => mocotest-tf}/Const_000/INFERENCE (100%) rename contrib/{moco/test/tf => mocotest-tf}/Const_000/test.info (100%) rename contrib/{moco/test/tf => mocotest-tf}/Const_000/test.pbtxt (100%) rename contrib/{moco/test/tf => mocotest-tf}/Const_001/test.info (100%) rename contrib/{moco/test/tf => mocotest-tf}/Const_001/test.pbtxt (100%) rename contrib/{moco/test/tf => mocotest-tf}/Conv2D_000/test.info (100%) rename contrib/{moco/test/tf => mocotest-tf}/Conv2D_000/test.pbtxt (100%) rename contrib/{moco/test/tf => mocotest-tf}/Inception_v3_000/test.info (100%) rename contrib/{moco/test/tf => mocotest-tf}/Inception_v3_000/test.pbtxt (100%) rename contrib/{moco/test/tf => mocotest-tf}/Inception_v3_001/test.info (100%) rename contrib/{moco/test/tf => mocotest-tf}/Inception_v3_001/test.pbtxt (100%) rename contrib/{moco/test/tf => mocotest-tf}/Inception_v3_002/test.info (100%) rename contrib/{moco/test/tf => mocotest-tf}/Inception_v3_002/test.pbtxt (100%) rename contrib/{moco/test/tf/Concat_002 => mocotest-tf/MaxPool_000}/INFERENCE (100%) rename contrib/{moco/test/tf => mocotest-tf}/MaxPool_000/test.info (100%) rename contrib/{moco/test/tf => mocotest-tf}/MaxPool_000/test.pbtxt (100%) rename contrib/{moco/test/tf => mocotest-tf}/Multiple_IO_000/test.info (100%) rename contrib/{moco/test/tf => mocotest-tf}/Multiple_IO_000/test.pbtxt (100%) rename contrib/{moco/test/tf => mocotest-tf}/Multiple_IO_001/test.info (100%) rename contrib/{moco/test/tf => mocotest-tf}/Multiple_IO_001/test.pbtxt (100%) rename contrib/{moco/test/tf/Concat_001 => mocotest-tf/Placeholder_000}/INFERENCE (100%) rename contrib/{moco/test/tf => mocotest-tf}/Placeholder_000/test.info (100%) rename contrib/{moco/test/tf => mocotest-tf}/Placeholder_000/test.pbtxt (100%) rename contrib/{moco/test/tf => mocotest-tf}/README.md (75%) rename contrib/{moco/test/tf/Concat_000 => mocotest-tf/Relu_000}/INFERENCE (100%) rename contrib/{moco/test/tf => mocotest-tf}/Relu_000/test.info (100%) rename contrib/{moco/test/tf => mocotest-tf}/Relu_000/test.pbtxt (100%) rename contrib/{moco/test/tf => mocotest-tf}/Reshape_000/test.info (100%) rename contrib/{moco/test/tf => mocotest-tf}/Reshape_000/test.pbtxt (100%) create mode 100644 contrib/mocotest-tf/requires.cmake rename contrib/{moco/test/tf => mocotest-tf}/runall (100%) diff --git a/contrib/moco/test/CMakeLists.txt b/contrib/moco/test/CMakeLists.txt index f287a25..f4f770b 100644 --- a/contrib/moco/test/CMakeLists.txt +++ b/contrib/moco/test/CMakeLists.txt @@ -1,2 +1 @@ -add_subdirectory(tf) -add_subdirectory(onnx) +# TODO Remove this file diff --git a/contrib/moco/test/onnx/CMakeLists.txt b/contrib/mocotest-onnx/CMakeLists.txt similarity index 100% rename from contrib/moco/test/onnx/CMakeLists.txt rename to contrib/mocotest-onnx/CMakeLists.txt diff --git a/contrib/moco/test/onnx/Const_000/test.pbtxt b/contrib/mocotest-onnx/Const_000/test.pbtxt similarity index 100% rename from contrib/moco/test/onnx/Const_000/test.pbtxt rename to contrib/mocotest-onnx/Const_000/test.pbtxt diff --git a/contrib/moco/test/onnx/Identity_000/test.pbtxt b/contrib/mocotest-onnx/Identity_000/test.pbtxt similarity index 100% rename from contrib/moco/test/onnx/Identity_000/test.pbtxt rename to contrib/mocotest-onnx/Identity_000/test.pbtxt diff --git a/contrib/mocotest-onnx/requires.cmake b/contrib/mocotest-onnx/requires.cmake new file mode 100644 index 0000000..0f21fa9 --- /dev/null +++ b/contrib/mocotest-onnx/requires.cmake @@ -0,0 +1 @@ +require("onnxkit") diff --git a/contrib/moco/test/tf/AvgPool_000/test.info b/contrib/mocotest-tf/AvgPool_000/test.info similarity index 100% rename from contrib/moco/test/tf/AvgPool_000/test.info rename to contrib/mocotest-tf/AvgPool_000/test.info diff --git a/contrib/moco/test/tf/AvgPool_000/test.pbtxt b/contrib/mocotest-tf/AvgPool_000/test.pbtxt similarity index 100% rename from contrib/moco/test/tf/AvgPool_000/test.pbtxt rename to contrib/mocotest-tf/AvgPool_000/test.pbtxt diff --git a/contrib/moco/test/tf/CMakeLists.txt b/contrib/mocotest-tf/CMakeLists.txt similarity index 100% rename from contrib/moco/test/tf/CMakeLists.txt rename to contrib/mocotest-tf/CMakeLists.txt diff --git a/contrib/moco/test/tf/Relu_000/INFERENCE b/contrib/mocotest-tf/Concat_000/INFERENCE similarity index 100% rename from contrib/moco/test/tf/Relu_000/INFERENCE rename to contrib/mocotest-tf/Concat_000/INFERENCE diff --git a/contrib/moco/test/tf/Concat_000/test.info b/contrib/mocotest-tf/Concat_000/test.info similarity index 100% rename from contrib/moco/test/tf/Concat_000/test.info rename to contrib/mocotest-tf/Concat_000/test.info diff --git a/contrib/moco/test/tf/Concat_000/test.pbtxt b/contrib/mocotest-tf/Concat_000/test.pbtxt similarity index 100% rename from contrib/moco/test/tf/Concat_000/test.pbtxt rename to contrib/mocotest-tf/Concat_000/test.pbtxt diff --git a/contrib/moco/test/tf/Placeholder_000/INFERENCE b/contrib/mocotest-tf/Concat_001/INFERENCE similarity index 100% rename from contrib/moco/test/tf/Placeholder_000/INFERENCE rename to contrib/mocotest-tf/Concat_001/INFERENCE diff --git a/contrib/moco/test/tf/Concat_001/test.info b/contrib/mocotest-tf/Concat_001/test.info similarity index 100% rename from contrib/moco/test/tf/Concat_001/test.info rename to contrib/mocotest-tf/Concat_001/test.info diff --git a/contrib/moco/test/tf/Concat_001/test.pbtxt b/contrib/mocotest-tf/Concat_001/test.pbtxt similarity index 100% rename from contrib/moco/test/tf/Concat_001/test.pbtxt rename to contrib/mocotest-tf/Concat_001/test.pbtxt diff --git a/contrib/moco/test/tf/MaxPool_000/INFERENCE b/contrib/mocotest-tf/Concat_002/INFERENCE similarity index 100% rename from contrib/moco/test/tf/MaxPool_000/INFERENCE rename to contrib/mocotest-tf/Concat_002/INFERENCE diff --git a/contrib/moco/test/tf/Concat_002/test.info b/contrib/mocotest-tf/Concat_002/test.info similarity index 100% rename from contrib/moco/test/tf/Concat_002/test.info rename to contrib/mocotest-tf/Concat_002/test.info diff --git a/contrib/moco/test/tf/Concat_002/test.pbtxt b/contrib/mocotest-tf/Concat_002/test.pbtxt similarity index 100% rename from contrib/moco/test/tf/Concat_002/test.pbtxt rename to contrib/mocotest-tf/Concat_002/test.pbtxt diff --git a/contrib/moco/test/tf/Const_000/INFERENCE b/contrib/mocotest-tf/Const_000/INFERENCE similarity index 100% rename from contrib/moco/test/tf/Const_000/INFERENCE rename to contrib/mocotest-tf/Const_000/INFERENCE diff --git a/contrib/moco/test/tf/Const_000/test.info b/contrib/mocotest-tf/Const_000/test.info similarity index 100% rename from contrib/moco/test/tf/Const_000/test.info rename to contrib/mocotest-tf/Const_000/test.info diff --git a/contrib/moco/test/tf/Const_000/test.pbtxt b/contrib/mocotest-tf/Const_000/test.pbtxt similarity index 100% rename from contrib/moco/test/tf/Const_000/test.pbtxt rename to contrib/mocotest-tf/Const_000/test.pbtxt diff --git a/contrib/moco/test/tf/Const_001/test.info b/contrib/mocotest-tf/Const_001/test.info similarity index 100% rename from contrib/moco/test/tf/Const_001/test.info rename to contrib/mocotest-tf/Const_001/test.info diff --git a/contrib/moco/test/tf/Const_001/test.pbtxt b/contrib/mocotest-tf/Const_001/test.pbtxt similarity index 100% rename from contrib/moco/test/tf/Const_001/test.pbtxt rename to contrib/mocotest-tf/Const_001/test.pbtxt diff --git a/contrib/moco/test/tf/Conv2D_000/test.info b/contrib/mocotest-tf/Conv2D_000/test.info similarity index 100% rename from contrib/moco/test/tf/Conv2D_000/test.info rename to contrib/mocotest-tf/Conv2D_000/test.info diff --git a/contrib/moco/test/tf/Conv2D_000/test.pbtxt b/contrib/mocotest-tf/Conv2D_000/test.pbtxt similarity index 100% rename from contrib/moco/test/tf/Conv2D_000/test.pbtxt rename to contrib/mocotest-tf/Conv2D_000/test.pbtxt diff --git a/contrib/moco/test/tf/Inception_v3_000/test.info b/contrib/mocotest-tf/Inception_v3_000/test.info similarity index 100% rename from contrib/moco/test/tf/Inception_v3_000/test.info rename to contrib/mocotest-tf/Inception_v3_000/test.info diff --git a/contrib/moco/test/tf/Inception_v3_000/test.pbtxt b/contrib/mocotest-tf/Inception_v3_000/test.pbtxt similarity index 100% rename from contrib/moco/test/tf/Inception_v3_000/test.pbtxt rename to contrib/mocotest-tf/Inception_v3_000/test.pbtxt diff --git a/contrib/moco/test/tf/Inception_v3_001/test.info b/contrib/mocotest-tf/Inception_v3_001/test.info similarity index 100% rename from contrib/moco/test/tf/Inception_v3_001/test.info rename to contrib/mocotest-tf/Inception_v3_001/test.info diff --git a/contrib/moco/test/tf/Inception_v3_001/test.pbtxt b/contrib/mocotest-tf/Inception_v3_001/test.pbtxt similarity index 100% rename from contrib/moco/test/tf/Inception_v3_001/test.pbtxt rename to contrib/mocotest-tf/Inception_v3_001/test.pbtxt diff --git a/contrib/moco/test/tf/Inception_v3_002/test.info b/contrib/mocotest-tf/Inception_v3_002/test.info similarity index 100% rename from contrib/moco/test/tf/Inception_v3_002/test.info rename to contrib/mocotest-tf/Inception_v3_002/test.info diff --git a/contrib/moco/test/tf/Inception_v3_002/test.pbtxt b/contrib/mocotest-tf/Inception_v3_002/test.pbtxt similarity index 100% rename from contrib/moco/test/tf/Inception_v3_002/test.pbtxt rename to contrib/mocotest-tf/Inception_v3_002/test.pbtxt diff --git a/contrib/moco/test/tf/Concat_002/INFERENCE b/contrib/mocotest-tf/MaxPool_000/INFERENCE similarity index 100% rename from contrib/moco/test/tf/Concat_002/INFERENCE rename to contrib/mocotest-tf/MaxPool_000/INFERENCE diff --git a/contrib/moco/test/tf/MaxPool_000/test.info b/contrib/mocotest-tf/MaxPool_000/test.info similarity index 100% rename from contrib/moco/test/tf/MaxPool_000/test.info rename to contrib/mocotest-tf/MaxPool_000/test.info diff --git a/contrib/moco/test/tf/MaxPool_000/test.pbtxt b/contrib/mocotest-tf/MaxPool_000/test.pbtxt similarity index 100% rename from contrib/moco/test/tf/MaxPool_000/test.pbtxt rename to contrib/mocotest-tf/MaxPool_000/test.pbtxt diff --git a/contrib/moco/test/tf/Multiple_IO_000/test.info b/contrib/mocotest-tf/Multiple_IO_000/test.info similarity index 100% rename from contrib/moco/test/tf/Multiple_IO_000/test.info rename to contrib/mocotest-tf/Multiple_IO_000/test.info diff --git a/contrib/moco/test/tf/Multiple_IO_000/test.pbtxt b/contrib/mocotest-tf/Multiple_IO_000/test.pbtxt similarity index 100% rename from contrib/moco/test/tf/Multiple_IO_000/test.pbtxt rename to contrib/mocotest-tf/Multiple_IO_000/test.pbtxt diff --git a/contrib/moco/test/tf/Multiple_IO_001/test.info b/contrib/mocotest-tf/Multiple_IO_001/test.info similarity index 100% rename from contrib/moco/test/tf/Multiple_IO_001/test.info rename to contrib/mocotest-tf/Multiple_IO_001/test.info diff --git a/contrib/moco/test/tf/Multiple_IO_001/test.pbtxt b/contrib/mocotest-tf/Multiple_IO_001/test.pbtxt similarity index 100% rename from contrib/moco/test/tf/Multiple_IO_001/test.pbtxt rename to contrib/mocotest-tf/Multiple_IO_001/test.pbtxt diff --git a/contrib/moco/test/tf/Concat_001/INFERENCE b/contrib/mocotest-tf/Placeholder_000/INFERENCE similarity index 100% rename from contrib/moco/test/tf/Concat_001/INFERENCE rename to contrib/mocotest-tf/Placeholder_000/INFERENCE diff --git a/contrib/moco/test/tf/Placeholder_000/test.info b/contrib/mocotest-tf/Placeholder_000/test.info similarity index 100% rename from contrib/moco/test/tf/Placeholder_000/test.info rename to contrib/mocotest-tf/Placeholder_000/test.info diff --git a/contrib/moco/test/tf/Placeholder_000/test.pbtxt b/contrib/mocotest-tf/Placeholder_000/test.pbtxt similarity index 100% rename from contrib/moco/test/tf/Placeholder_000/test.pbtxt rename to contrib/mocotest-tf/Placeholder_000/test.pbtxt diff --git a/contrib/moco/test/tf/README.md b/contrib/mocotest-tf/README.md similarity index 75% rename from contrib/moco/test/tf/README.md rename to contrib/mocotest-tf/README.md index b872966..314d38a 100644 --- a/contrib/moco/test/tf/README.md +++ b/contrib/mocotest-tf/README.md @@ -1,3 +1,5 @@ +# mocotest-tf + # Regarding `test.info` Each line should contain the following fields: @@ -5,4 +7,4 @@ Each line should contain the following fields: - node_name:digits - type (see enum TF_DataType in tensorflow/c/c_api.h) - [ shapes ] - - In case of scalar, use '[ ]' as shape \ No newline at end of file + - In case of scalar, use '[ ]' as shape diff --git a/contrib/moco/test/tf/Concat_000/INFERENCE b/contrib/mocotest-tf/Relu_000/INFERENCE similarity index 100% rename from contrib/moco/test/tf/Concat_000/INFERENCE rename to contrib/mocotest-tf/Relu_000/INFERENCE diff --git a/contrib/moco/test/tf/Relu_000/test.info b/contrib/mocotest-tf/Relu_000/test.info similarity index 100% rename from contrib/moco/test/tf/Relu_000/test.info rename to contrib/mocotest-tf/Relu_000/test.info diff --git a/contrib/moco/test/tf/Relu_000/test.pbtxt b/contrib/mocotest-tf/Relu_000/test.pbtxt similarity index 100% rename from contrib/moco/test/tf/Relu_000/test.pbtxt rename to contrib/mocotest-tf/Relu_000/test.pbtxt diff --git a/contrib/moco/test/tf/Reshape_000/test.info b/contrib/mocotest-tf/Reshape_000/test.info similarity index 100% rename from contrib/moco/test/tf/Reshape_000/test.info rename to contrib/mocotest-tf/Reshape_000/test.info diff --git a/contrib/moco/test/tf/Reshape_000/test.pbtxt b/contrib/mocotest-tf/Reshape_000/test.pbtxt similarity index 100% rename from contrib/moco/test/tf/Reshape_000/test.pbtxt rename to contrib/mocotest-tf/Reshape_000/test.pbtxt diff --git a/contrib/mocotest-tf/requires.cmake b/contrib/mocotest-tf/requires.cmake new file mode 100644 index 0000000..771418f --- /dev/null +++ b/contrib/mocotest-tf/requires.cmake @@ -0,0 +1,2 @@ +require("tfkit") +require("nnkit") diff --git a/contrib/moco/test/tf/runall b/contrib/mocotest-tf/runall similarity index 100% rename from contrib/moco/test/tf/runall rename to contrib/mocotest-tf/runall -- 2.7.4