Merge pull request oneapi-src#1378 from lukaszstolarczuk/enable-win-cmake-3.14

KFilipek · web-flow · commit 1ae1fe6024a1 · 2025-06-18T15:38:36.000+02:00
[CI] Workflows updates
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -333,6 +333,56 @@ jobs:
       working-directory: ${{env.BUILD_DIR}}
       run: ctest -C ${{matrix.build_type}} --output-on-failure --test-dir test
 
+  Windows-dynamic_mingw_hwloc:
+    env:
+      HWLOC_PACKAGE_NAME: hwloc-win64-build-2.10.0
+      TBB_PACKAGE_NAME: oneapi-tbb-2021.12.0
+      TBB_LIB_DIR: lib\intel64\vc14
+      TBB_BIN_DIR: redist\intel64\vc14
+
+    name: "Windows dynamic UMF + mingw libhwloc"
+    strategy:
+      matrix:
+        build_type: [Release]
+
+    runs-on: 'windows-latest'
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      with:
+        fetch-depth: 0
+
+    - name: Get hwloc from official repo (mingw version)
+      run: |
+        Invoke-WebRequest -Uri https://download.open-mpi.org/release/hwloc/v2.10/${{env.HWLOC_PACKAGE_NAME}}.zip -OutFile ${{github.workspace}}\${{env.HWLOC_PACKAGE_NAME}}.zip -TimeoutSec 360
+        Expand-Archive ${{github.workspace}}\${{env.HWLOC_PACKAGE_NAME}}.zip -DestinationPath ${{github.workspace}}
+
+    - name: Get TBB from github
+      run: |
+        Invoke-WebRequest -Uri https://github.com/oneapi-src/oneTBB/releases/download/v2021.12.0/${{env.TBB_PACKAGE_NAME}}-win.zip -OutFile "${{github.workspace}}\${{env.TBB_PACKAGE_NAME}}-win.zip" -TimeoutSec 360
+        Expand-Archive "${{github.workspace}}\${{env.TBB_PACKAGE_NAME}}-win.zip" -DestinationPath ${{github.workspace}}
+
+    - name: Configure build
+      run: >
+        cmake
+        -B ${{env.BUILD_DIR}}
+        -DCMAKE_INSTALL_PREFIX="${{env.INSTL_DIR}}"
+        -DCMAKE_PREFIX_PATH="${{github.workspace}}\${{env.HWLOC_PACKAGE_NAME}};${{github.workspace}}\${{env.TBB_PACKAGE_NAME}};${{github.workspace}}\${{env.TBB_PACKAGE_NAME}}\${{env.TBB_LIB_DIR}};${{github.workspace}}\${{env.TBB_PACKAGE_NAME}}\${{env.TBB_BIN_DIR}}"
+        -DUMF_BUILD_SHARED_LIBRARY=ON
+        -DUMF_BUILD_EXAMPLES=ON
+        -DUMF_FORMAT_CODE_STYLE=OFF
+        -DUMF_DEVELOPER_MODE=ON
+        -DUMF_TESTS_FAIL_ON_SKIP=ON
+        -DUMF_HWLOC_NAME=libhwloc
+
+    - name: Build UMF
+      run: cmake --build ${{env.BUILD_DIR}} --config ${{matrix.build_type}} -j $Env:NUMBER_OF_PROCESSORS
+
+    - name: Run tests
+      working-directory: ${{env.BUILD_DIR}}
+      run: ctest -C ${{matrix.build_type}} --output-on-failure --test-dir test
+
   L0:
     uses: ./.github/workflows/reusable_gpu.yml
     with:
diff --git a/.github/workflows/reusable_basic.yml b/.github/workflows/reusable_basic.yml
@@ -235,44 +235,41 @@ jobs:
       VCPKG_PATH: "${{github.workspace}}/build/vcpkg/packages/hwloc_x64-windows;${{github.workspace}}/build/vcpkg/packages/tbb_x64-windows;${{github.workspace}}/build/vcpkg/packages/jemalloc_x64-windows"
       VCPKG_PATH_BIN: "${{github.workspace}}/build/vcpkg/packages/hwloc_x64-windows/bin;${{github.workspace}}/build/vcpkg/packages/tbb_x64-windows/bin;${{github.workspace}}/build/vcpkg/packages/jemalloc_x64-windows/bin"
     strategy:
-      # TODO: add '3.14.0-win64-x64' CMake testing
       matrix:
         os: ['windows-2022', 'windows-2025']
         build_type: [Debug, Release]
         compiler: [{c: cl, cxx: cl}]
         shared_library: ['ON', 'OFF']
         level_zero_provider: ['ON']
         cuda_provider: ['ON']
