lagadic · fspindle · Jul 19, 2023 · Jul 13, 2023 · Jul 13, 2023 · Jul 15, 2023
diff --git a/.github/workflows/macos-ustk.yml b/.github/workflows/macos-ustk.yml
@@ -42,7 +42,7 @@ jobs:
       # https://remarkablemark.org/blog/2022/09/25/check-git-branch-exists-in-remote-repository/
       run: |
         git clone --depth 1 https://github.com/lagadic/visp-images ${HOME}/visp-images
-        echo "VISP_INPUT_IMAGE_PATH=$HOME" >> $GITHUB_ENV
+        echo "VISP_INPUT_IMAGE_PATH=$HOME/visp-images" >> $GITHUB_ENV
         echo ${VISP_INPUT_IMAGE_PATH}
 
     - name: Clone ustk-dataset

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -49,7 +49,7 @@ jobs:
       # https://remarkablemark.org/blog/2022/09/25/check-git-branch-exists-in-remote-repository/
       run: |
         git clone --depth 1 https://github.com/lagadic/visp-images ${HOME}/visp-images
-        echo "VISP_INPUT_IMAGE_PATH=$HOME" >> $GITHUB_ENV
+        echo "VISP_INPUT_IMAGE_PATH=$HOME/visp-images" >> $GITHUB_ENV
         echo ${VISP_INPUT_IMAGE_PATH}
 
     - name: Clone visp_sample
@@ -76,7 +76,7 @@ jobs:
 
     - name: Run unit tests
       working-directory: build
-      run: ctest -j$(sysctl -n hw.logicalcpu) --output-on-failure
+      run: ctest -j$(sysctl -n hw.logicalcpu) --output-on-failure -V
 
     - name: ViSP as 3rdparty with cmake
       run: |

diff --git a/.github/workflows/other-arch.yml b/.github/workflows/other-arch.yml
@@ -64,7 +64,7 @@ jobs:
           apt-get update && apt-get install -y libssl-dev libusb-1.0-0-dev pkg-config libgtk-3-dev libglfw3-dev libgl1-mesa-dev libglu1-mesa-dev
 
           git clone --depth 1 https://github.com/lagadic/visp-images ${HOME}/visp-images
-          export VISP_INPUT_IMAGE_PATH=$HOME
+          export VISP_INPUT_IMAGE_PATH=$HOME/visp-images
           echo ${VISP_INPUT_IMAGE_PATH}
 
           pwd

diff --git a/.github/workflows/ubuntu-dep-apt.yml b/.github/workflows/ubuntu-dep-apt.yml
@@ -50,7 +50,7 @@ jobs:
       # https://remarkablemark.org/blog/2022/09/25/check-git-branch-exists-in-remote-repository/
       run: |
         git clone --depth 1 https://github.com/lagadic/visp-images ${HOME}/visp-images
-        echo "VISP_INPUT_IMAGE_PATH=$HOME" >> $GITHUB_ENV
+        echo "VISP_INPUT_IMAGE_PATH=$HOME/visp-images" >> $GITHUB_ENV
         echo ${VISP_INPUT_IMAGE_PATH}
 
     - name: Clone visp_sample

diff --git a/.github/workflows/ubuntu-dep-src.yml b/.github/workflows/ubuntu-dep-src.yml
@@ -118,7 +118,7 @@ jobs:
       # https://remarkablemark.org/blog/2022/09/25/check-git-branch-exists-in-remote-repository/
       run: |
         git clone --depth 1 https://github.com/lagadic/visp-images ${HOME}/visp-images
-        echo "VISP_INPUT_IMAGE_PATH=$HOME" >> $GITHUB_ENV
+        echo "VISP_INPUT_IMAGE_PATH=$HOME/visp-images" >> $GITHUB_ENV
         echo ${VISP_INPUT_IMAGE_PATH}
 
     - name: Configure CMake

diff --git a/.github/workflows/ubuntu-sanitizers.yml b/.github/workflows/ubuntu-sanitizers.yml
@@ -47,7 +47,7 @@ jobs:
       # https://remarkablemark.org/blog/2022/09/25/check-git-branch-exists-in-remote-repository/
       run: |
         git clone --depth 1 https://github.com/lagadic/visp-images ${HOME}/visp-images
-        echo "VISP_INPUT_IMAGE_PATH=$HOME" >> $GITHUB_ENV
+        echo "VISP_INPUT_IMAGE_PATH=$HOME/visp-images" >> $GITHUB_ENV
         echo ${VISP_INPUT_IMAGE_PATH}
 
     - name: Configure CMake

