Fix PR CI regressions

Author: allnes

app/SYCL/sycl_example.cpp

@@ -4,8 +4,8 @@
 #include <vector>
 
 #if __has_include(<sycl/sycl.hpp>)
-#include <sycl/sycl.hpp>
-#define ITLABAI_HAS_SYCL_HEADERS 1
+#  include <sycl/sycl.hpp>
+#  define ITLABAI_HAS_SYCL_HEADERS 1
 #endif
 
 #include "graph/runtime_options.hpp"

app/SYCL/sycl_kernel.cpp

@@ -1,8 +1,8 @@
 #include <cstddef>
 
 #if __has_include(<sycl/sycl.hpp>)
-#include <sycl/sycl.hpp>
-#define ITLABAI_HAS_SYCL_HEADERS 1
+#  include <sycl/sycl.hpp>
+#  define ITLABAI_HAS_SYCL_HEADERS 1
 #endif
 
 #if defined(ITLABAI_HAS_SYCL_HEADERS)

scripts/ci/sycl-configure.sh

@@ -5,28 +5,26 @@ build_type="${1:?build type is required}"
 sycl_targets="${2:?sycl targets are required}"
 opencv_apps="${3:?opencv apps toggle is required}"
 
-launcher_args=()
+cmake_args=()
 if [[ "${RUNNER_OS}" != "Windows" ]]; then
-  launcher_args+=(
+  cmake_args+=(
     -DCMAKE_C_COMPILER_LAUNCHER=ccache
     -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
   )
 fi
 
-openmp_args=()
 if [[ -n "${ITLABAI_OPENMP_FLAGS:-}" ]]; then
-  openmp_args+=(-DOpenMP_CXX_FLAGS="${ITLABAI_OPENMP_FLAGS}")
+  cmake_args+=(-DOpenMP_CXX_FLAGS="${ITLABAI_OPENMP_FLAGS}")
 fi
 if [[ -n "${ITLABAI_OPENMP_LIBRARY:-}" ]]; then
-  openmp_args+=(
+  cmake_args+=(
     -DOpenMP_CXX_LIB_NAMES=iomp5
     -DOpenMP_iomp5_LIBRARY="${ITLABAI_OPENMP_LIBRARY}"
   )
 fi
 
 cmake -S . -B build -G Ninja \
-  "${launcher_args[@]}" \
-  "${openmp_args[@]}" \
+  "${cmake_args[@]}" \
   -DCMAKE_C_COMPILER="${ITLABAI_CC}" \
   -DCMAKE_CXX_COMPILER="${ITLABAI_CXX}" \
   -DCMAKE_BUILD_TYPE="${build_type}" \

scripts/ci/sycl-x86-setup.sh

@@ -101,10 +101,10 @@ if [[ "${RUNNER_OS}" == "Windows" ]]; then
     cc_path="${SYCL_ROOT}/bin/icx.exe"
   elif [[ -x "${SYCL_ROOT}/bin/icx-cl.exe" ]]; then
     cc_path="${SYCL_ROOT}/bin/icx-cl.exe"
-  elif [[ -x "${SYCL_ROOT}/bin/clang.exe" ]]; then
-    cc_path="${SYCL_ROOT}/bin/clang.exe"
   elif [[ -x "${SYCL_ROOT}/bin/clang-cl.exe" ]]; then
     cc_path="${SYCL_ROOT}/bin/clang-cl.exe"
+  elif [[ -x "${SYCL_ROOT}/bin/clang.exe" ]]; then
+    cc_path="${SYCL_ROOT}/bin/clang.exe"
   else
     echo "Unable to locate a C compiler in ${SYCL_ROOT}/bin" >&2
     exit 1
@@ -114,10 +114,10 @@ if [[ "${RUNNER_OS}" == "Windows" ]]; then
     cxx_path="${SYCL_ROOT}/bin/icpx.exe"
   elif [[ -x "${SYCL_ROOT}/bin/icx-cl.exe" ]]; then
     cxx_path="${SYCL_ROOT}/bin/icx-cl.exe"
-  elif [[ -x "${SYCL_ROOT}/bin/clang++.exe" ]]; then
-    cxx_path="${SYCL_ROOT}/bin/clang++.exe"
   elif [[ -x "${SYCL_ROOT}/bin/clang-cl.exe" ]]; then
     cxx_path="${SYCL_ROOT}/bin/clang-cl.exe"
+  elif [[ -x "${SYCL_ROOT}/bin/clang++.exe" ]]; then
+    cxx_path="${SYCL_ROOT}/bin/clang++.exe"
   else
     echo "Unable to locate a C++ compiler in ${SYCL_ROOT}/bin" >&2
     exit 1

src/Weights_Reader/reader_weights.cpp

@@ -50,7 +50,7 @@ json read_json(const std::string& filename) {
     throw std::runtime_error("Cannot open file: " + filename);
   }
 
-  struct stat sb {};
+  struct stat sb{};
   fstat(fd, &sb);
 
   if (sb.st_size == 0) {

test/main.cpp

@@ -9,8 +9,8 @@ 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");
+  bool flaky_enabled = flaky_disabled.empty() ||
+                       (flaky_disabled != "1" && flaky_disabled != "true");
 
   if (flaky_enabled) {
     const std::string retries = test_utils::get_env("FLAKY_RETRIES");