add ocv funcs

Author: allnes

cmake/opencv.cmake

@@ -1,6 +1,5 @@
-# Build googletest components
+# Build OpenCV components
 include_directories(${CMAKE_SOURCE_DIR}/3rdparty/opencv/include)
-
 include(ExternalProject)
 ExternalProject_Add(ppc_opencv
         SOURCE_DIR        "${CMAKE_SOURCE_DIR}/3rdparty/opencv"
@@ -11,6 +10,6 @@ ExternalProject_Add(ppc_opencv
         -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} -G${CMAKE_GENERATOR} -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -D CMAKE_C_COMPILER_LAUNCHER=${CMAKE_C_COMPILER_LAUNCHER}
         -D CMAKE_CXX_COMPILER_LAUNCHER=${CMAKE_CXX_COMPILER_LAUNCHER} -DCMAKE_CXX_FLAGS="-w" -DCMAKE_C_FLAGS="-w" -DENABLE_CCACHE=ON -DBUILD_TESTS=OFF -DBUILD_PERF_TESTS=OFF
         -DBUILD_EXAMPLES=OFF -DBUILD_DOCS=OFF -DWITH_CUDA=OFF -DWITH_OPENCL=OFF -DBUILD_opencv_calib3d=OFF -DBUILD_opencv_dnn=OFF -DBUILD_opencv_ml=OFF -DBUILD_opencv_objdetect=OFF
-        -DBUILD_opencv_video=OFF -DBUILD_opencv_world=OFF
+        -DBUILD_opencv_video=OFF -DBUILD_opencv_world=OFF -DBUILD_opencv_features2d=OFF -DBUILD_opencv_flann=OFF -DBUILD_opencv_photo=OFF
         BUILD_COMMAND     "${CMAKE_COMMAND}" --build "${CMAKE_CURRENT_BINARY_DIR}/ppc_opencv/build" --config ${CMAKE_BUILD_TYPE} --parallel
         INSTALL_COMMAND   "${CMAKE_COMMAND}" --install "${CMAKE_CURRENT_BINARY_DIR}/ppc_opencv/build" --prefix "${CMAKE_CURRENT_BINARY_DIR}/ppc_opencv/install")

tasks/CMakeLists.txt

@@ -138,7 +138,12 @@ foreach(TASK_TYPE ${LIST_OF_TASKS})
       endif ()
 
       add_dependencies(${EXEC_FUNC} ppc_opencv)
+      target_include_directories(${EXEC_FUNC} PUBLIC "${CMAKE_BINARY_DIR}/ppc_opencv/install/include/opencv4")
       target_link_directories(${EXEC_FUNC} PUBLIC "${CMAKE_BINARY_DIR}/ppc_opencv/install/lib")
+      if(NOT MSVC)
+          target_link_libraries(${EXEC_FUNC} PUBLIC
+                  opencv_core opencv_highgui opencv_imgcodecs opencv_imgproc opencv_videoio)
+      endif()
 
       add_dependencies(${EXEC_FUNC} ppc_googletest)
       target_link_directories(${EXEC_FUNC} PUBLIC "${CMAKE_BINARY_DIR}/ppc_googletest/install/lib")

tasks/all/example/data/pic_mpi.jpg

@@ -1,8 +1,7 @@
 #include <gtest/gtest.h>
 
 #include <boost/mpi/communicator.hpp>
-#include <boost/mpi/environment.hpp>
-#include <fstream>
+#include <opencv2/opencv.hpp>
 #include <random>
 #include <vector>
 
