Revert "Address remaining SYCL review comments"

allnes · allnes · commit c5560ab27a08 · 2026-03-26T20:57:05.000+01:00
This reverts commit 221376e.
diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml
@@ -27,18 +27,5 @@ jobs:
             cmake --build build --parallel
     - name: Run clang-tidy
       run: |
-        python3 - <<'PY'
-        import json
-        from pathlib import Path
-
-        compile_commands = json.loads(Path("build/compile_commands.json").read_text())
-        sources = sorted(
-            {
-                entry["file"]
-                for entry in compile_commands
-                if "/app/" in entry["file"] or "/src/" in entry["file"]
-            }
-        )
-        Path("build/clang_tidy_sources.txt").write_text("\n".join(sources) + "\n")
-        PY
-        xargs -a build/clang_tidy_sources.txt clang-tidy -format-style=file -header-filter="($PWD/include/.*|$PWD/src/.*|$PWD/app/.*)" -p build
+        mapfile -t sources < <(find app src -path 'app/SYCL' -prune -o -name '*.cpp' -print)
+        clang-tidy "${sources[@]}" -format-style=file -header-filter="($PWD/include/.*|$PWD/src/.*|$PWD/app/.*)" -p build
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -42,7 +42,6 @@ find_package(OpenMP REQUIRED COMPONENTS CXX)
 
 if(OpenMP_FOUND)
     message(STATUS "OpenMP found - enabling parallel support")
-    add_definitions(-DHAS_OPENMP)
 else()
     message(STATUS "OpenMP not found - parallel features disabled")
 endif()
diff --git a/include/graph/runtime_options.hpp b/include/graph/runtime_options.hpp
@@ -1,5 +1,5 @@
 #pragma once
-#include <cstdint>
+#include <stdint.h>
 
 #include "parallel/parallel.hpp"
 
diff --git a/include/layers/ConcatLayer.hpp b/include/layers/ConcatLayer.hpp
@@ -1,5 +1,6 @@
 #pragma once
-#include <cstdint>
+#include <stdint.h>
+
 #include <numeric>
 #include <stdexcept>
 #include <vector>
diff --git a/include/layers/InputLayer.hpp b/include/layers/InputLayer.hpp
@@ -1,7 +1,8 @@
 #pragma once
+#include <stdint.h>
+
 #include <algorithm>
 #include <cmath>
-#include <cstdint>
 
 #include "layers/Layer.hpp"
 
diff --git a/include/layers/ReduceLayer.hpp b/include/layers/ReduceLayer.hpp
@@ -1,5 +1,6 @@
 #pragma once
-#include <cstdint>
+#include <stdint.h>
+
 #include <limits>
 #include <vector>
 
diff --git a/include/layers/Tensor.hpp b/include/layers/Tensor.hpp
@@ -1,6 +1,7 @@
 #pragma once
 
-#include <cstdint>
+#include <stdint.h>
+
 #include <iostream>
 #include <stdexcept>
 #include <type_traits>
diff --git a/include/layers_oneDNN/ReduceLayer.hpp b/include/layers_oneDNN/ReduceLayer.hpp
@@ -1,5 +1,6 @@
 #pragma once
-#include <cstdint>
+#include <stdint.h>
+
 #include <dnnl.hpp>
 #include <memory>
 #include <vector>
diff --git a/include/parallel/backends.hpp b/include/parallel/backends.hpp
@@ -1,9 +1,10 @@
 #pragma once
+// clang-format off
+#include <stdint.h>
 #include <oneapi/tbb/blocked_range.h>
 #include <oneapi/tbb/info.h>
 #include <oneapi/tbb/parallel_for.h>
-
-#include <cstdint>
+// clang-format on
 
 // NOLINTNEXTLINE(misc-header-include-cycle)
 #include <Kokkos_Core.hpp>
