fix more issues

Author: Acly

.github/workflows/ci.yml

@@ -26,11 +26,14 @@ jobs:
 
       - name: Configure and build
         run: |
-          cmake . -B build -G Ninja -D VISP_FMT_LIB=ON
-          cmake --build build --config Release
+          cmake . -B build -G Ninja \
+            -D CMAKE_BUILD_TYPE=Release \
+            -D VISP_CI=ON \
+            -D VISP_FMT_LIB=ON
+          cmake --build build
 
       - name: Run tests
-        run: ctest build -C Release
+        run: ctest build
 
   build-test-ubuntu-vulkan:
     name: Build & Test on Ubuntu 22.04 with Vulkan
@@ -51,11 +54,15 @@ jobs:
 
       - name: Configure and build with Vulkan
         run: |
-          cmake . -B build -G Ninja -D VISP_VULKAN=ON -D VISP_FMT_LIB=ON
-          cmake --build build --config Release
+          cmake . -B build -G Ninja \
+            -D CMAKE_BUILD_TYPE=Release \
+            -D VISP_CI=ON \
+            -D VISP_VULKAN=ON \
+            -D VISP_FMT_LIB=ON
+          cmake --build build
 
       - name: Run tests
-        run: ctest build -C Release
+        run: ctest build
 
   build-test-windows:
     name: Build & Test on Windows (CPU only)
@@ -72,11 +79,13 @@ jobs:
 
       - name: Configure and build
         run: |
-          cmake . -B build -G Ninja
-          cmake --build build --config Release
+          cmake . -B build -G Ninja \
+            -D CMAKE_BUILD_TYPE=Release \
+            -D VISP_CI=ON
+          cmake --build build
 
       - name: Run tests
-        run: ctest build -C Release
+        run: ctest build
 
   build-test-macos:
     name: Build & Test on macOS (CPU only)
@@ -93,8 +102,13 @@ jobs:
 
       - name: Configure and build
         run: |
-          cmake -G Ninja . -B build -D GGML_METAL=OFF -D GGML_RPC=ON -D CMAKE_BUILD_RPATH="@loader_path"
-          cmake --build build --config Release
+          cmake -G Ninja . -B build \
+            -D CMAKE_BUILD_TYPE=Release \
+            -D VISP_CI=ON \
+            -D GGML_METAL=OFF \
+            -D GGML_RPC=ON \
+            -D CMAKE_BUILD_RPATH="@loader_path"
+          cmake --build build
 
       - name: Run tests
-        run: ctest build -C Release
+        run: ctest build

CMakeLists.txt

@@ -18,6 +18,8 @@ endif()
 
 if(VISP_DEV)
   set(VISP_ASSERT "VISP_ASSERT_BREAK")
+elseif(VISP_CI)
+  set(VISP_ASSERT "VISP_ASSERT_THROW")
 elseif(CMAKE_BUILD_TYPE)
   if(${CMAKE_BUILD_TYPE} STREQUAL "Debug")
     set(VISP_ASSERT "VISP_ASSERT_BREAK")
@@ -63,11 +65,15 @@ endif()
 set(GGML_VULKAN ${VISP_VULKAN})
 set(GGML_LLAMAFILE ON)
 if(VISP_CI)
-  set(GGML_NATIVE OFF)
   set(GGML_BACKEND_DL ON)
-  foreach (feat SSE42 AVX AVX2 F16C BMI2 FMA) # ~haswell and newer
-    set(GGML_${feat} ON)
-  endforeach()
+  if (${CMAKE_SYSTEM_PROCESSOR} MATCHES "^(aarch64|arm.*|ARM64)$")
+    # set default for ARM
+  else()
+    set(GGML_NATIVE OFF)
+    foreach (feat SSE42 AVX AVX2 F16C BMI2 FMA) # ~haswell and newer
+      set(GGML_${feat} ON)
+    endforeach()
+  endif()
 endif()
 add_subdirectory(depend/ggml)
 

src/util/string.hpp

@@ -87,12 +87,14 @@ inline void assertion_failure(char const* file, int line, char const* expr) {
     auto msg = format<fixed_string<256>>("Assertion failed at {}:{}: {}\n", file, line, expr);
     fwrite(msg.data, 1, msg.length, stderr);
 
-#ifdef VISP_ASSERT_BREAK
+#if defined(VISP_ASSERT_BREAK)
 #    ifdef _MSC_VER
     __debugbreak();
 #    else
     __builtin_trap();
 #    endif
+#elif defined(VISP_ASSERT_THROW)
+    throw exception(msg.c_str());
 #else
     std::abort();
 #endif

tests/CMakeLists.txt

@@ -6,8 +6,8 @@ target_sources(test-vision PRIVATE
   test-image.cpp
 )
 target_include_directories(test-vision PRIVATE . ../src)
-target_compile_options(visioncpp PRIVATE ${VISP_WARNINGS})
-target_compile_definitions(visioncpp PRIVATE ${VISP_ASSERT} ${VISP_FMT_DEFS})
+target_compile_options(test-vision PRIVATE ${VISP_WARNINGS})
+target_compile_definitions(test-vision PRIVATE ${VISP_ASSERT} ${VISP_FMT_DEFS})
 target_link_libraries(test-vision PRIVATE visioncpp ${VISP_FMT_LINK})
 add_test(NAME vision COMMAND test-vision -v)
 
@@ -20,8 +20,8 @@ target_sources(test-models PRIVATE
   test-models.cpp
 )
 target_include_directories(test-models PRIVATE . ../src)
-target_compile_options(visioncpp PRIVATE ${VISP_WARNINGS})
-target_compile_definitions(visioncpp PRIVATE ${VISP_ASSERT} ${VISP_FMT_DEFS})
+target_compile_options(test-models PRIVATE ${VISP_WARNINGS})
+target_compile_definitions(test-models PRIVATE ${VISP_ASSERT} ${VISP_FMT_DEFS})
 target_link_libraries(test-models PRIVATE visioncpp ${VISP_FMT_LINK})
 if(VISP_VULKAN)
   add_test(NAME models COMMAND test-models -v)

tests/testing.cpp

@@ -52,11 +52,11 @@ int main(int argc, char** argv) {
 
             ++passed;
             if (verbose) {
-                printf(" \033[32mPASSED\033[0m\n", name);
+                printf(" %s\n", "\033[32mPASSED\033[0m");
             }
         } catch (const visp::test_failure& e) {
             ++failed;
-            printf(" \033[31mFAILED\033[0m\n", name);
+            printf(" %s\n", "\033[31mFAILED\033[0m");
             printf("  \033[90m%s:%d:\033[0m Assertion failed\n", e.file, e.line);
             printf("  \033[93m%s\033[0m\n", e.condition);
             if (e.eval) {
@@ -67,7 +67,7 @@ int main(int argc, char** argv) {
             }
         } catch (const std::exception& e) {
             ++errors;
-            printf(" \033[31mERROR\033[0m\n", name);
+            printf(" %s\n", "\033[31mERROR\033[0m");
             printf("  \033[90m%s:%d:\033[0m Unhandled exception\n", test.file, test.line);
             printf("  \033[93m%s\033[0m\n", e.what());
         }

tests/testing.hpp

@@ -73,8 +73,9 @@ template <typename T>
 bool test_is_equal(T const& a, T const& b) {
     if constexpr (std::is_floating_point_v<T>) {
         return std::abs(a - b) <= test_tolerance_value();
+    } else {
+        return a == b;
     }
-    return a == b;
 }
 
 template <typename LHS, typename RHS>