diff --git a/.github/workflows/ubuntu-ustk.yml b/.github/workflows/ubuntu-ustk.yml
@@ -48,7 +48,7 @@ jobs:
       # https://remarkablemark.org/blog/2022/09/25/check-git-branch-exists-in-remote-repository/
       run: |
         git clone --depth 1 https://github.com/lagadic/visp-images ${HOME}/visp-images
-        echo "VISP_INPUT_IMAGE_PATH=$HOME" >> $GITHUB_ENV
+        echo "VISP_INPUT_IMAGE_PATH=$HOME/visp-images" >> $GITHUB_ENV
         echo ${VISP_INPUT_IMAGE_PATH}
 
     - name: Clone ustk-dataset

diff --git a/.github/workflows/valgrind.yml b/.github/workflows/valgrind.yml
@@ -36,7 +36,7 @@ jobs:
       # https://remarkablemark.org/blog/2022/09/25/check-git-branch-exists-in-remote-repository/
       run: |
         git clone --depth 1 https://github.com/lagadic/visp-images ${HOME}/visp-images
-        echo "VISP_INPUT_IMAGE_PATH=$HOME" >> $GITHUB_ENV
+        echo "VISP_INPUT_IMAGE_PATH=$HOME/visp-images" >> $GITHUB_ENV
         echo ${VISP_INPUT_IMAGE_PATH}
 
     - name: Configure CMake

diff --git a/.github/workflows/windows-clang.yaml b/.github/workflows/windows-clang.yaml
@@ -0,0 +1,82 @@
+name: Windows - clang
+on:
+  pull_request:
+  push:
+
+jobs:
+  build:
+    runs-on: ${{ matrix.os }}
+    defaults:
+      run:
+        shell: cmd
+    strategy:
+      fail-fast: false
+      matrix:
+        name: [windows-latest-clang]
+
+        include:
+          - name: windows-latest-clang
+            os: windows-2022
+            compiler: clang-cl
+
+    steps:
+    # https://github.com/marketplace/actions/cancel-workflow-action
+    - name: Cancel Previous Runs
+      uses: styfle/cancel-workflow-action@0.9.1
+      with:
+        access_token: ${{ github.token }}
+
+    - name: Checkout repository
+      uses: actions/checkout@v3
+
+    - name: Display the workspace path
+      working-directory: ${{ github.workspace }}
+      run: pwd
+
+    - name: Clone visp-images
+      shell: bash
+      # https://remarkablemark.org/blog/2022/09/25/check-git-branch-exists-in-remote-repository/
+      run: |
+        git clone --depth 1 https://github.com/lagadic/visp-images ${HOME}/visp-images
+        echo "VISP_INPUT_IMAGE_PATH=$HOME/visp-images" >> $GITHUB_ENV
+        echo "VISP_INPUT_IMAGE_PATH: ${{ env.VISP_INPUT_IMAGE_PATH }}"
+
+    - name: Configure ViSP
+      working-directory: ${{ github.workspace }}
+      run: |
+        set VISP_INPUT_IMAGE_PATH=${{ env.VISP_INPUT_IMAGE_PATH }}
+        echo "VISP_INPUT_IMAGE_PATH: "
+        echo %VISP_INPUT_IMAGE_PATH%
+        mkdir build
+        cd build
+        cmake .. -G "Visual Studio 17 2022" -T "ClangCl" -A "x64"
+        type ViSP-third-party.txt
+
+    - name: Build ViSP
+      working-directory: build
+      run: |
+        cmake --build . --config Release
+
+    - name: Install ViSP
+      working-directory: build
+      run: |
+        cmake --build . --config Release --target install
+
+    - name: Check installation folder
+      working-directory: build
+      run: |
+        dir ${{ github.workspace }}\build\install\
+        dir ${{ github.workspace }}\build\install\x64\
+        dir ${{ github.workspace }}\build\install\x64\vc17\
+        dir ${{ github.workspace }}\build\install\x64\vc17\bin
+
+    - name: Test ViSP
+      working-directory: build
+      run: |
+        set VISP_INPUT_IMAGE_PATH=${{ env.VISP_INPUT_IMAGE_PATH }}
+        echo "VISP_INPUT_IMAGE_PATH: "
+        echo %VISP_INPUT_IMAGE_PATH%
+        set PATH=%PATH%;${{ github.workspace }}\build\install\x64\vc17\bin
+        echo "PATH: "
+        echo %PATH%
+        ctest --output-on-failure -C Release -V
diff --git a/.github/workflows/windows.yaml → .github/workflows/windows-msvc.yaml b/.github/workflows/windows.yaml → .github/workflows/windows-msvc.yaml
@@ -37,14 +37,17 @@ jobs:
       # https://remarkablemark.org/blog/2022/09/25/check-git-branch-exists-in-remote-repository/
       run: |
         git clone --depth 1 https://github.com/lagadic/visp-images ${HOME}/visp-images
