Trim unrelated changes from SYCL PR

Author: allnes

.github/workflows/ci.yml

@@ -1,9 +1,5 @@
 name: CI
 
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
-  cancel-in-progress: true
-
 on:
   push:
   pull_request:

.github/workflows/static-analysis.yml

@@ -1,9 +1,5 @@
 name: Static analysis
 
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
-  cancel-in-progress: true
-
 on: [pull_request]
 
 jobs:

.github/workflows/sycl-ci.yml

@@ -90,9 +90,6 @@ jobs:
     - name: Build
       run: cmake --build build --parallel
 
-    - name: Test
-      run: ctest --test-dir build --output-on-failure -E '^SYCL\.Example$' --parallel
-
     - name: Test
       run: |
         if [ -n "${DEVICE_SELECTOR}" ]; then

app/Graph/build.cpp

@@ -519,7 +519,7 @@ ParseResult parse_json_model(RuntimeOptions options,
             concat_connections[layer_name].push_back(base_input_name);
           }
         }
-        auto concat_layer = LayerFactory::createConcatLayer(axis, options);
+        auto concat_layer = std::make_shared<it_lab_ai::ConcatLayer>(axis);
         layer = concat_layer;
         concat_connected_inputs[layer_name] = std::unordered_set<std::string>();
       } else if (layer_type == "Split") {

app/Graph/build.hpp

@@ -33,7 +33,6 @@
 #include "layers/Tensor.hpp"
 #include "layers/TransposeLayer.hpp"
 #include "layers_oneDNN/BinaryOpLayer.hpp"
-#include "layers_oneDNN/ConcatLayer.hpp"
 #include "layers_oneDNN/ConvLayer.hpp"
 #include "layers_oneDNN/EWLayer.hpp"
 #include "layers_oneDNN/PoolingLayer.hpp"
@@ -135,14 +134,6 @@ class LayerFactory {
     return std::make_shared<PoolingLayer>(shape, strides, pads, dilations,
                                           ceil_mode, PoolType);
   }
-
-  static std::shared_ptr<Layer> createConcatLayer(
-      int64_t axis, const RuntimeOptions& options) {
-    if (options.backend == Backend::kOneDnn) {
-      return std::make_shared<ConcatLayerOneDnn>(axis);
-    }
-    return std::make_shared<ConcatLayer>(axis);
-  }
 };
 
 }  // namespace it_lab_ai

include/layers_oneDNN/ConcatLayer.hpp

@@ -1,4 +1,4 @@
-#include "Weights_Reader/reader_weights.hpp"
+#include "Weights_Reader/reader_weights.hpp"
 
 #include <fstream>
 #include <iostream>

src/Weights_Reader/reader_weights.cpp

@@ -6,6 +6,10 @@ endif()
 
 add_executable(run_test ${TEST_SRC_FILES})
 
+if(WIN32)
+    target_compile_definitions(run_test PRIVATE _CRT_SECURE_NO_WARNINGS)
+endif()
+
 target_link_libraries(run_test PUBLIC OpenMP::OpenMP_CXX)
 target_link_libraries(run_test PUBLIC perf_lib layers_lib layers_oneDNN_lib layers_fused_lib)
 target_link_libraries(run_test PUBLIC gtest)

src/layers_oneDNN/ConcatLayer.cpp

@@ -1,20 +1,20 @@
 #include <gtest/gtest.h>
 
+#include <cstdlib>
 #include <cstring>
 #include <iostream>
 
-#include "utils/env.hpp"
-
 int main(int argc, char** argv) {
   ::testing::InitGoogleTest(&argc, argv);
 
-  const std::string flaky_disabled = test_utils::get_env("DISABLE_FLAKY_TESTS");
-  bool flaky_enabled = flaky_disabled.empty() ||
-                       (flaky_disabled != "1" && flaky_disabled != "true");
+  const char* flaky_disabled = std::getenv("DISABLE_FLAKY_TESTS");
+  bool flaky_enabled =
+      (flaky_disabled == nullptr) || (std::strcmp(flaky_disabled, "1") != 0 &&
+                                      std::strcmp(flaky_disabled, "true") != 0);
 
   if (flaky_enabled) {
-    const std::string retries = test_utils::get_env("FLAKY_RETRIES");
-    int retry_count = retries.empty() ? 10 : std::atoi(retries.c_str());
+    const char* retries = std::getenv("FLAKY_RETRIES");
+    int retry_count = retries ? std::atoi(retries) : 10;
     std::cout << "Flaky test support enabled. Max retries: " << retry_count
               << '\n';
     std::cout << "Use FLAKY_TEST/FLAKY_TEST_F macros to create flaky tests."