-        cmake_ver: ['default']
         include:
-          # clang-cl works well with Ninja, Debug build
-          # For VS generator it produces build errors not related to UMF
+          # extra job: Custom (old) CMake, clang-cl compiler
+          # Note: This CMake uses NMake generator as VS paths are probably messed up (by CMake?)
           - os: 'windows-2025'
-            build_type: Debug
+            build_type: Release
+            extra_build_options: '-DCMAKE_BUILD_TYPE=Release' # NMake generator requires this
             compiler: {c: clang-cl, cxx: clang-cl}
-            extra_build_options: '-G Ninja'
             shared_library: 'ON'
             level_zero_provider: 'ON'
             cuda_provider: 'ON'
-            cmake_ver: 'default'
-          # Custom CMake and umfd enabled
+            cmake_ver: '3.14.0-win64-x64'
+          # extra job: Custom CMake, L0/CUDA providers disabled
           - os: 'windows-2025'
             build_type: Release
             compiler: {c: cl, cxx: cl}
             shared_library: 'ON'
-            level_zero_provider: 'ON'
-            cuda_provider: 'ON'
-            umfd_lib: 'ON'
+            level_zero_provider: 'OFF'
+            cuda_provider: 'OFF'
             cmake_ver: '3.28.0-windows-x86_64'
-          # L0/CUDA providers disabled
-          - os: 'windows-2025'
+          # umfd enabled (this job will replace one from matrix)
+          - os: 'windows-2022'
             build_type: Release
             compiler: {c: cl, cxx: cl}
             shared_library: 'ON'
-            level_zero_provider: 'OFF'
-            cuda_provider: 'OFF'
-            cmake_ver: 'default'
-    name: Basic (${{matrix.os}}, build_type=${{matrix.build_type}}, compilers=${{matrix.compiler.c}}/${{matrix.compiler.cxx}}, shared_library=${{matrix.shared_library}}, level_zero_provider=${{matrix.level_zero_provider}}, cuda_provider=${{matrix.cuda_provider}}, cmake_ver=${{matrix.cmake_ver}})
+            level_zero_provider: 'ON'
+            cuda_provider: 'ON'
+            umfd_lib: 'ON'
+    name: Basic (${{matrix.os}}, build_type=${{matrix.build_type}}, compilers=${{matrix.compiler.c}}/${{matrix.compiler.cxx}}, shared_library=${{matrix.shared_library}}, level_zero_provider=${{matrix.level_zero_provider}}, cuda_provider=${{matrix.cuda_provider}}, cmake_ver=${{matrix.cmake_ver || 'default'}}, umfd=${{matrix.umfd_lib || 'OFF'}})
     runs-on: ${{matrix.os}}
 
     steps:
@@ -282,7 +279,7 @@ jobs:
         fetch-depth: 0
 
     - name: Install cmake (non-default version)
-      if: matrix.cmake_ver != 'default'
+      if: ${{ matrix.cmake_ver != 'default' && matrix.cmake_ver != '' }}
       run: |
         $ErrorActionPreference = "Stop"
         $cmakePath = "C:\Program Files\CMake"
@@ -300,6 +297,13 @@ jobs:
         Start-Process msiexec.exe -ArgumentList "/i $cmakeInstaller /quiet /norestart" -Wait
         cmake --version
 
+    # Ensure that the required environment is set
+    # Note: While this step is required for the clang-cl compiler, it can be executed for all jobs
+    - name: Setup MSVC dev command prompt
+      uses: TheMrMilchmann/setup-msvc-dev@fb19abb8a41b3cf0340f5d1be17d420309232be6 # v3.0.1
+      with:
+        arch: x64
+
     - name: Initialize vcpkg
       uses: lukka/run-vcpkg@5e0cab206a5ea620130caf672fce3e4a6b5666a1 # v11.5
       with:
@@ -338,22 +342,24 @@ jobs:
         -DUMF_BUILD_LEVEL_ZERO_PROVIDER=${{matrix.level_zero_provider}}
         -DUMF_BUILD_CUDA_PROVIDER=${{matrix.cuda_provider}}
         -DUMF_TESTS_FAIL_ON_SKIP=ON
-        -DUMF_USE_DEBUG_POSTFIX=${{matrix.umfd_lib}}
+        -DUMF_USE_DEBUG_POSTFIX=${{matrix.umfd_lib || 'OFF'}}
 
     - name: Build UMF
       run: cmake --build ${{env.BUILD_DIR}} --config ${{matrix.build_type}} -j $Env:NUMBER_OF_PROCESSORS
 
     - name: Run tests
       working-directory: ${{env.BUILD_DIR}}
