Add clang on the CI for windows and linux + fix compilation

Author: pifopi

.github/workflows/cpp-ci-serial-programs.yml

@@ -10,11 +10,25 @@ jobs:
       fail-fast: false
       matrix:
         os: [windows-2025, macos-13, ubuntu-24.04]
+        compiler: ['default', 'clang']
         qt_version: ['6.9.1']
         include:
-        - qt_version: '6.9.1'
-          qt_version_major: '6'
-          qt_modules: 'qtmultimedia qtserialport'
+          - qt_version: '6.9.1'
+            qt_version_major: '6'
+            qt_modules: 'qtmultimedia qtserialport'
+
+          - os: 'windows-2025'
+            compiler: 'clang'
+            cmake_additional_param: '-T ClangCL'
+
+          - os: 'ubuntu-24.04'
+            compiler: 'clang'
+            cmake_additional_param: '-DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++'
+
+        exclude:
+          - os: 'macos-13'
+            compiler: 'clang'
+            # Excluded because macos default toolset is already clang
 
     steps:
     - uses: actions/checkout@v4
@@ -44,7 +58,7 @@ jobs:
         cd Arduino-Source/SerialPrograms
         mkdir bin
         cd bin
-        cmake .. -DQT_MAJOR:STRING=${{ matrix.qt_version_major }}
+        cmake .. -DQT_MAJOR:STRING=${{ matrix.qt_version_major }} ${{ matrix.cmake_additional_param }}
         cmake --build . --config Release --parallel 10
     - name: Copy resources
       if: startsWith(matrix.os, 'windows')

ClientSource/Connection/SerialConnectionWinAPI.h

@@ -44,7 +44,7 @@ class SerialConnection : public StreamConnection{
             throw ConnectionException(nullptr, "Unable to open serial connection (" + name + "). Error = " + std::to_string(error));
         }
 