-        echo "VISP_INPUT_IMAGE_PATH=$HOME" >> $GITHUB_ENV
+        echo "VISP_INPUT_IMAGE_PATH=$HOME/visp-images" >> $GITHUB_ENV
 
     - name: Configure ViSP
       working-directory: ${{ github.workspace }}
       run: |
+        set VISP_INPUT_IMAGE_PATH=${{ env.VISP_INPUT_IMAGE_PATH }}
+        echo "VISP_INPUT_IMAGE_PATH: "
+        echo %VISP_INPUT_IMAGE_PATH%
         mkdir build
         cd build
-        cmake .. -G "Visual Studio 16 2019" -A "x64" -DCMAKE_GENERATOR_PLATFORM=x64
+        cmake .. -G "Visual Studio 16 2019" -A "x64"
         type ViSP-third-party.txt
 
     - name: Build ViSP
@@ -65,7 +68,9 @@ jobs:
     - name: Test ViSP
       working-directory: build
       run: |
-        echo "VISP_INPUT_IMAGE_PATH: ${{ env.VISP_INPUT_IMAGE_PATH }}"
+        set VISP_INPUT_IMAGE_PATH=${{ env.VISP_INPUT_IMAGE_PATH }}
+        echo "VISP_INPUT_IMAGE_PATH: "
+        echo %VISP_INPUT_IMAGE_PATH%
         set PATH=%PATH%;${{ github.workspace }}\build\install\x64\vc16\bin
         echo "PATH: "
         echo %PATH%

diff --git a/3rdparty/clapack/CMakeLists.txt b/3rdparty/clapack/CMakeLists.txt
@@ -37,7 +37,7 @@ if(NOT BUILD_SHARED_LIBS)
   vp_install_target(${LAPACK_LIBRARY} EXPORT VISPModules ARCHIVE DESTINATION ${VISP_3P_LIB_INSTALL_PATH} COMPONENT dev)
 endif()
 
-if(MSVC)
+if(MSVC AND NOT ((CMAKE_CXX_COMPILER MATCHES "clang") OR (CMAKE_CXX_COMPILER_ID MATCHES "Clang")))
   # Disable Visual C++ warnings
   foreach(f ${lib_srcs})
     vp_set_source_file_compile_flag(${f} /wd4244 /wd4267 /wd4273 /wd4554 /wd4723 /wd4996)

diff --git a/3rdparty/simdlib/CMakeLists.txt b/3rdparty/simdlib/CMakeLists.txt
@@ -25,7 +25,7 @@ if(X86 OR X86_64)
     set(AVX_FLAG    "")
     set(AVX2_FLAG   "")
 
-    if(MSVC)
+    if(MSVC AND NOT ((CMAKE_CXX_COMPILER MATCHES "clang") OR (CMAKE_CXX_COMPILER_ID MATCHES "Clang")))
         if(NOT MSVC64)
             vp_check_compiler_flag(CXX "/arch:SSE2"   HAVE_SSE2_FLAG    "${VISP_SOURCE_DIR}/cmake/checks/cpu_sse2.cpp")
         endif()
@@ -136,6 +136,11 @@ if(X86 OR X86_64)
         if(HAVE_NO_MISSING_FIELD_FLAG)
             set(COMMON_CXX_FLAGS "${COMMON_CXX_FLAGS} -Wno-missing-field-initializers")
         endif()
+
+        if(MSVC AND ((CMAKE_CXX_COMPILER MATCHES "clang") OR (CMAKE_CXX_COMPILER_ID MATCHES "Clang")))
+            # Clang under windows needs AVX flags
+            set(COMMON_CXX_FLAGS "${COMMON_CXX_FLAGS} ${AVX_FLAG} ${AVX2_FLAG}")
+        endif()
     endif()
 
     file(GLOB_RECURSE SIMD_BASE_SRC ${CMAKE_CURRENT_SOURCE_DIR}/Simd/SimdBase*.cpp)
