Support simpleomp on Windows with MSVC

.github/workflows/windows.yml

@@ -119,6 +119,19 @@ jobs:
         Copy-Item -Path "$env:GITHUB_WORKSPACE\swiftshader-install\vulkan-1.dll" -Destination 'build-x64\tests'
         cd build-x64; ctest -C Release --output-on-failure -j 4
 
+    - name: x64-simpleomp
+      run: |
+          mkdir build-x64-simpleomp; cd build-x64-simpleomp
+          cmake -T ${{ matrix.toolset-version }},host=x64 -A x64 -Dprotobuf_DIR="$env:GITHUB_WORKSPACE\protobuf-install\cmake" -DNCNN_SHARED_LIB=OFF -DNCNN_VULKAN=ON -DNCNN_SIMPLEOMP=ON -DNCNN_BUILD_TESTS=ON ..
+          cmake --build . --config Release -j 4
+    - name: x64-simpleomp-test
+      if: matrix.vs-version != 'vs2015' && matrix.vs-version != 'vs2017'
+      run: |
+        echo "[Processor]`nThreadCount=1`n" > build-x64-simpleomp/tests/Release/SwiftShader.ini
+        Copy-Item -Path "$env:GITHUB_WORKSPACE\swiftshader-install\vulkan-1.dll" -Destination 'build-x64-simpleomp\tests'
+        cd build-x64-simpleomp; ctest -C Release --output-on-failure -j 4
+# Copy-Item -Path "build-x64-simpleomp\src\Release\ncnn.dll" -Destination 'build-x64-simpleomp\tests'
+
     - name: x64-sse2
       run: |
         mkdir build-x64-sse2; cd build-x64-sse2
@@ -144,3 +157,7 @@ jobs:
       run: |
         Copy-Item -Path "build-x86\src\Release\ncnn.dll" -Destination 'build-x86\tests'
         cd build-x86; ctest -C Release --output-on-failure -j 4
+
+
+
+

CMakeLists.txt

@@ -687,7 +687,7 @@ if(NCNN_VULKAN)
             endif()
         endif()
 
-        if (TARGET glslang AND TARGET SPIRV)
+        if(TARGET glslang AND TARGET SPIRV)
             get_property(glslang_location TARGET glslang PROPERTY LOCATION)
             get_property(SPIRV_location TARGET SPIRV PROPERTY LOCATION)
             message(STATUS "Found glslang: ${glslang_location} (found version \"${glslang_VERSION}\")")

src/CMakeLists.txt

@@ -10,8 +10,8 @@ function(ncnn_src_group ncnn_src_string folder)
     string(REGEX REPLACE "/" "\\\\" _target_folder "${folder}")
 
     foreach(_file IN LISTS ${_ncnn_src_list})
-        source_group ("${_target_folder}" FILES "${_file}")
-    endforeach ()
+        source_group("${_target_folder}" FILES "${_file}")
+    endforeach()
 endfunction()
 
 set(ncnn_SRCS
@@ -215,11 +215,11 @@ endif()
 
 target_include_directories(ncnn
     PUBLIC
-        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
-        $<INSTALL_INTERFACE:include/ncnn>
-        $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+    $<INSTALL_INTERFACE:include/ncnn>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
     PRIVATE
-        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/layer>)
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/layer>)
 
 if(NCNN_OPENMP)
     if(NOT NCNN_SIMPLEOMP)
@@ -237,6 +237,8 @@ if(NCNN_OPENMP)
         if(NCNN_SIMPLEOMP)
             if(IOS OR APPLE)
                 target_compile_options(ncnn PRIVATE -Xpreprocessor -fopenmp)
+            elseif(MSVC OR WIN32)
+                target_compile_options(ncnn PRIVATE /openmp)
             else()
                 target_compile_options(ncnn PRIVATE -fopenmp)
             endif()
@@ -262,7 +264,11 @@ if(NCNN_THREADS)
         target_link_libraries(ncnn PUBLIC Threads::Threads)
     endif()
     if(NCNN_SIMPLEOMP OR NCNN_SIMPLESTL)
-        target_link_libraries(ncnn PUBLIC pthread)
+        if(MSVC OR WIN32)
+            message(STATUS "Using Native WIN32 THREAD MODEL")
+        else()
+            target_link_libraries(ncnn PUBLIC pthread)
+        endif()
     endif()
 endif()
 
@@ -398,7 +404,7 @@ if(NCNN_TARGET_ARCH STREQUAL "x86")
         else()
             if(NOT CMAKE_SYSTEM_NAME MATCHES "WASI")
                 target_compile_options(ncnn PRIVATE -msse2 -msse)
-            endif ()
+            endif()
             if(CMAKE_SYSTEM_NAME MATCHES "Emscripten|WASI")
                 target_compile_options(ncnn PRIVATE -msimd128)
             endif()