-        DCB serial_params{0};
+        DCB serial_params{};
         serial_params.DCBlength = sizeof(serial_params);
 
         if (!GetCommState(m_handle, &serial_params)){
@@ -67,7 +67,7 @@ class SerialConnection : public StreamConnection{
         }
 
 #if 1
-        COMMTIMEOUTS timeouts{0};
+        COMMTIMEOUTS timeouts{};
         if (!GetCommTimeouts(m_handle, &timeouts)){
             DWORD error = GetLastError();
             CloseHandle(m_handle);

SerialPrograms/CMakeLists.txt

@@ -2418,7 +2418,7 @@ if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/../../Internal/SerialPrograms/Internal0.
 endif()
 
 #extract opencv_world4110d.dll from archive on Windows Debug builds
-if (MSVC)
+if (WIN32)
     file(ARCHIVE_EXTRACT
       INPUT ${CMAKE_CURRENT_SOURCE_DIR}/../3rdPartyBinaries/opencv_world4110d.zip
       DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/../3rdPartyBinaries/
@@ -2433,7 +2433,7 @@ target_link_directories(SerialPrograms PRIVATE ../3rdPartyBinaries/)
 
 
 
-if (MSVC)
+if (WIN32)
     add_library(OpenCV_lib IMPORTED UNKNOWN)
     target_include_directories(SerialPrograms SYSTEM PRIVATE ../3rdParty/opencv-4.11.0/)
     set_target_properties(OpenCV_lib PROPERTIES
@@ -2505,6 +2505,15 @@ if (MSVC)
     set(ARCH_FLAGS_17_Skylake       /arch:AVX512)
     set(ARCH_FLAGS_19_IceLake       /arch:AVX512)
 
+    if(CMAKE_GENERATOR_TOOLSET MATCHES "ClangCL")
+        target_compile_options(SerialPrograms PRIVATE -Wno-unused-function)
+        target_compile_options(SerialPrograms PRIVATE -march=nehalem)
+        set(ARCH_FLAGS_09_Nehalem       -march=nehalem)
+        set(ARCH_FLAGS_13_Haswell       -march=haswell)
+        set(ARCH_FLAGS_17_Skylake       -march=skylake-avx512)
+        set(ARCH_FLAGS_19_IceLake       -march=icelake-client)
+    endif()
+
     #   Run-time ISA dispatching
     target_compile_definitions(SerialPrograms PRIVATE PA_AutoDispatch_x64_08_Nehalem)
     target_compile_definitions(SerialPrograms PRIVATE PA_AutoDispatch_x64_13_Haswell)
@@ -2619,7 +2628,7 @@ else() # macOS and Linux
 
     else()
         # Intel CPU
-        target_compile_options(SerialPrograms PRIVATE -msse4.2)
+        target_compile_options(SerialPrograms PRIVATE -march=nehalem)
         set(ARCH_FLAGS_09_Nehalem       -march=nehalem)
         set(ARCH_FLAGS_13_Haswell       -march=haswell)
         set(ARCH_FLAGS_17_Skylake       -march=skylake-avx512)

SerialPrograms/Source/NintendoSwitch/DevPrograms/TestProgramSwitch.h

@@ -73,7 +73,6 @@ class TestProgram : public MultiSwitchProgramInstance, public ButtonListener{
     StringOption IMAGE_PATH;
 
     StaticTextOption STATIC_TEXT;
-    BoxFloatOption BOX;
 
 
 //    PokemonSV::SinglesAIOption battle_AI;

SerialPrograms/Source/PokemonLA/Inference/Map/PokemonLA_PokemonMapSpriteReader.cpp

@@ -86,18 +86,18 @@ FeatureType feature_distance(const FeatureVector& a, const FeatureVector& b){
     return sum;
 }
 
-std::string feature_to_str(const FeatureVector& a){
-    std::ostringstream os;
-    os << "[";
-    for(size_t i = 0; i < a.size(); i++){
-        if (i != 0){
-            os << ", ";
-        }
-        os << a[i];
-    }
-    os << "]";
-    return os.str();
-}
+//std::string feature_to_str(const FeatureVector& a){
+//    std::ostringstream os;
+//    os << "[";
+//    for(size_t i = 0; i < a.size(); i++){
+//        if (i != 0){
+//            os << ", ";
+//        }
+//        os << a[i];
+//    }
+//    os << "]";
+//    return os.str();
+//}
 
 void run_Sobel_gradient_filter(const ImageViewRGB32& image, std::function<void(size_t x, size_t y, int sum_x[3], int sum_y[3])> process_gradient){
     const size_t width = image.width();
@@ -275,47 +275,6 @@ ImageRGB32 compute_image_gradient(const ImageViewRGB32& image){
     return result;
 }
 
-FeatureVector compute_gradient_histogram(const ImageViewRGB32& image){
-    const int num_angle_divisions = 8;
-    double division_angle = 2. * M_PI / num_angle_divisions;
-    double inverse_division_angle = 1.0 / division_angle;
-
-    std::array<int, num_angle_divisions> bin = {0};
-
-    int num_grad = 0;
-
-    run_Sobel_gradient_filter(image, [&](size_t x, size_t y, int sum_x[3], int sum_y[3]){
-        int gx = sum_x[0] + sum_x[1] + sum_x[2];
-        int gy = sum_y[0] + sum_y[1] + sum_y[2];
-        if (gx*gx + gy*gy <= 2000){
-            return;
-        }
-        num_grad++;
-
-        // if (count == 0){
-        //     // cout << "gxy " << sum_x[0] << " " << sum_x[1] << " " << sum_x[2] << ", " <<
-        //     //  sum_y[0] << " " << sum_y[1] << " " << sum_y[2] << endl;
-        //     int gxc = std::min(std::abs(gx), 255);
-        //     int gyc = std::min(std::abs(gy), 255);
-
-        //     output_image->setPixelColor(x, y, QColor(gxc, gyc, 0));
-        // }
-
-        double angle = std::atan2(gy, gx); // range in -pi, pi
-        int bin_idx = int((angle + M_PI) * inverse_division_angle);
-        // clamp bin to [0, 11]
-        bin_idx = std::min(std::max(bin_idx, 0), num_angle_divisions-1);
-        bin[bin_idx]++;
-    });
-
-    FeatureVector result(num_angle_divisions);
-    for(size_t i = 0; i < num_angle_divisions; i++){
-        result[i] = bin[i] / (FeatureType)num_grad;
-    }
-
-    return result;
-}
-
 } // end anonymous namespace
 
 FeatureVector compute_feature(const ImageViewRGB32& input_image){

SerialPrograms/Source/PokemonSwSh/MaxLair/Options/PokemonSwSh_MaxLair_Options.h

@@ -27,6 +27,7 @@ extern const std::chrono::milliseconds INFERENCE_RATE;
 class HostingSwitch : public IntegerEnumDropdownOption{
 public:
     HostingSwitch();
+    using ConfigOption::check_validity;
     std::string check_validity(size_t consoles) const;
 };