@@ -148,22 +153,10 @@ if(X86 OR X86_64)
     set_source_files_properties(${SIMD_SSE41_SRC} PROPERTIES COMPILE_FLAGS "${COMMON_CXX_FLAGS} ${SSE4_2_FLAG}")
 
     file(GLOB_RECURSE SIMD_AVX1_SRC ${CMAKE_CURRENT_SOURCE_DIR}/Simd/SimdAvx1*.cpp)
-    if(MSVC)
-        set_source_files_properties(${SIMD_AVX1_SRC} PROPERTIES COMPILE_FLAGS "${COMMON_CXX_FLAGS} ${AVX_FLAG}")
-    elseif((CMAKE_CXX_COMPILER MATCHES "clang") OR (CMAKE_CXX_COMPILER_ID MATCHES "Clang"))
-        set_source_files_properties(${SIMD_AVX1_SRC} PROPERTIES COMPILE_FLAGS "${COMMON_CXX_FLAGS} ${AVX_FLAG}")
-    else()
-        set_source_files_properties(${SIMD_AVX1_SRC} PROPERTIES COMPILE_FLAGS "${COMMON_CXX_FLAGS} ${AVX_FLAG}")
-    endif()
+    set_source_files_properties(${SIMD_AVX1_SRC} PROPERTIES COMPILE_FLAGS "${COMMON_CXX_FLAGS} ${AVX_FLAG}")
 
     file(GLOB_RECURSE SIMD_AVX2_SRC ${CMAKE_CURRENT_SOURCE_DIR}/Simd/SimdAvx2*.cpp)
-    if(MSVC)
-        set_source_files_properties(${SIMD_AVX2_SRC} PROPERTIES COMPILE_FLAGS "${COMMON_CXX_FLAGS} ${AVX2_FLAG}")
-    elseif((CMAKE_CXX_COMPILER MATCHES "clang") OR (CMAKE_CXX_COMPILER_ID MATCHES "Clang"))
-        set_source_files_properties(${SIMD_AVX2_SRC} PROPERTIES COMPILE_FLAGS "${COMMON_CXX_FLAGS} ${AVX2_FLAG}")
-    else()
-        set_source_files_properties(${SIMD_AVX2_SRC} PROPERTIES COMPILE_FLAGS "${COMMON_CXX_FLAGS} ${AVX2_FLAG}")
-    endif()
+    set_source_files_properties(${SIMD_AVX2_SRC} PROPERTIES COMPILE_FLAGS "${COMMON_CXX_FLAGS} ${AVX2_FLAG}")
 
     set(SIMD_LIB_FLAGS "${COMMON_CXX_FLAGS} ${AVX2_FLAG}")
     set(SIMD_ALG_SRC ${SIMD_BASE_SRC} ${SIMD_SSE2_SRC} ${SIMD_SSE41_SRC} ${SIMD_AVX1_SRC} ${SIMD_AVX2_SRC})

diff --git a/cmake/AddExtraCompilationFlags.cmake b/cmake/AddExtraCompilationFlags.cmake
@@ -42,14 +42,14 @@ macro(add_extra_compiler_option option)
   if(CMAKE_BUILD_TYPE)
     set(CMAKE_TRY_COMPILE_CONFIGURATION ${CMAKE_BUILD_TYPE})
   endif()
-  vp_check_flag_support(CXX "${option}" _varname "")
+  vp_check_flag_support(CXX "${option}" _varname "${VISP_EXTRA_CXX_FLAGS} ${ARGN}")
   if(_varname)
-    list(APPEND VISP_EXTRA_CXX_FLAGS ${option})
+    set(VISP_EXTRA_CXX_FLAGS "${VISP_EXTRA_CXX_FLAGS} ${option}")
   endif()
 
-  vp_check_flag_support(C "${option}" _varname "")
+  vp_check_flag_support(C "${option}" _varname "${VISP_EXTRA_C_FLAGS} ${ARGN}")
   if(_varname)
-    list(APPEND VISP_EXTRA_C_FLAGS ${option})
+    set(VISP_EXTRA_C_FLAGS "${VISP_EXTRA_C_FLAGS} ${option}")
   endif()
 endmacro()
 
@@ -126,7 +126,9 @@ if(BUILD_COVERAGE)
 endif()
 
 if(CMAKE_COMPILER_IS_GNUCXX)
-  add_extra_compiler_option(-fvisibility=hidden)
+  #if(NOT (WIN32 AND ((CMAKE_CXX_COMPILER MATCHES "clang") OR (CMAKE_CXX_COMPILER_ID MATCHES "Clang"))))
+    add_extra_compiler_option(-fvisibility=hidden)
+  #endif()
 
   if(ENABLE_AVX AND X86_64)
     add_extra_compiler_option(-mavx)
