remove ocv

Author: allnes

.github/workflows/static-analysis-pr.yml

@@ -21,7 +21,7 @@ jobs:
         id: review
         with:
           build_dir: build
-          apt_packages: mpich,libmpich*,mpi*,openmpi-bin,ninja-build,libomp-19-dev,valgrind,libopencv-dev
+          apt_packages: mpich,libmpich*,mpi*,openmpi-bin,ninja-build,libomp-19-dev,valgrind
           cmake_command: >
             cmake -S . -B build
             -D CMAKE_C_COMPILER_LAUNCHER=ccache -D CMAKE_CXX_COMPILER_LAUNCHER=ccache
@@ -30,7 +30,6 @@ jobs:
             -D USE_SEQ=ON -D USE_MPI=ON
             -D USE_OMP=ON -D USE_TBB=ON -D USE_STL=ON
             -D CMAKE_BUILD_TYPE=RELEASE -DCMAKE_EXPORT_COMPILE_COMMANDS=ON
-            -D USE_SYSTEM_OPENCV=ON
           config_file: .clang-tidy
           exclude: 3rdparty
           split_workflow: true
@@ -59,7 +58,7 @@ jobs:
         id: review
         with:
           build_dir: build
-          apt_packages: mpich,libmpich*,mpi*,openmpi-bin,ninja-build,libomp-19-dev,valgrind,libopencv-dev
+          apt_packages: mpich,libmpich*,mpi*,openmpi-bin,ninja-build,libomp-19-dev,valgrind
           cmake_command: >
             cmake -S . -B build
             -D CMAKE_C_COMPILER_LAUNCHER=ccache -D CMAKE_CXX_COMPILER_LAUNCHER=ccache
@@ -68,7 +67,6 @@ jobs:
             -D USE_SEQ=ON -D USE_MPI=ON
             -D USE_OMP=ON -D USE_TBB=ON -D USE_STL=ON
             -D CMAKE_BUILD_TYPE=RELEASE -DCMAKE_EXPORT_COMPILE_COMMANDS=ON
-            -D USE_SYSTEM_OPENCV=ON
           config_file: .clang-tidy
           exclude: 3rdparty
           split_workflow: true

CMakeLists.txt

@@ -21,7 +21,6 @@ include(cmake/onetbb.cmake)
 ######################### External projects #########################
 
 message( STATUS "PPC step: Setup external projects" )
-include(cmake/opencv.cmake)
 include(cmake/gtest.cmake)
 
 ########################### Documentation ###########################

cmake/opencv.cmake

@@ -29,13 +29,6 @@ def __init__(self):
         self.work_dir = None
         self.valgrind_cmd = "valgrind --error-exitcode=1 --leak-check=full --show-leak-kinds=all"
 
-        if platform.system() == "Windows":
-            self.ocv_script_name = "setup_vars_opencv4.cmd"
-            self.ocv_script_path = Path("build/ppc_opencv/install/") / self.ocv_script_name
-        else:
-            self.ocv_script_name = "setup_vars_opencv4.sh"
-            self.ocv_script_path = Path("build/ppc_opencv/install/bin/") / self.ocv_script_name
-
         if platform.system() == "Windows":
             self.mpi_exec = "mpiexec"
         else:
@@ -65,18 +58,6 @@ def __source_script(script_path):
             print(f"Failed to source script: {script_path}")
             return {}
 
-    def setup_env(self):
-        if os.path.isfile(Path(self.__get_project_path()) / self.ocv_script_path):
-            _work_dir = Path(self.__get_project_path()) / "build/bin"
-            env_vars = self.__source_script(Path(self.__get_project_path()) / self.ocv_script_path)
-        else:
-            _work_dir = Path(self.__get_project_path()) / "install/bin"
-            env_vars = self.__source_script(Path(_work_dir) / self.ocv_script_name)
-
-        self.work_dir = Path(_work_dir)
-        if not platform.system() == "Windows":
-            os.environ.update(env_vars)
-
     @staticmethod
     def __run_exec(command):
         result = subprocess.run(command, shell=True, env=os.environ)
@@ -149,7 +130,6 @@ def run_performance_list(self):
     args_dict = init_cmd_args()
 
     ppc_runner = PPCRunner()
-    ppc_runner.setup_env()
 
     if args_dict["running_type"] in ["threads", "processes"]:
         ppc_runner.run_core()

scripts/run_tests.py

@@ -130,28 +130,6 @@ foreach(TASK_TYPE ${LIST_OF_TASKS})
           endif()
       endif ()
 
-      add_dependencies(${EXEC_FUNC} ppc_opencv)
-      if(WIN32)
-          target_include_directories(${EXEC_FUNC} PUBLIC "${CMAKE_BINARY_DIR}/ppc_opencv/install/include")
-      else()
-          target_include_directories(${EXEC_FUNC} PUBLIC "${CMAKE_BINARY_DIR}/ppc_opencv/install/include/opencv4")
-      endif()
-
-
-      if(WIN32)
-          target_link_directories(${EXEC_FUNC} PUBLIC "${CMAKE_BINARY_DIR}/ppc_opencv/build/lib")
-          set(OCV_VERSION "4110")
-      else()
-          target_link_directories(${EXEC_FUNC} PUBLIC "${CMAKE_BINARY_DIR}/ppc_opencv/install/lib")
-      endif()
-
-      target_link_libraries(${EXEC_FUNC} PUBLIC
-              opencv_core${OCV_VERSION}
-              opencv_highgui${OCV_VERSION}
-              opencv_imgcodecs${OCV_VERSION}
-              opencv_imgproc${OCV_VERSION}
-              opencv_videoio${OCV_VERSION})
-
       add_dependencies(${EXEC_FUNC} ppc_googletest)
       target_link_directories(${EXEC_FUNC} PUBLIC "${CMAKE_BINARY_DIR}/ppc_googletest/install/lib")
       target_link_libraries(${EXEC_FUNC} PUBLIC gtest gtest_main)

tasks/CMakeLists.txt

@@ -3,7 +3,6 @@
 #include <cstddef>
 #include <cstdint>
 #include <memory>
-#include <opencv2/opencv.hpp>
 #include <vector>
 
 #include "all/example/include/ops_all.hpp"