@@ -248,14 +247,10 @@ TEST(Parallel_Operations_MPI, Test_Max_2_File) {
   auto task_data_par = std::make_shared<ppc::core::TaskData>();
 
   if (world.rank() == 0) {
-    std::string line;
-    std::ifstream test_file(ppc::core::GetAbsolutePath("all/example/data/test_mpi.txt"));
-    if (test_file.is_open()) {
-      getline(test_file, line);
-    }
-    test_file.close();
-
-    const int count_size_vector = std::stoi(line);
+    cv::Mat img = cv::imread(ppc::core::GetAbsolutePath("all/example/data/pic_mpi.jpg"));
+    EXPECT_EQ(img.rows, img.cols);
+    const int count_size_vector = img.rows + img.cols;
+
     global_vec = GetRandomVector(count_size_vector);
     task_data_par->inputs.emplace_back(reinterpret_cast<uint8_t*>(global_vec.data()));
     task_data_par->inputs_count.emplace_back(global_vec.size());

tasks/all/example/data/pic_omp.jpg

@@ -1,6 +1,6 @@
 #include <gtest/gtest.h>
 
-#include <fstream>
+#include <opencv2/opencv.hpp>
 #include <random>
 #include <vector>
 
@@ -210,14 +210,11 @@ TEST(Parallel_Operations_OpenMP, Test_Mult_2) {
 }
 
 TEST(Parallel_Operations_OpenMP, Test_Mult_2_File) {
-  std::string line;
-  std::ifstream test_file(ppc::core::GetAbsolutePath("all/example/data/test_omp.txt"));
-  if (test_file.is_open()) {
-    getline(test_file, line);
-  }
-  test_file.close();
+  cv::Mat img = cv::imread(ppc::core::GetAbsolutePath("all/example/data/pic_omp.jpg"));
+  EXPECT_EQ(static_cast<int>(sqrt(img.rows) * sqrt(img.rows)), img.cols);
+  const int count_size_vector = img.rows + img.cols;
+  std::vector<int> vec = GetRandomVector(count_size_vector);
 
-  std::vector<int> vec = GetRandomVector(std::stoi(line));
   // Create data
   std::vector<int> ref_res(1, 0);
 

tasks/all/example/data/pic_seq.jpg

@@ -1,6 +1,6 @@
 #include <gtest/gtest.h>
 
-#include <fstream>
+#include <opencv2/opencv.hpp>
 #include <vector>
 
 #include "seq/example/include/ops_seq.hpp"
@@ -121,14 +121,9 @@ TEST(Sequential, Test_Sum_100) {
 }
 
 TEST(Sequential, Test_Sum_100_From_File) {
-  std::string line;
-  std::ifstream test_file(ppc::core::GetAbsolutePath("all/example/data/test_seq.txt"));
-  if (test_file.is_open()) {
-    getline(test_file, line);
-  }
-  test_file.close();
-
-  const int count = std::stoi(line);
+  cv::Mat img = cv::imread(ppc::core::GetAbsolutePath("all/example/data/pic_seq.jpg"));
+  EXPECT_EQ(img.rows, img.cols);
+  const int count = img.rows + img.cols;
 
   // Create data
   std::vector<int> in(1, count);

tasks/all/example/data/pic_stl.jpg

@@ -1,6 +1,6 @@
 #include <gtest/gtest.h>
 
-#include <fstream>
+#include <opencv2/opencv.hpp>
 #include <random>
 #include <thread>
 #include <vector>
@@ -215,14 +215,11 @@ TEST(Parallel_Operations_STL_Threads, Test_Diff_2) {
 }
 
 TEST(Parallel_Operations_STL_Threads, Test_Diff_2_File) {
-  std::string line;
-  std::ifstream test_file(ppc::core::GetAbsolutePath("all/example/data/test_stl.txt"));
-  if (test_file.is_open()) {
-    getline(test_file, line);
-  }
-  test_file.close();
+  cv::Mat img = cv::imread(ppc::core::GetAbsolutePath("all/example/data/pic_stl.jpg"));
+  EXPECT_EQ(static_cast<int>(sqrt(img.cols / 2) * sqrt(img.cols / 2)), img.rows);
+  const int count_size_vector = static_cast<int>(sqrt(sqrt(img.rows)));
 
-  auto nthreads = std::thread::hardware_concurrency() * std::stoi(line);
+  auto nthreads = std::thread::hardware_concurrency() * count_size_vector;
   std::vector<int> vec = GetRandomVector(static_cast<int>(nthreads));
   // Create data
   std::vector<int> ref_res(1, 0);

tasks/all/example/data/pic_tbb.jpg

@@ -1,6 +1,6 @@
 #include <gtest/gtest.h>
 
-#include <fstream>
+#include <opencv2/opencv.hpp>
 #include <random>
 #include <vector>
 
@@ -209,14 +209,11 @@ TEST(Parallel_Operations_TBB, Test_Mult_2) {
 }
 
 TEST(Parallel_Operations_TBB, Test_Mult_2_File) {
-  std::string line;
-  std::ifstream test_file(ppc::core::GetAbsolutePath("all/example/data/test_tbb.txt"));
-  if (test_file.is_open()) {
-    getline(test_file, line);
-  }
-  test_file.close();
+  cv::Mat img = cv::imread(ppc::core::GetAbsolutePath("all/example/data/pic_tbb.jpg"));
+  EXPECT_EQ(static_cast<int>(sqrt(img.rows / 2) * sqrt(img.rows / 2)), img.cols);
+  const int count_size_vector = img.rows + img.cols;
 
-  std::vector<int> vec = GetRandomVector(std::stoi(line));
+  std::vector<int> vec = GetRandomVector(count_size_vector);
   // Create data
   std::vector<int> ref_res(1, 0);