@@ -178,6 +180,59 @@ if(MSVC)
     # Avoid build error C1128
     list(APPEND VISP_EXTRA_CXX_FLAGS "/bigobj")
   endif()
+  #if((CMAKE_CXX_COMPILER MATCHES "clang") OR (CMAKE_CXX_COMPILER_ID MATCHES "Clang"))
+  #  add_extra_compiler_option("-Wno-c++98-compat")                  # turn off warning due to json
+  #  add_extra_compiler_option("-Wno-c++98-compat-pedantic")
+  #  add_extra_compiler_option("-Wno-c11-extensions")
+  #  add_extra_compiler_option("-Wno-covered-switch-default")
+  #  add_extra_compiler_option("-Wno-unused-template")               # turn off warning due to eigen
+  #  add_extra_compiler_option("-Wno-deprecated-copy-with-dtor")
+  #  add_extra_compiler_option("-Wno-anon-enum-enum-conversion")     # turn off warning due to opencv
+  #  add_extra_compiler_option("-Wno-cast-align")
+  #  add_extra_compiler_option("-Wno-cast-qual")
+  #  add_extra_compiler_option("-Wno-covered-switch-default")
+  #  add_extra_compiler_option("-Wno-deprecated-copy-with-user-provided-dtor")
+  #  add_extra_compiler_option("-Wno-documentation")
+  #  add_extra_compiler_option("-Wno-documentation-deprecated-sync")
+  #  add_extra_compiler_option("-Wno-documentation-unknown-command")
+  #  add_extra_compiler_option("-Wno-double-promotion")
+  #  add_extra_compiler_option("-Wno-enum-enum-conversion")
+  #  add_extra_compiler_option("-Wno-exit-time-destructors")
+  #  add_extra_compiler_option("-Wno-extra-semi")
+  #  add_extra_compiler_option("-Wno-extra-semi-stmt")
+  #  add_extra_compiler_option("-Wno-float-equal")
+  #  add_extra_compiler_option("-Wno-implicit-int-float-conversion")
+  #  add_extra_compiler_option("-Wno-implicit-float-conversion")
+  #  add_extra_compiler_option("-Wno-inconsistent-missing-destructor-override")
+  #  add_extra_compiler_option("-Wno-language-extension-token")
+  #  add_extra_compiler_option("-Wno-microsoft-enum-value")
+  #  add_extra_compiler_option("-Wno-newline-eof")
+  #  add_extra_compiler_option("-Wno-old-style-cast")
+  #  add_extra_compiler_option("-Wno-reserved-identifier")
+  #  add_extra_compiler_option("-Wno-shift-sign-overflow")
+  #  add_extra_compiler_option("-Wno-sign-conversion")
+  #  add_extra_compiler_option("-Wno-undefined-reinterpret-cast")
+  #  add_extra_compiler_option("-Wno-zero-as-null-pointer-constant")
+  #  add_extra_compiler_option("-Wno-cast-function-type")                # ViSP
+  #  add_extra_compiler_option("-Wno-comma")
+  #  add_extra_compiler_option("-Wno-deprecated-copy-dtor")
+  #  add_extra_compiler_option("-Wno-deprecated-dynamic-exception-spec")
+  #  add_extra_compiler_option("-Wno-format-nonliteral")
+  #  add_extra_compiler_option("-Wno-global-constructors")
+  #  add_extra_compiler_option("-Wno-implicit-int-conversion")
+  #  add_extra_compiler_option("-Wno-implicit-fallthrough")
+  #  add_extra_compiler_option("-Wno-missing-noreturn")
+  #  add_extra_compiler_option("-Wno-missing-variable-declarations")
+  #  add_extra_compiler_option("-Wno-missing-prototypes")
+  #  add_extra_compiler_option("-Wno-nonportable-system-include-path")
+  #  add_extra_compiler_option("-Wno-shadow")
+  #  add_extra_compiler_option("-Wno-suggest-destructor-override")
+  #  add_extra_compiler_option("-Wno-suggest-override")
+  #  add_extra_compiler_option("-Wno-switch-enum")
+  #  add_extra_compiler_option("-Wno-unreachable-code")
+  #  add_extra_compiler_option("-Wno-unused-macros")
+  #  add_extra_compiler_option("-Wno-unused-member-function")
+  #endif()
 endif()
 
 # adjust -Wl,-rpath-link