-      # For CMake versions < 3.22 we have to add the build directory to the PATH
-      # manually
+      # For CMake versions < 3.22 we have to add the build directory to the PATH manually
+      # Extra paths without 'build_type' are set for NMake generator
       run: |
         $m = [regex]::Matches((cmake --version), "cmake version (\d+)\.(\d+)\.(\d+)")
         if ($m) {
           $major = [int]$m.groups[1].Value
           $minor = [int]$m.groups[2].Value
           if ($major -lt 3 -or ($major -eq 3 -and $minor -lt 22)) {
             $env:Path = "${{env.BUILD_DIR}}/bin/${{matrix.build_type}};${{env.BUILD_DIR}}/src/proxy_lib/${{matrix.build_type}};$env:Path"
+            $env:Path = "${{env.BUILD_DIR}}/bin/;${{env.BUILD_DIR}}/src/proxy_lib/;$env:Path"
+            echo "PATH=$env:Path" >> $env:GITHUB_ENV
           }
         }
         ctest -C ${{matrix.build_type}} --output-on-failure --test-dir test
@@ -369,7 +375,7 @@ jobs:
         --umf-version ${{env.UMF_VERSION}}
         ${{ matrix.shared_library == 'ON' && '--shared-library' || ''}}
         ${{ matrix.umfd_lib == 'ON' && '--umfd-lib' || ''}}
-        
+
     - name: check /DEPENDENTLOADFLAG in umf.dll
       if: ${{matrix.shared_library == 'ON' && matrix.compiler.cxx == 'cl'}}
       run: ${{github.workspace}}/.github/scripts/check_dll_flags.ps1 ${{env.BUILD_DIR}}/bin/${{matrix.build_type}}/umf.dll
@@ -458,61 +464,12 @@ jobs:
       working-directory: ${{env.BUILD_DIR}}
       run: ctest -C ${{matrix.build_type}} --output-on-failure --test-dir test
 
-  windows-dynamic_mingw_hwloc:
-    env:
-      HWLOC_PACKAGE_NAME: hwloc-win64-build-2.10.0
-      TBB_PACKAGE_NAME: oneapi-tbb-2021.12.0
-      TBB_LIB_DIR: lib\intel64\vc14
-      TBB_BIN_DIR: redist\intel64\vc14
-
-    name: "Windows dynamic UMF + mingw libhwloc"
-    strategy:
-      matrix:
-        build_type: [Release]
-
-    runs-on: 'windows-latest'
-
-    steps:
-    - name: Checkout
-      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-      with:
-        fetch-depth: 0
-
-    - name: Get hwloc from official repo (mingw version)
-      run: |
-        Invoke-WebRequest -Uri https://download.open-mpi.org/release/hwloc/v2.10/${{env.HWLOC_PACKAGE_NAME}}.zip -OutFile ${{github.workspace}}\${{env.HWLOC_PACKAGE_NAME}}.zip -TimeoutSec 360
-        Expand-Archive ${{github.workspace}}\${{env.HWLOC_PACKAGE_NAME}}.zip -DestinationPath ${{github.workspace}}
-
-    - name: Get TBB from github
-      run: |
-        Invoke-WebRequest -Uri https://github.com/oneapi-src/oneTBB/releases/download/v2021.12.0/${{env.TBB_PACKAGE_NAME}}-win.zip -OutFile "${{github.workspace}}\${{env.TBB_PACKAGE_NAME}}-win.zip" -TimeoutSec 360
-        Expand-Archive "${{github.workspace}}\${{env.TBB_PACKAGE_NAME}}-win.zip" -DestinationPath ${{github.workspace}}
-
-    - name: Configure build
-      run: >
-        cmake
-        -B ${{env.BUILD_DIR}}
-        -DCMAKE_INSTALL_PREFIX="${{env.INSTL_DIR}}"
-        -DCMAKE_PREFIX_PATH="${{github.workspace}}\${{env.HWLOC_PACKAGE_NAME}};${{github.workspace}}\${{env.TBB_PACKAGE_NAME}};${{github.workspace}}\${{env.TBB_PACKAGE_NAME}}\${{env.TBB_LIB_DIR}};${{github.workspace}}\${{env.TBB_PACKAGE_NAME}}\${{env.TBB_BIN_DIR}}"
-        -DUMF_BUILD_SHARED_LIBRARY=ON
-        -DUMF_BUILD_EXAMPLES=ON
-        -DUMF_FORMAT_CODE_STYLE=OFF
-        -DUMF_DEVELOPER_MODE=ON
-        -DUMF_TESTS_FAIL_ON_SKIP=ON
-        -DUMF_HWLOC_NAME=libhwloc
-
-    - name: Build UMF
-      run: cmake --build ${{env.BUILD_DIR}} --config ${{matrix.build_type}} -j $Env:NUMBER_OF_PROCESSORS
-
-    - name: Run tests
-      working-directory: ${{env.BUILD_DIR}}
-      run: ctest -C ${{matrix.build_type}} --output-on-failure --test-dir test
-
   macos-build:
     strategy:
       matrix:
