add new version stb

Author: allnes

modules/core/CMakeLists.txt

@@ -28,10 +28,6 @@ add_dependencies(${exec_func_tests} ppc_googletest)
 target_link_directories(${exec_func_tests} PUBLIC ${CMAKE_BINARY_DIR}/ppc_googletest/install/lib)
 target_link_libraries(${exec_func_tests} PUBLIC gtest gtest_main)
 
-add_library(stb_image INTERFACE)
-target_include_directories(stb_image INTERFACE ${CMAKE_SOURCE_DIR}/3rdparty/stb)
-target_link_libraries(${exec_func_tests} PUBLIC stb_image)
-
 target_link_libraries(${exec_func_tests} PUBLIC ${exec_func_lib})
 
 enable_testing()

modules/core/util/include/util.hpp

@@ -1,11 +1,9 @@
 #pragma once
 #include <string>
-#include <vector>
 
 namespace ppc::util {
 
 std::string GetAbsolutePath(const std::string &relative_path);
 int GetPPCNumThreads();
-bool GetImageData(const std::string &abs_path, std::vector<uint8_t> &image, int &width, int &height, int &channels);
 
 }  // namespace ppc::util

modules/core/util/src/util.cpp

@@ -7,11 +7,7 @@
 #include <memory>
 #endif
 
-#define STB_IMAGE_IMPLEMENTATION
-#include <stb/stb_image.h>
-
 #include <filesystem>
-#include <iostream>
 #include <string>
 
 std::string ppc::util::GetAbsolutePath(const std::string &relative_path) {
@@ -34,18 +30,3 @@ int ppc::util::GetPPCNumThreads() {
 #endif
   return num_threads;
 }
-
-bool ppc::util::GetImageData(const std::string &abs_path, std::vector<uint8_t> &image, int &width, int &height,
-                             int &channels) {
-  width = -1;
-  height = -1;
-  channels = -1;
-  unsigned char *data = stbi_load(abs_path.c_str(), &width, &height, &channels, 0);
-  if (data == nullptr) {
-    std::cerr << "Failed to load image: " << stbi_failure_reason() << '\n';
-    return false;
-  }
-  image = std::vector<uint8_t>(data, data + (width * height * channels));
-  stbi_image_free(data);
-  return true;
-}

tasks/CMakeLists.txt

@@ -38,6 +38,8 @@ endif ()
 
 add_compile_definitions(PATH_TO_PPC_PROJECT="${CMAKE_SOURCE_DIR}")
 
+add_library(stb_image INTERFACE)
+
 foreach(TASK_TYPE ${LIST_OF_TASKS})
     set(PATH_TO_TASK "${CMAKE_CURRENT_SOURCE_DIR}/${TASK_TYPE}")
     get_filename_component(MODULE_NAME ${PATH_TO_TASK} NAME)
@@ -130,6 +132,9 @@ foreach(TASK_TYPE ${LIST_OF_TASKS})
           endif()
       endif ()
 
+      target_include_directories(stb_image INTERFACE ${CMAKE_SOURCE_DIR}/3rdparty/stb)
+      target_link_libraries(${exec_func_tests} PUBLIC stb_image)
+
       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/all/example/func_tests/func_all.cpp

@@ -9,6 +9,11 @@
 #include "core/task/include/task.hpp"
 #include "core/util/include/util.hpp"
 
+#include <iostream>
+#define STB_IMAGE_IMPLEMENTATION
+#include <stb/stb_image.h>
+#include <string>
+
 TEST(nesterov_a_test_task_all, test_matmul_50) {
   constexpr size_t kCount = 50;
 
@@ -41,9 +46,20 @@ TEST(nesterov_a_test_task_all, test_matmul_from_pic) {
   int height = -1;
   int channels = -1;
   std::vector<uint8_t> img;
+  std::string abs_path = ppc::util::GetAbsolutePath("all/example/data/pic_all.jpg");
+
+  auto get_image_data = [&]() -> bool {
+    unsigned char *data = stbi_load(abs_path.c_str(), &width, &height, &channels, 0);
+    if (data == nullptr) {
+      std::cerr << "Failed to load image: " << stbi_failure_reason() << '\n';
+      return false;
+    }
+    img = std::vector<uint8_t>(data, data + (width * height * channels));
+    stbi_image_free(data);
+    return true;
+  };
+  EXPECT_TRUE(get_image_data());
 
-  EXPECT_TRUE(ppc::util::GetImageData(ppc::util::GetAbsolutePath("all/example/data/pic_all.jpg"), img, width, height,
-                                      channels));
   EXPECT_EQ(width, height);
   const int count = (width + height) / 10;