From 93fab098f4738298714ec6f2c36cf5a4ab23cf64 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: Wed, 19 Jun 2019 19:55:41 +0900 Subject: [PATCH] [enco.caffe] Use shared test suite (#3882) This commit updates enco caffe test frameworks to use the shared test suite introduced recently. Signed-off-by: Jonghyun Park --- contrib/enco/test/caffe/CMakeLists.txt | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/contrib/enco/test/caffe/CMakeLists.txt b/contrib/enco/test/caffe/CMakeLists.txt index 13d7151..ccbf632 100644 --- a/contrib/enco/test/caffe/CMakeLists.txt +++ b/contrib/enco/test/caffe/CMakeLists.txt @@ -4,8 +4,15 @@ if(NOT ENCO_CAFFE_TEST) return() endif(NOT ENCO_CAFFE_TEST) +# TODO Use REQUIRED if supported +nncc_find_resource(BVLCCaffeTests) + +if(NOT BVLCCaffeTests_FOUND) + message(FATAL_ERROR "Fail to find BVLCCaffeTests") +endif(NOT BVLCCaffeTests_FOUND) + # TESTCASE_BASE_DIR indicates where all the testcases are located -set(TESTCASE_BASE_DIR "${CMAKE_CURRENT_SOURCE_DIR}") +set(TESTCASE_BASE_DIR "${BVLCCaffeTests_DIR}") ### ### Common function(s) @@ -39,6 +46,13 @@ if(NOT TARGET enco_caffe_frontend) return() endif(NOT TARGET enco_caffe_frontend) +# TODO Use "whitelist" instead +# +# WHY? +# +# Tests are now shared by multiple frameworks (not private), and thus +# some tests may be unsupported. +# file(GLOB MODELS RELATIVE "${TESTCASE_BASE_DIR}" "${TESTCASE_BASE_DIR}/*/test.prototxt") foreach(MODEL IN ITEMS ${MODELS}) -- 2.7.4