-        os: ['macos-13', 'macos-14']
         include:
+          - os: macos-13
+            static_hwloc: 'OFF'
           - os: macos-14
             static_hwloc: 'ON'
     env:
@@ -538,7 +495,7 @@ jobs:
       run: brew install jemalloc tbb automake libtool
 
     - name: Install hwloc
-      if: ${{ !matrix.static_hwloc }}
+      if: ${{ matrix.static_hwloc == 'OFF' }}
       run: brew install hwloc
 
     - name: Get UMF version
@@ -559,7 +516,6 @@ jobs:
         -DUMF_BUILD_SHARED_LIBRARY=ON
         -DUMF_TESTS_FAIL_ON_SKIP=ON
         -DUMF_LINK_HWLOC_STATICALLY=${{matrix.static_hwloc}}
-        ${{matrix.static_hwloc}}
 
     - name: Build UMF
       run: cmake --build ${{env.BUILD_DIR}} -j $(sysctl -n hw.logicalcpu)
diff --git a/.github/workflows/reusable_dax.yml b/.github/workflows/reusable_dax.yml
@@ -43,7 +43,7 @@ jobs:
         shared_library: ['ON', 'OFF']
     name: DAX (ubuntu, build_type=${{matrix.build_type}}, shared_library=${{matrix.shared_library}})
     runs-on: ["DSS-DEVDAX", "DSS-Ubuntu"]
-    
+
     steps:
       - name: Check configuration of the DEVDAX
         run: |
diff --git a/.github/workflows/reusable_proxy_lib.yml b/.github/workflows/reusable_proxy_lib.yml
@@ -19,7 +19,7 @@ jobs:
         build_type: [Release, Debug]
         compiler: [{c: gcc, cxx: g++}]
         proxy_lib_pool: ['SCALABLE', 'JEMALLOC']
-    name: Proxy Library (ubuntu-22.04, build_type=${{matrix.build_type}}, compilers=${{matrix.compiler.c}}/${{matrix.compiler.cxx}}, proxy_lib_pool=${{matrix.proxy_lib_pool}}) 
+    name: Proxy Library (ubuntu-22.04, build_type=${{matrix.build_type}}, compilers=${{matrix.compiler.c}}/${{matrix.compiler.cxx}}, proxy_lib_pool=${{matrix.proxy_lib_pool}})
     runs-on: ${{ github.repository_owner == 'oneapi-src' && 'intel-ubuntu-22.04' || 'ubuntu-22.04' }}
 
     steps:
diff --git a/.github/workflows/reusable_sanitizers.yml b/.github/workflows/reusable_sanitizers.yml
@@ -91,17 +91,12 @@ jobs:
       with:
         fetch-depth: 0
 
-    # Use the latest MSVC toolset available, when compiling UMF with ASan.
-    # Running binaries compiled with older toolsets results in a
-    # 'STATUS_DLL_INIT_FAILED' error despite being linked with ASan from
-    # the same toolset as the compiler being used.
-    # https://github.com/actions/runner-images/issues/8891
+    # Ensure that the required environment is set
+    # Note: No need to specify version, the latest one will be used and should work fine
     - name: Setup MSVC dev command prompt
-      if: matrix.sanitizers.asan == 'ON'
       uses: TheMrMilchmann/setup-msvc-dev@fb19abb8a41b3cf0340f5d1be17d420309232be6 # v3.0.1
       with:
         arch: x64
-        toolset: '14'
 
     - name: Initialize vcpkg
       uses: lukka/run-vcpkg@5e0cab206a5ea620130caf672fce3e4a6b5666a1 # v11.5
@@ -112,7 +107,7 @@ jobs:
 
     - name: Install dependencies
       run: vcpkg install --triplet x64-windows
-      shell: pwsh # Specifies PowerShell as the shell for running the script.
+      shell: pwsh
 
     - name: Configure build
       run: >