@@ -16,7 +17,7 @@
 namespace it_lab_ai {
 namespace parallel {
 
-enum class Backend : std::uint8_t {
+enum class Backend : uint8_t {
   kSeq = 0,
   kThreads = 1,
   kTbb = 2,
@@ -93,7 +94,7 @@ inline void impl_tbb(std::size_t count,
   }, oneapi::tbb::auto_partitioner());
 }
 
-#ifdef HAS_OPENMP
+#ifdef _OPENMP
 inline void impl_omp(std::size_t count,
                      const std::function<void(std::size_t)>& func,
                      const Options& opt) {
diff --git a/include/parallel/parallel.hpp b/include/parallel/parallel.hpp
@@ -5,7 +5,7 @@ namespace it_lab_ai {
 namespace parallel {
 
 constexpr bool kHasOmp =
-#ifdef HAS_OPENMP
+#ifdef _OPENMP
     true;
 #else
     false;
@@ -16,7 +16,7 @@ inline Backend resolve_default_backend(std::size_t n, const Options& opt) {
     return Backend::kSeq;
   }
 
-#ifdef HAS_OPENMP
+#ifdef _OPENMP
   return Backend::kOmp;
 #else
   return Backend::kTbb;
diff --git a/include/perf/benchmarking.hpp b/include/perf/benchmarking.hpp
@@ -1,7 +1,10 @@
 // Using chrono for good measurements and parallelism support
 
 #pragma once
+// clang-format off
+#include <stdint.h>
 #include <omp.h>
+// clang-format on
 
 #include <chrono>
 #include <cmath>
diff --git a/scripts/ci/common.py b/scripts/ci/common.py
@@ -0,0 +1,89 @@
+#!/usr/bin/env python3
+
+from __future__ import annotations
+
+import os
+import shutil
+import subprocess
+import sys
+import tarfile
+import urllib.request
+from pathlib import Path
+
+
+def run(command: list[str], *, input_text: str | None = None) -> None:
+    print("+", " ".join(command), flush=True)
+    subprocess.run(command, check=True, text=True, input=input_text)
+
+
+def capture(command: list[str]) -> str:
+    return subprocess.check_output(command, text=True).strip()
+
+
+def require_env(name: str) -> str:
+    value = os.environ.get(name)
+    if not value:
+        raise SystemExit(f"Missing required environment variable: {name}")
+    return value
+
+
+def write_env(name: str, value: str) -> None:
+    github_env = os.environ.get("GITHUB_ENV")
+    if github_env:
+        with open(github_env, "a", encoding="utf-8") as handle:
+            handle.write(f"{name}={value}\n")
+    os.environ[name] = value
+
+
+def append_path(value: str) -> None:
+    github_path = os.environ.get("GITHUB_PATH")
+    if github_path:
+        with open(github_path, "a", encoding="utf-8") as handle:
+            handle.write(f"{value}\n")
+
+
+def prepend_env_path(name: str, value: str) -> None:
+    current = os.environ.get(name, "")
+    write_env(name, f"{value}:{current}" if current else value)
+
+
+def download(url: str, destination: Path) -> None:
+    destination.parent.mkdir(parents=True, exist_ok=True)
+    with urllib.request.urlopen(url) as response, open(destination, "wb") as handle:
+        shutil.copyfileobj(response, handle)
+
+
+def extract_tarball(archive: Path, destination: Path) -> None:
+    destination.mkdir(parents=True, exist_ok=True)
+    with tarfile.open(archive, "r:gz") as tar_handle:
+        tar_handle.extractall(destination)
+
+
+def cygpath(mode: str, path: str | Path) -> str:
+    return capture(["cygpath", f"-{mode}", str(path)])
+
+
+def find_first_existing(paths: list[Path]) -> Path:
+    for path in paths:
+        if path.exists():
+            return path
+    raise SystemExit(f"Unable to locate any of: {', '.join(str(path) for path in paths)}")
+
+
+def find_file(root_candidates: list[Path], filename: str) -> Path | None:
+    for root in root_candidates:
+        if not root.exists():
+            continue
+        for current_root, _, files in os.walk(root):
+            if filename in files:
+                return Path(current_root) / filename
+    return None
+
+
+def repo_root() -> Path:
+    return Path(__file__).resolve().parents[2]
+
+
+def main_error(message: str) -> None:
+    print(message, file=sys.stderr)
+    raise SystemExit(1)
diff --git a/scripts/ci/sycl_adaptivecpp_setup.py b/scripts/ci/sycl_adaptivecpp_setup.py
@@ -2,45 +2,9 @@
 
 from __future__ import annotations
 
-import os
-import subprocess
 from pathlib import Path
 
-
-def run(command: list[str]) -> None:
-    print("+", " ".join(command), flush=True)
-    subprocess.run(command, check=True, text=True)
-
-
-def capture(command: list[str]) -> str:
-    return subprocess.check_output(command, text=True).strip()
-
-
-def require_env(name: str) -> str:
-    value = os.environ.get(name)
-    if not value:
-        raise SystemExit(f"Missing required environment variable: {name}")
-    return value
-
-
-def write_env(name: str, value: str) -> None:
-    github_env = os.environ.get("GITHUB_ENV")
-    if github_env:
-        with open(github_env, "a", encoding="utf-8") as handle:
-            handle.write(f"{name}={value}\n")
-    os.environ[name] = value
-
-
-def append_path(value: str) -> None:
-    github_path = os.environ.get("GITHUB_PATH")
-    if github_path:
-        with open(github_path, "a", encoding="utf-8") as handle:
-            handle.write(f"{value}\n")
-
-
-def prepend_env_path(name: str, value: str) -> None:
-    current = os.environ.get(name, "")
-    write_env(name, f"{value}:{current}" if current else value)
+from common import append_path, capture, prepend_env_path, require_env, run, write_env
 
 
 def set_common_env(prefixes: list[str], clang_path: str, clangxx_path: str) -> None:
diff --git a/scripts/ci/sycl_configure.py b/scripts/ci/sycl_configure.py
@@ -4,25 +4,14 @@
 
 import os
 import shutil
-import subprocess
 import sys
 
-
-def run(command: list[str]) -> None:
-    print("+", " ".join(command), flush=True)
-    subprocess.run(command, check=True, text=True)
-
-
-def require_env(name: str) -> str:
-    value = os.environ.get(name)
-    if not value:
-        raise SystemExit(f"Missing required environment variable: {name}")
-    return value
+from common import main_error, require_env, run
 
 
 def main() -> None:
     if len(sys.argv) != 3:
-        raise SystemExit("Usage: sycl_configure.py <build_type> <opencv_apps>")
+        main_error("Usage: sycl_configure.py <build_type> <opencv_apps>")
 
     build_type, opencv_apps = sys.argv[1:]
 
@@ -43,9 +32,7 @@ def main() -> None:
     openmp_library = os.environ.get("ITLABAI_OPENMP_LIBRARY", "")
     if openmp_library:
         if not openmp_library_name:
-            raise SystemExit(
-                "ITLABAI_OPENMP_LIBRARY is set without ITLABAI_OPENMP_LIBRARY_NAME"
-            )
+            main_error("ITLABAI_OPENMP_LIBRARY is set without ITLABAI_OPENMP_LIBRARY_NAME")
         cmake_args.extend(
             [
                 f"-DOpenMP_CXX_LIB_NAMES={openmp_library_name}",
diff --git a/scripts/ci/sycl_x86_setup.py b/scripts/ci/sycl_x86_setup.py
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
diff --git a/test/main.cpp b/test/main.cpp
diff --git a/test/single_layer/test_batchnormalizationlayer.cpp b/test/single_layer/test_batchnormalizationlayer.cpp
diff --git a/test/single_layer/test_matmullayer.cpp b/test/single_layer/test_matmullayer.cpp
diff --git a/test/single_layer/test_tensor.cpp b/test/single_layer/test_tensor.cpp
diff --git a/test/single_layer/test_transposelayer.cpp b/test/single_layer/test_transposelayer.cpp
