Common tests library for shared functionality (openvinotoolkit#6578)

rnugmanx · Aug 26, 2021 · b0300c9 · b0300c9
1 parent c64a67e
commit b0300c9
Show file tree

Hide file tree

Showing 13 changed files with 36 additions and 167 deletions.
diff --git a/tests/lib/CMakeLists.txt b/tests/lib/CMakeLists.txt
@@ -0,0 +1,5 @@
+# Copyright (C) 2018-2021 Intel Corporation
+# SPDX-License-Identifier: Apache-2.0
+#
+
+add_subdirectory(src)
diff --git a/tests/lib/src/CMakeLists.txt b/tests/lib/src/CMakeLists.txt
@@ -0,0 +1,15 @@
+# Copyright (C) 2018-2021 Intel Corporation
+# SPDX-License-Identifier: Apache-2.0
+#
+
+set (TARGET_NAME "tests_shared_lib")
+
+file (GLOB SRC *.cpp)
+add_library(${TARGET_NAME} STATIC ${SRC})
+
+target_include_directories(${TARGET_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+
+# Search OpenVINO Inference Engine installed
+find_package(InferenceEngine REQUIRED)
+
+target_link_libraries(${TARGET_NAME} PUBLIC ${InferenceEngine_LIBRARIES})
diff --git a/tests/stress_tests/common/ie_utils.cpp → tests/lib/src/common_utils.cpp b/tests/stress_tests/common/ie_utils.cpp → tests/lib/src/common_utils.cpp
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-#include "ie_utils.h"
+#include "common_utils.h"
 
 #include <inference_engine.hpp>
 
@@ -32,7 +32,7 @@ void fillBlobs(InferenceEngine::InferRequest inferRequest,
       } else if (item.second->getPrecision() == InferenceEngine::Precision::I32) {
         fillBlobImInfo<int32_t>(inputBlob, batchSize, image_size);
       } else {
-        IE_THROW() << "Input precision is not supported for image info!";
+        throw std::logic_error("Input precision is not supported for image info!");
       }
       continue;
     }
@@ -52,7 +52,7 @@ void fillBlobs(InferenceEngine::InferRequest inferRequest,
     } else if (item.second->getPrecision() == InferenceEngine::Precision::I16) {
       fillBlobRandom<int16_t>(inputBlob);
     } else {
-      IE_THROW() << "Input precision is not supported for " << item.first;
+      throw std::logic_error("Input precision is not supported for " + item.first);
     }
   }
 }
diff --git a/tests/stress_tests/common/ie_utils.h → tests/lib/src/common_utils.h b/tests/stress_tests/common/ie_utils.h → tests/lib/src/common_utils.h
@@ -57,7 +57,7 @@ inline std::pair<size_t, size_t> getTensorHeightWidth(const InferenceEngine::Ten
     // Regardless of layout, dimensions are stored in fixed order
     return std::make_pair(dims.back(), dims.at(size - 2));
   } else {
-    IE_THROW() << "Tensor does not have height and width dimensions";
+    throw std::logic_error("Tensor does not have height and width dimensions");
   }
 }
 
@@ -111,4 +111,4 @@ void fillBlobImInfo(Blob::Ptr& inputBlob,
  */
 void fillBlobs(InferenceEngine::InferRequest inferRequest,
         const InferenceEngine::ConstInputsDataMap& inputsInfo,
-        const size_t& batchSize);
+        const size_t& batchSize);
diff --git a/tests/stress_tests/common/CMakeLists.txt b/tests/stress_tests/common/CMakeLists.txt
@@ -27,11 +27,12 @@ if(EXISTS "${OpenVINO_SOURCE_DIR}/thirdparty/gflags")
     add_gflags()
 endif()
 
+add_subdirectory("${OpenVINO_SOURCE_DIR}/tests/lib" tests_shared_lib)
 target_link_libraries(${TARGET_NAME}
     PUBLIC
         IE::gtest
         IE::pugixml
-        ${InferenceEngine_LIBRARIES}
         gflags
+        tests_shared_lib
     PRIVATE
         IE::gtest_main)
diff --git a/tests/stress_tests/common/ie_pipelines/pipelines.cpp b/tests/stress_tests/common/ie_pipelines/pipelines.cpp
@@ -4,7 +4,7 @@
 
 #include "pipelines.h"
 #include "../utils.h"
-#include "../ie_utils.h"
+#include "common_utils.h"
 
 #include <iostream>
 #include <string>

diff --git a/tests/stress_tests/memcheck_tests/tests.cpp b/tests/stress_tests/memcheck_tests/tests.cpp
@@ -4,7 +4,7 @@
 
 #include "tests_utils.h"
 #include "../common/tests_utils.h"
-#include "../common/ie_utils.h"
+#include "common_utils.h"
 #include "../common/managers/thread_manager.h"
 #include "tests_pipelines/tests_pipelines.h"
 

diff --git a/tests/stress_tests/memleaks_tests/tests.cpp b/tests/stress_tests/memleaks_tests/tests.cpp
@@ -3,7 +3,7 @@
 //
 
 #include "../common/tests_utils.h"
-#include "../common/ie_utils.h"
+#include "common_utils.h"
 #include "../common/managers/thread_manager.h"
 #include "tests_pipelines/tests_pipelines.h"
 

diff --git a/tests/stress_tests/unittests/tests_pipelines/tests_pipelines_full_pipeline.cpp b/tests/stress_tests/unittests/tests_pipelines/tests_pipelines_full_pipeline.cpp
@@ -3,7 +3,7 @@
 //
 
 #include "tests_pipelines.h"
-#include "../common/ie_utils.h"
+#include "common_utils.h"
 
 #include <string>
 

diff --git a/tests/time_tests/src/timetests/CMakeLists.txt b/tests/time_tests/src/timetests/CMakeLists.txt
@@ -9,11 +9,13 @@ add_custom_target(time_tests)
 # Test target name is source file name without extension.
 FILE(GLOB tests "*.cpp")
 
+add_subdirectory("${OpenVINO_SOURCE_DIR}/tests/lib" tests_shared_lib)
+
 foreach(test_source ${tests})
     get_filename_component(test_name ${test_source} NAME_WE)
     add_executable(${test_name} ${test_source})
 
-    target_link_libraries(${test_name} PRIVATE IE::inference_engine timetests_helper)
+    target_link_libraries(${test_name} PRIVATE tests_shared_lib timetests_helper)
 
     add_dependencies(time_tests ${test_name})
 

diff --git a/tests/time_tests/src/timetests/common.h b/tests/time_tests/src/timetests/common.h
diff --git a/tests/time_tests/src/timetests/timetest_infer.cpp b/tests/time_tests/src/timetests/timetest_infer.cpp
@@ -5,7 +5,7 @@
 #include <inference_engine.hpp>
 #include <iostream>
 
-#include "common.h"
+#include "common_utils.h"
 #include "timetests_helper/timer.h"
 #include "timetests_helper/utils.h"
 using namespace InferenceEngine;

diff --git a/tests/time_tests/src/timetests/timetest_infer_cache.cpp b/tests/time_tests/src/timetests/timetest_infer_cache.cpp
@@ -5,7 +5,7 @@
 #include <inference_engine.hpp>
 #include <iostream>
 
-#include "common.h"
+#include "common_utils.h"
 #include "timetests_helper/timer.h"
 #include "timetests_helper/utils.h"
 using namespace InferenceEngine;