fix

Author: Semyon1104

CMakeLists.txt

@@ -51,4 +51,5 @@ endforeach()
 add_subdirectory(app)
 add_subdirectory(include)
 add_subdirectory(src)
+add_subdirectory(src/layers_oneDNN)
 add_subdirectory(test)

app/Graph/acc_check.cpp

@@ -72,7 +72,7 @@ int main(int argc, char* argv[]) {
           for (int j = 0; j < 28; ++j) {
             size_t a = ind;
             for (size_t n = 0; n < name; n++) a += counts[n] + 1;
-            res[(a)*28 * 28 + i * 28 + j] = channels[0].at<uchar>(j, i);
+            res[(a) * 28 * 28 + i * 28 + j] = channels[0].at<uchar>(j, i);
           }
         }
       }

app/Graph/build.cpp

@@ -377,7 +377,7 @@ void build_graph(it_lab_ai::Tensor& input, it_lab_ai::Tensor& output,
 }
 
 ParseResult parse_json_model(const std::string& json_path, bool comments,
-                             bool parallel, bool use_onednn) {
+                             bool parallel, bool onednn) {
   ParseResult result;
 
   auto& layers = result.layers;
@@ -495,15 +495,15 @@ ParseResult parse_json_model(const std::string& json_path, bool comments,
       } else if (layer_type.find("Relu") != std::string::npos ||
                  layer_type.find("relu") != std::string::npos) {
         std::shared_ptr<it_lab_ai::Layer> ew_layer;
-        if (use_onednn) {
+        if (onednn) {
           ew_layer = std::make_shared<it_lab_ai::EWLayer_oneDNN>("relu");
         } else {
           ew_layer = std::make_shared<it_lab_ai::EWLayer>("relu");
         }
         layer = ew_layer;
       } else if (layer_type.find("Sigmoid") != std::string::npos) {
         std::shared_ptr<it_lab_ai::Layer> ew_layer;
-        if (use_onednn) {
+        if (onednn) {
           ew_layer = std::make_shared<it_lab_ai::EWLayer_oneDNN>("sigmoid");
         } else {
           ew_layer = std::make_shared<it_lab_ai::EWLayer>("sigmoid");
@@ -733,7 +733,7 @@ ParseResult parse_json_model(const std::string& json_path, bool comments,
           if (layer_type == "Mul") {
             ew_operation = "linear";
             std::shared_ptr<it_lab_ai::Layer> ew_layer;
-            if (use_onednn) {
+            if (onednn) {
               ew_layer = std::make_shared<it_lab_ai::EWLayer_oneDNN>(
                   ew_operation, value, 0.0F);
             } else {
@@ -744,7 +744,7 @@ ParseResult parse_json_model(const std::string& json_path, bool comments,
           } else if (layer_type == "Add") {
             ew_operation = "linear";
             std::shared_ptr<it_lab_ai::Layer> ew_layer;
-            if (use_onednn &&
+            if (onednn &&
                 it_lab_ai::EWLayer_oneDNN::is_function_supported("linear")) {
               ew_layer = std::make_shared<it_lab_ai::EWLayer_oneDNN>(
                   ew_operation, 1.0F, value);
@@ -756,7 +756,7 @@ ParseResult parse_json_model(const std::string& json_path, bool comments,
           } else if (layer_type == "Sub") {
             ew_operation = "linear";
             std::shared_ptr<it_lab_ai::Layer> ew_layer;
-            if (use_onednn &&
+            if (onednn &&
                 it_lab_ai::EWLayer_oneDNN::is_function_supported("linear")) {
               ew_layer = std::make_shared<it_lab_ai::EWLayer_oneDNN>(
                   ew_operation, 1.0F, -value);

app/Graph/build.hpp

@@ -66,7 +66,7 @@ std::unordered_map<int, std::string> load_class_names(
     const std::string& filename);
 
 ParseResult parse_json_model(const std::string& json_path, bool comments,
-                             bool parallel, bool use_onednn);
+                             bool parallel, bool onednn);
 
 std::vector<int> get_input_shape_from_json(const std::string& json_path);
 std::vector<float> process_model_output(const std::vector<float>& output,

test/CMakeLists.txt

@@ -4,7 +4,7 @@ add_executable(run_test ${TEST_SRC_FILES})
 if (NOT WIN32)
     target_link_libraries(run_test PUBLIC OpenMP::OpenMP_CXX)
 endif()
-target_link_libraries(run_test PUBLIC perf_lib layers_lib)
+target_link_libraries(run_test PUBLIC perf_lib layers_lib layers_oneDNN_lib)
 target_link_libraries(run_test PUBLIC gtest)
 target_link_libraries(run_test PUBLIC ReadLib)
 target_link_libraries(run_test PUBLIC reader_lib)
@@ -26,6 +26,14 @@ if (WIN32)
             "${CMAKE_BINARY_DIR}/bin/")
 endif()
 
+if (WIN32)
+    add_custom_command(TARGET run_test POST_BUILD
+        COMMAND ${CMAKE_COMMAND} -E copy
+            $<TARGET_FILE:dnnl>
+            $<TARGET_FILE_DIR:run_test>
+    )
+endif()
+
 add_test(UnitTests ${CMAKE_BINARY_DIR}/bin/run_test)
 
 file(DOWNLOAD

test/single_layer/test_ewlayer_onednn.cpp

@@ -147,8 +147,8 @@ TEST(ewlayer_onednn, multidim_tensor_relu) {
 }
 
 TEST(ewlayer_onednn, unsupported_function_throws) {
-  EXPECT_THROW({ EWLayer_oneDNN layer("unsupported_function"); },
-               std::invalid_argument);
+  EXPECT_THROW(
+      { EWLayer_oneDNN layer("unsupported_function"); },std::invalid_argument);
 }
 
 TEST(ewlayer_onednn, compare_with_naive_relu) {