From 5fd0b9384eea4d1e7a35766e969209c80ae4deb3 Mon Sep 17 00:00:00 2001 From: opensource-krzysztof <152877665+opensource-krzysztof@users.noreply.github.com> Date: Tue, 13 May 2025 11:15:12 +0200 Subject: [PATCH 01/22] Update nightly.yml --- .github/workflows/nightly.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 76e6bef16..af6649a60 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -1,11 +1,11 @@ -# Various non-standard tests, requiring e.g. longer run name: Nightly # This job is run at 04:00 UTC every day or on demand. on: - workflow_dispatch: - schedule: - - cron: '0 4 * * *' + push: + branches-ignore: + - 'dependabot/**' + pull_request: permissions: contents: read From e9b0cb762c97f07f5337c5a08de9944907ac1539 Mon Sep 17 00:00:00 2001 From: opensource-krzysztof <152877665+opensource-krzysztof@users.noreply.github.com> Date: Tue, 13 May 2025 11:26:15 +0200 Subject: [PATCH 02/22] Update nightly.yml --- .github/workflows/nightly.yml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index af6649a60..733028640 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -115,7 +115,7 @@ jobs: compiler: [{c: cl, cxx: cl}] shared_library: ['ON', 'OFF'] static_hwloc: ['ON', 'OFF'] - generator: ['Ninja', 'NMake Makefiles'] + generator: ['Unix Makefiles'] umfd_lib: ['ON', 'OFF'] runs-on: windows-latest @@ -152,7 +152,14 @@ jobs: - name: Configure MSVC environment uses: ilammy/msvc-dev-cmd@0b201ec74fa43914dc39ae48a89fd1d8cb592756 # v1.13.0 - + + - name: Install llvm-mingw + run: | + curl -LO https://github.com/mstorsjo/llvm-mingw/releases/download/20250430/llvm-mingw-20250430-ucrt-x86_64.zip + powershell Expand-Archive llvm-mingw*.zip -DestinationPath . + del llvm-mingw*.zip + mv llvm-mingw* c:\llvm-mingw + echo "c:\llvm-mingw\bin" | Out-File -FilePath $Env:GITHUB_PATH -Encoding utf8 -Append - name: Configure build run: > cmake From a8095d4363de4a58966d05809560253bba3f6c1e Mon Sep 17 00:00:00 2001 From: opensource-krzysztof <152877665+opensource-krzysztof@users.noreply.github.com> Date: Tue, 13 May 2025 15:35:03 +0200 Subject: [PATCH 03/22] Update nightly.yml --- .github/workflows/nightly.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 733028640..f3e94d45e 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -160,6 +160,10 @@ jobs: del llvm-mingw*.zip mv llvm-mingw* c:\llvm-mingw echo "c:\llvm-mingw\bin" | Out-File -FilePath $Env:GITHUB_PATH -Encoding utf8 -Append + - name: cmake version + run: | + cmake --version + - name: Configure build run: > cmake From 6d9e74bd02a7b9e81afde3c614ea730f883b1059 Mon Sep 17 00:00:00 2001 From: opensource-krzysztof <152877665+opensource-krzysztof@users.noreply.github.com> Date: Wed, 14 May 2025 09:05:04 +0200 Subject: [PATCH 04/22] Update nightly.yml --- .github/workflows/nightly.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index f3e94d45e..d0f98434f 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -1,4 +1,4 @@ -name: Nightly +name: Nightly. # This job is run at 04:00 UTC every day or on demand. on: From 9c0aa183f3c7c0fd0f4001c10f4e35663fa19e35 Mon Sep 17 00:00:00 2001 From: opensource-krzysztof <152877665+opensource-krzysztof@users.noreply.github.com> Date: Wed, 14 May 2025 09:43:06 +0200 Subject: [PATCH 05/22] Update nightly.yml --- .github/workflows/nightly.yml | 183 +++++++++++++++++----------------- 1 file changed, 93 insertions(+), 90 deletions(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index d0f98434f..552d2df3d 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -15,97 +15,97 @@ env: INSTALL_DIR: "${{github.workspace}}/build/install" jobs: - fuzz-test: - name: Fuzz test - strategy: - fail-fast: false - matrix: - build_type: [Debug, Release] - compiler: [{c: clang, cxx: clang++}] +# fuzz-test: +# name: Fuzz test +# strategy: +# fail-fast: false +# matrix: +# build_type: [Debug, Release] +# compiler: [{c: clang, cxx: clang++}] - runs-on: ubuntu-latest - - steps: - - name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - with: - fetch-depth: 0 - - - name: Install apt packages - run: | - sudo apt-get update - sudo apt-get install -y cmake hwloc libhwloc-dev libnuma-dev libtbb-dev - - - name: Find Clang fuzzer lib - run: | - CLANG_LIBS_DIR=$(find /usr/lib -name "libclang_rt.fuzzer_no_main-x86_64.a" -exec dirname {} \; | head -n 1) - echo "CLANG_LIBS_DIR=${CLANG_LIBS_DIR}" >> $GITHUB_ENV - - - name: Configure CMake - run: > - cmake - -B ${{github.workspace}}/build - -DCMAKE_PREFIX_PATH=${{env.CLANG_LIBS_DIR}} - -DCMAKE_BUILD_TYPE=${{matrix.build_type}} - -DCMAKE_C_COMPILER=${{matrix.compiler.c}} - -DCMAKE_CXX_COMPILER=${{matrix.compiler.cxx}} - -DUMF_BUILD_SHARED_LIBRARY=ON - -DUMF_TESTS_FAIL_ON_SKIP=ON - -DUMF_DEVELOPER_MODE=ON - -DUMF_BUILD_FUZZTESTS=ON - - - name: Build - run: cmake --build ${{github.workspace}}/build --config ${{matrix.build_type}} --verbose -j$(nproc) - - - name: Run regular tests - working-directory: ${{github.workspace}}/build - run: ctest -C ${{matrix.build_type}} --output-on-failure -E "fuzz|test_init_teardown" - - - name: Run regular tests with proxy library - working-directory: ${{env.BUILD_DIR}} - run: LD_PRELOAD=./lib/libumf_proxy.so ctest -C ${{matrix.build_type}} --output-on-failure -E "fuzz|test_init_teardown" - - - name: Fuzz long test - working-directory: ${{github.workspace}}/build - run: ctest -C ${{matrix.build_type}} --output-on-failure --verbose -L "fuzz-long" - - valgrind: - name: Valgrind - strategy: - fail-fast: false - matrix: - tool: ['memcheck', 'drd', 'helgrind'] - runs-on: ubuntu-latest - - steps: - - name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - with: - fetch-depth: 0 - - - name: Install apt packages - run: | - sudo apt-get update - sudo apt-get install -y cmake hwloc libhwloc-dev libnuma-dev libtbb-dev valgrind - - - name: Configure CMake - run: > - cmake - -B ${{github.workspace}}/build - -DCMAKE_BUILD_TYPE=Debug - -DUMF_FORMAT_CODE_STYLE=OFF - -DUMF_DEVELOPER_MODE=ON - -DUMF_BUILD_LIBUMF_POOL_JEMALLOC=ON - -DUMF_BUILD_LEVEL_ZERO_PROVIDER=OFF - -DUMF_BUILD_CUDA_PROVIDER=OFF - -DUMF_USE_VALGRIND=1 - -DUMF_TESTS_FAIL_ON_SKIP=ON - - - name: Build - run: cmake --build ${{github.workspace}}/build --config Debug -j$(nproc) - - - name: Run tests under valgrind - run: ${{github.workspace}}/test/test_valgrind.sh ${{github.workspace}} ${{github.workspace}}/build ${{matrix.tool}} +# runs-on: ubuntu-latest + +# steps: +# - name: Checkout repository +# uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 +# with: +# fetch-depth: 0 + +# - name: Install apt packages +# run: | +# sudo apt-get update +# sudo apt-get install -y cmake hwloc libhwloc-dev libnuma-dev libtbb-dev + +# - name: Find Clang fuzzer lib +# run: | +# CLANG_LIBS_DIR=$(find /usr/lib -name "libclang_rt.fuzzer_no_main-x86_64.a" -exec dirname {} \; | head -n 1) +# echo "CLANG_LIBS_DIR=${CLANG_LIBS_DIR}" >> $GITHUB_ENV + +# - name: Configure CMake +# run: > +# cmake +# -B ${{github.workspace}}/build +# -DCMAKE_PREFIX_PATH=${{env.CLANG_LIBS_DIR}} +# -DCMAKE_BUILD_TYPE=${{matrix.build_type}} +# -DCMAKE_C_COMPILER=${{matrix.compiler.c}} +# -DCMAKE_CXX_COMPILER=${{matrix.compiler.cxx}} +# -DUMF_BUILD_SHARED_LIBRARY=ON +# -DUMF_TESTS_FAIL_ON_SKIP=ON +# -DUMF_DEVELOPER_MODE=ON +# -DUMF_BUILD_FUZZTESTS=ON + +# - name: Build +# run: cmake --build ${{github.workspace}}/build --config ${{matrix.build_type}} --verbose -j$(nproc) + +# - name: Run regular tests +# working-directory: ${{github.workspace}}/build +# run: ctest -C ${{matrix.build_type}} --output-on-failure -E "fuzz|test_init_teardown" + +# - name: Run regular tests with proxy library +# working-directory: ${{env.BUILD_DIR}} +# run: LD_PRELOAD=./lib/libumf_proxy.so ctest -C ${{matrix.build_type}} --output-on-failure -E "fuzz|test_init_teardown" + +# - name: Fuzz long test +# working-directory: ${{github.workspace}}/build +# run: ctest -C ${{matrix.build_type}} --output-on-failure --verbose -L "fuzz-long" + + # valgrind: + # name: Valgrind + # strategy: + # fail-fast: false + # matrix: + # tool: ['memcheck', 'drd', 'helgrind'] + # runs-on: ubuntu-latest + + # steps: + # - name: Checkout repository + # uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + # with: + # fetch-depth: 0 + + # - name: Install apt packages + # run: | + # sudo apt-get update + # sudo apt-get install -y cmake hwloc libhwloc-dev libnuma-dev libtbb-dev valgrind + + # - name: Configure CMake + # run: > + # cmake + # -B ${{github.workspace}}/build + # -DCMAKE_BUILD_TYPE=Debug + # -DUMF_FORMAT_CODE_STYLE=OFF + # -DUMF_DEVELOPER_MODE=ON + # -DUMF_BUILD_LIBUMF_POOL_JEMALLOC=ON + # -DUMF_BUILD_LEVEL_ZERO_PROVIDER=OFF + # -DUMF_BUILD_CUDA_PROVIDER=OFF + # -DUMF_USE_VALGRIND=1 + # -DUMF_TESTS_FAIL_ON_SKIP=ON + + # - name: Build + # run: cmake --build ${{github.workspace}}/build --config Debug -j$(nproc) + + # - name: Run tests under valgrind + # run: ${{github.workspace}}/test/test_valgrind.sh ${{github.workspace}} ${{github.workspace}}/build ${{matrix.tool}} Windows-generators: name: Windows ${{matrix.generator}} generator @@ -156,10 +156,13 @@ jobs: - name: Install llvm-mingw run: | curl -LO https://github.com/mstorsjo/llvm-mingw/releases/download/20250430/llvm-mingw-20250430-ucrt-x86_64.zip + - name: Install llvm-mingw (extract) + run: | powershell Expand-Archive llvm-mingw*.zip -DestinationPath . del llvm-mingw*.zip mv llvm-mingw* c:\llvm-mingw echo "c:\llvm-mingw\bin" | Out-File -FilePath $Env:GITHUB_PATH -Encoding utf8 -Append + dir "c:\llvm-mingw\bin" - name: cmake version run: | cmake --version From 163cf5206e23241b20418edbfbd7ec758afe9646 Mon Sep 17 00:00:00 2001 From: opensource-krzysztof <152877665+opensource-krzysztof@users.noreply.github.com> Date: Wed, 14 May 2025 10:52:58 +0200 Subject: [PATCH 06/22] Update nightly.yml --- .github/workflows/nightly.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 552d2df3d..cd4aa2ea8 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -150,8 +150,8 @@ jobs: if: matrix.generator == 'Ninja' uses: seanmiddleditch/gha-setup-ninja@3b1f8f94a2f8254bd26914c4ab9474d4f0015f67 # v6 - - name: Configure MSVC environment - uses: ilammy/msvc-dev-cmd@0b201ec74fa43914dc39ae48a89fd1d8cb592756 # v1.13.0 + # - name: Configure MSVC environment + # uses: ilammy/msvc-dev-cmd@0b201ec74fa43914dc39ae48a89fd1d8cb592756 # v1.13.0 - name: Install llvm-mingw run: | @@ -166,6 +166,8 @@ jobs: - name: cmake version run: | cmake --version + make --version + gcc --version - name: Configure build run: > From 967370d595c62d714624bbb4703319f568945eaf Mon Sep 17 00:00:00 2001 From: opensource-krzysztof <152877665+opensource-krzysztof@users.noreply.github.com> Date: Wed, 14 May 2025 11:09:04 +0200 Subject: [PATCH 07/22] Update nightly.yml --- .github/workflows/nightly.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index cd4aa2ea8..cafca4f7e 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -174,9 +174,9 @@ jobs: cmake -B ${{env.BUILD_DIR}} -DCMAKE_BUILD_TYPE=${{matrix.build_type}} - -DCMAKE_PREFIX_PATH="${{env.VCPKG_PATH}}" - -DCMAKE_C_COMPILER=${{matrix.compiler.c}} - -DCMAKE_CXX_COMPILER=${{matrix.compiler.cxx}} + -DCMAKE_PREFIX_PATH="c:\llvm-mingw\bin" + -DCMAKE_C_COMPILER="x86_64-w64-mingw32-${{matrix.compiler.c}}.exe" + -DCMAKE_CXX_COMPILER="x86_64-w64-mingw32-${{matrix.compiler.c}}.exe" -G "${{matrix.generator}}" -DUMF_BUILD_SHARED_LIBRARY=${{matrix.shared_library}} -DUMF_LINK_HWLOC_STATICALLY=${{matrix.static_hwloc}} From 8fe0c0320ee3f4138efd4fb2a4a3db862d7e0c90 Mon Sep 17 00:00:00 2001 From: opensource-krzysztof <152877665+opensource-krzysztof@users.noreply.github.com> Date: Wed, 14 May 2025 13:41:22 +0200 Subject: [PATCH 08/22] Update nightly.yml --- .github/workflows/nightly.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index cafca4f7e..0c5847f06 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -174,7 +174,7 @@ jobs: cmake -B ${{env.BUILD_DIR}} -DCMAKE_BUILD_TYPE=${{matrix.build_type}} - -DCMAKE_PREFIX_PATH="c:\llvm-mingw\bin" + -DCMAKE_PREFIX_PATH="c:\llvm-mingw\bin:${{env.VCPKG_PATH}}" -DCMAKE_C_COMPILER="x86_64-w64-mingw32-${{matrix.compiler.c}}.exe" -DCMAKE_CXX_COMPILER="x86_64-w64-mingw32-${{matrix.compiler.c}}.exe" -G "${{matrix.generator}}" From b5b485e5a845aec73b4221b67db51e409b6e12e2 Mon Sep 17 00:00:00 2001 From: opensource-krzysztof <152877665+opensource-krzysztof@users.noreply.github.com> Date: Wed, 14 May 2025 13:47:49 +0200 Subject: [PATCH 09/22] Update nightly.yml --- .github/workflows/nightly.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 0c5847f06..cb8297c5b 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -150,8 +150,8 @@ jobs: if: matrix.generator == 'Ninja' uses: seanmiddleditch/gha-setup-ninja@3b1f8f94a2f8254bd26914c4ab9474d4f0015f67 # v6 - # - name: Configure MSVC environment - # uses: ilammy/msvc-dev-cmd@0b201ec74fa43914dc39ae48a89fd1d8cb592756 # v1.13.0 + - name: Configure MSVC environment + uses: ilammy/msvc-dev-cmd@0b201ec74fa43914dc39ae48a89fd1d8cb592756 # v1.13.0 - name: Install llvm-mingw run: | From cad0c58f6f8e61424164b2a640495657a4916552 Mon Sep 17 00:00:00 2001 From: opensource-krzysztof <152877665+opensource-krzysztof@users.noreply.github.com> Date: Wed, 14 May 2025 15:47:39 +0200 Subject: [PATCH 10/22] Update nightly.yml --- .github/workflows/nightly.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index cb8297c5b..45c3a6fd2 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -1,4 +1,4 @@ -name: Nightly. +name: Nightly # This job is run at 04:00 UTC every day or on demand. on: From ae33b98725ced9e0009c201255631b3bf15463eb Mon Sep 17 00:00:00 2001 From: opensource-krzysztof <152877665+opensource-krzysztof@users.noreply.github.com> Date: Thu, 15 May 2025 10:18:13 +0200 Subject: [PATCH 11/22] Update nightly.yml --- .github/workflows/nightly.yml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 45c3a6fd2..8d984e4cb 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -174,9 +174,17 @@ jobs: cmake -B ${{env.BUILD_DIR}} -DCMAKE_BUILD_TYPE=${{matrix.build_type}} + # for mingw + # -DCMAKE_PREFIX_PATH="c:\llvm-mingw\bin:${{env.VCPKG_PATH}}" + # -DCMAKE_C_COMPILER="x86_64-w64-mingw32-${{matrix.compiler.c}}.exe" + # -DCMAKE_CXX_COMPILER="x86_64-w64-mingw32-${{matrix.compiler.c}}.exe" + # orginal + # -DCMAKE_PREFIX_PATH="${{env.VCPKG_PATH}}" + # -DCMAKE_C_COMPILER=${{matrix.compiler.c}} + # -DCMAKE_CXX_COMPILER=${{matrix.compiler.cxx}} -DCMAKE_PREFIX_PATH="c:\llvm-mingw\bin:${{env.VCPKG_PATH}}" - -DCMAKE_C_COMPILER="x86_64-w64-mingw32-${{matrix.compiler.c}}.exe" - -DCMAKE_CXX_COMPILER="x86_64-w64-mingw32-${{matrix.compiler.c}}.exe" + -DCMAKE_C_COMPILER=${{matrix.compiler.c}} + -DCMAKE_CXX_COMPILER=${{matrix.compiler.cxx}} -G "${{matrix.generator}}" -DUMF_BUILD_SHARED_LIBRARY=${{matrix.shared_library}} -DUMF_LINK_HWLOC_STATICALLY=${{matrix.static_hwloc}} From cd988edf2c8d487f74e16ebd1200b5b88e746c62 Mon Sep 17 00:00:00 2001 From: opensource-krzysztof <152877665+opensource-krzysztof@users.noreply.github.com> Date: Thu, 15 May 2025 11:02:23 +0200 Subject: [PATCH 12/22] Update nightly.yml --- .github/workflows/nightly.yml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 8d984e4cb..2bcebb3cb 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -174,14 +174,6 @@ jobs: cmake -B ${{env.BUILD_DIR}} -DCMAKE_BUILD_TYPE=${{matrix.build_type}} - # for mingw - # -DCMAKE_PREFIX_PATH="c:\llvm-mingw\bin:${{env.VCPKG_PATH}}" - # -DCMAKE_C_COMPILER="x86_64-w64-mingw32-${{matrix.compiler.c}}.exe" - # -DCMAKE_CXX_COMPILER="x86_64-w64-mingw32-${{matrix.compiler.c}}.exe" - # orginal - # -DCMAKE_PREFIX_PATH="${{env.VCPKG_PATH}}" - # -DCMAKE_C_COMPILER=${{matrix.compiler.c}} - # -DCMAKE_CXX_COMPILER=${{matrix.compiler.cxx}} -DCMAKE_PREFIX_PATH="c:\llvm-mingw\bin:${{env.VCPKG_PATH}}" -DCMAKE_C_COMPILER=${{matrix.compiler.c}} -DCMAKE_CXX_COMPILER=${{matrix.compiler.cxx}} @@ -195,7 +187,6 @@ jobs: -DUMF_BUILD_CUDA_PROVIDER=ON -DUMF_TESTS_FAIL_ON_SKIP=ON ${{ matrix.umfd_lib == 'ON' && '-DUMF_USE_DEBUG_POSTFIX=ON' || '' }} - - name: Build UMF shell: cmd run: cmake --build ${{env.BUILD_DIR}} --config ${{matrix.build_type}} -j %NUMBER_OF_PROCESSORS% From ba1165290d56a0bfbfefcecf05acdbdc17c1d767 Mon Sep 17 00:00:00 2001 From: opensource-krzysztof <152877665+opensource-krzysztof@users.noreply.github.com> Date: Thu, 15 May 2025 13:28:44 +0200 Subject: [PATCH 13/22] Update nightly.yml --- .github/workflows/nightly.yml | 207 ++++++++++++++++++---------------- 1 file changed, 112 insertions(+), 95 deletions(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 2bcebb3cb..abdb65e6a 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -107,113 +107,113 @@ jobs: # - name: Run tests under valgrind # run: ${{github.workspace}}/test/test_valgrind.sh ${{github.workspace}} ${{github.workspace}}/build ${{matrix.tool}} - Windows-generators: - name: Windows ${{matrix.generator}} generator - strategy: - matrix: - build_type: [Debug, Release] - compiler: [{c: cl, cxx: cl}] - shared_library: ['ON', 'OFF'] - static_hwloc: ['ON', 'OFF'] - generator: ['Unix Makefiles'] - umfd_lib: ['ON', 'OFF'] + # Windows-generators: + # name: Windows ${{matrix.generator}} generator + # strategy: + # matrix: + # build_type: [Debug, Release] + # compiler: [{c: cl, cxx: cl}] + # shared_library: ['ON', 'OFF'] + # static_hwloc: ['ON', 'OFF'] + # generator: ['Unix Makefiles'] + # umfd_lib: ['ON', 'OFF'] - runs-on: windows-latest + # runs-on: windows-latest - steps: - - name: Checkout - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - with: - fetch-depth: 0 + # steps: + # - name: Checkout + # uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + # with: + # fetch-depth: 0 - - name: Set VCPKG_PATH with hwloc - if: matrix.static_hwloc == 'OFF' - run: echo "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" >> $env:GITHUB_ENV + # - name: Set VCPKG_PATH with hwloc + # if: matrix.static_hwloc == 'OFF' + # run: echo "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" >> $env:GITHUB_ENV - - name: Set VCPKG_PATH without hwloc - if: matrix.static_hwloc == 'ON' - run: echo "VCPKG_PATH=${{github.workspace}}/build/vcpkg/packages/tbb_x64-windows;${{github.workspace}}/build/vcpkg/packages/jemalloc_x64-windows" >> $env:GITHUB_ENV + # - name: Set VCPKG_PATH without hwloc + # if: matrix.static_hwloc == 'ON' + # run: echo "VCPKG_PATH=${{github.workspace}}/build/vcpkg/packages/tbb_x64-windows;${{github.workspace}}/build/vcpkg/packages/jemalloc_x64-windows" >> $env:GITHUB_ENV - - name: Initialize vcpkg - uses: lukka/run-vcpkg@5e0cab206a5ea620130caf672fce3e4a6b5666a1 # v11.5 - env: - VCPKG_PATH: ${{env.VCPKG_PATH}} - with: - vcpkgGitCommitId: ea2a964f9303270322cf3f2d51c265ba146c422d # 1.04.2025 - vcpkgDirectory: ${{env.BUILD_DIR}}/vcpkg - vcpkgJsonGlob: '**/vcpkg.json' + # - name: Initialize vcpkg + # uses: lukka/run-vcpkg@5e0cab206a5ea620130caf672fce3e4a6b5666a1 # v11.5 + # env: + # VCPKG_PATH: ${{env.VCPKG_PATH}} + # with: + # vcpkgGitCommitId: ea2a964f9303270322cf3f2d51c265ba146c422d # 1.04.2025 + # vcpkgDirectory: ${{env.BUILD_DIR}}/vcpkg + # vcpkgJsonGlob: '**/vcpkg.json' - - name: Install dependencies - run: vcpkg install --triplet x64-windows + # - name: Install dependencies + # run: vcpkg install --triplet x64-windows - - name: Install Ninja - if: matrix.generator == 'Ninja' - uses: seanmiddleditch/gha-setup-ninja@3b1f8f94a2f8254bd26914c4ab9474d4f0015f67 # v6 + # - name: Install Ninja + # if: matrix.generator == 'Ninja' + # uses: seanmiddleditch/gha-setup-ninja@3b1f8f94a2f8254bd26914c4ab9474d4f0015f67 # v6 - - name: Configure MSVC environment - uses: ilammy/msvc-dev-cmd@0b201ec74fa43914dc39ae48a89fd1d8cb592756 # v1.13.0 + # - name: Configure MSVC environment + # uses: ilammy/msvc-dev-cmd@0b201ec74fa43914dc39ae48a89fd1d8cb592756 # v1.13.0 - - name: Install llvm-mingw - run: | - curl -LO https://github.com/mstorsjo/llvm-mingw/releases/download/20250430/llvm-mingw-20250430-ucrt-x86_64.zip - - name: Install llvm-mingw (extract) - run: | - powershell Expand-Archive llvm-mingw*.zip -DestinationPath . - del llvm-mingw*.zip - mv llvm-mingw* c:\llvm-mingw - echo "c:\llvm-mingw\bin" | Out-File -FilePath $Env:GITHUB_PATH -Encoding utf8 -Append - dir "c:\llvm-mingw\bin" - - name: cmake version - run: | - cmake --version - make --version - gcc --version + # - name: Install llvm-mingw + # run: | + # curl -LO https://github.com/mstorsjo/llvm-mingw/releases/download/20250430/llvm-mingw-20250430-ucrt-x86_64.zip + # - name: Install llvm-mingw (extract) + # run: | + # powershell Expand-Archive llvm-mingw*.zip -DestinationPath . + # del llvm-mingw*.zip + # mv llvm-mingw* c:\llvm-mingw + # echo "c:\llvm-mingw\bin" | Out-File -FilePath $Env:GITHUB_PATH -Encoding utf8 -Append + # dir "c:\llvm-mingw\bin" + # - name: cmake version + # run: | + # cmake --version + # make --version + # gcc --version - - name: Configure build - run: > - cmake - -B ${{env.BUILD_DIR}} - -DCMAKE_BUILD_TYPE=${{matrix.build_type}} - -DCMAKE_PREFIX_PATH="c:\llvm-mingw\bin:${{env.VCPKG_PATH}}" - -DCMAKE_C_COMPILER=${{matrix.compiler.c}} - -DCMAKE_CXX_COMPILER=${{matrix.compiler.cxx}} - -G "${{matrix.generator}}" - -DUMF_BUILD_SHARED_LIBRARY=${{matrix.shared_library}} - -DUMF_LINK_HWLOC_STATICALLY=${{matrix.static_hwloc}} - -DUMF_FORMAT_CODE_STYLE=OFF - -DUMF_DEVELOPER_MODE=ON - -DUMF_BUILD_LIBUMF_POOL_JEMALLOC=ON - -DUMF_BUILD_LEVEL_ZERO_PROVIDER=ON - -DUMF_BUILD_CUDA_PROVIDER=ON - -DUMF_TESTS_FAIL_ON_SKIP=ON - ${{ matrix.umfd_lib == 'ON' && '-DUMF_USE_DEBUG_POSTFIX=ON' || '' }} - - name: Build UMF - shell: cmd - run: cmake --build ${{env.BUILD_DIR}} --config ${{matrix.build_type}} -j %NUMBER_OF_PROCESSORS% + # - name: Configure build + # run: > + # cmake + # -B ${{env.BUILD_DIR}} + # -DCMAKE_BUILD_TYPE=${{matrix.build_type}} + # -DCMAKE_PREFIX_PATH="c:\llvm-mingw\bin:${{env.VCPKG_PATH}}" + # -DCMAKE_C_COMPILER=${{matrix.compiler.c}} + # -DCMAKE_CXX_COMPILER=${{matrix.compiler.cxx}} + # -G "${{matrix.generator}}" + # -DUMF_BUILD_SHARED_LIBRARY=${{matrix.shared_library}} + # -DUMF_LINK_HWLOC_STATICALLY=${{matrix.static_hwloc}} + # -DUMF_FORMAT_CODE_STYLE=OFF + # -DUMF_DEVELOPER_MODE=ON + # -DUMF_BUILD_LIBUMF_POOL_JEMALLOC=ON + # -DUMF_BUILD_LEVEL_ZERO_PROVIDER=ON + # -DUMF_BUILD_CUDA_PROVIDER=ON + # -DUMF_TESTS_FAIL_ON_SKIP=ON + # ${{ matrix.umfd_lib == 'ON' && '-DUMF_USE_DEBUG_POSTFIX=ON' || '' }} + # - name: Build UMF + # shell: cmd + # run: cmake --build ${{env.BUILD_DIR}} --config ${{matrix.build_type}} -j %NUMBER_OF_PROCESSORS% - - name: Run tests - shell: cmd - working-directory: ${{env.BUILD_DIR}} - run: ctest -C ${{matrix.build_type}} --output-on-failure --test-dir test + # - name: Run tests + # shell: cmd + # working-directory: ${{env.BUILD_DIR}} + # run: ctest -C ${{matrix.build_type}} --output-on-failure --test-dir test - - name: Get UMF version - run: | - $version = (git describe --tags --abbrev=0 | Select-String -Pattern '\d+\.\d+\.\d+').Matches.Value - echo "UMF_VERSION=$version" >> $env:GITHUB_ENV - shell: pwsh + # - name: Get UMF version + # run: | + # $version = (git describe --tags --abbrev=0 | Select-String -Pattern '\d+\.\d+\.\d+').Matches.Value + # echo "UMF_VERSION=$version" >> $env:GITHUB_ENV + # shell: pwsh - - name: Test UMF installation and uninstallation - # The '--shared-library' parameter is added to the installation test when the UMF is built as a shared library - # The '--umfd-lib' parameter is added when the UMF is built with the umfd library - run: > - python3 ${{github.workspace}}/test/test_installation.py - --build-dir ${{env.BUILD_DIR}} - --install-dir ${{env.INSTALL_DIR}} - --build-type ${{matrix.build_type}} - --umf-version ${{env.UMF_VERSION}} - ${{ matrix.shared_library == 'ON' && '--proxy --shared-library' || '' }} - ${{ matrix.umfd_lib == 'ON' && '--umfd-lib' || ''}} - ${{ matrix.static_hwloc == 'ON' && '--hwloc' || '' }} + # - name: Test UMF installation and uninstallation + # # The '--shared-library' parameter is added to the installation test when the UMF is built as a shared library + # # The '--umfd-lib' parameter is added when the UMF is built with the umfd library + # run: > + # python3 ${{github.workspace}}/test/test_installation.py + # --build-dir ${{env.BUILD_DIR}} + # --install-dir ${{env.INSTALL_DIR}} + # --build-type ${{matrix.build_type}} + # --umf-version ${{env.UMF_VERSION}} + # ${{ matrix.shared_library == 'ON' && '--proxy --shared-library' || '' }} + # ${{ matrix.umfd_lib == 'ON' && '--umfd-lib' || ''}} + # ${{ matrix.static_hwloc == 'ON' && '--hwloc' || '' }} icx: name: ICX @@ -265,7 +265,24 @@ jobs: start /b /wait .\compiler_install.exe -s -x -f extracted --log extract.log extracted\bootstrapper.exe -s --action install --eula=accept -p=NEED_VS2017_INTEGRATION=0 ^ -p=NEED_VS2019_INTEGRATION=0 -p=NEED_VS2022_INTEGRATION=0 --log-dir=. - + + + - name: Install llvm-mingw + run: | + curl -LO https://github.com/mstorsjo/llvm-mingw/releases/download/20250430/llvm-mingw-20250430-ucrt-x86_64.zip + - name: Install llvm-mingw (extract) + run: | + powershell Expand-Archive llvm-mingw*.zip -DestinationPath . + del llvm-mingw*.zip + mv llvm-mingw* c:\llvm-mingw + echo "c:\llvm-mingw\bin" | Out-File -FilePath $Env:GITHUB_PATH -Encoding utf8 -Append + dir "c:\llvm-mingw\bin" + - name: cmake version + run: | + cmake --version + make --version + gcc --version + - name: Configure build shell: cmd run: | From a0ca8bab7afbf51b93b951d8c809b614123492f0 Mon Sep 17 00:00:00 2001 From: opensource-krzysztof <152877665+opensource-krzysztof@users.noreply.github.com> Date: Thu, 15 May 2025 13:46:40 +0200 Subject: [PATCH 14/22] Update nightly.yml --- .github/workflows/nightly.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index abdb65e6a..c6c5e3b6a 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -293,7 +293,7 @@ jobs: -DCMAKE_PREFIX_PATH="${{env.VCPKG_PATH}}" ^ -DCMAKE_C_COMPILER=${{matrix.compiler.c}} ^ -DCMAKE_CXX_COMPILER=${{matrix.compiler.cxx}} ^ - -G Ninja ^ + -G "Unix MakeFiles" ^ -DUMF_BUILD_SHARED_LIBRARY=${{matrix.shared_library}} ^ -DUMF_FORMAT_CODE_STYLE=OFF ^ -DUMF_DEVELOPER_MODE=ON ^ From 3618c59cdbfcfd8d122a7c8c173043afd42b498d Mon Sep 17 00:00:00 2001 From: opensource-krzysztof <152877665+opensource-krzysztof@users.noreply.github.com> Date: Thu, 15 May 2025 14:43:14 +0200 Subject: [PATCH 15/22] Update nightly.yml --- .github/workflows/nightly.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index c6c5e3b6a..d182e3220 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -293,7 +293,7 @@ jobs: -DCMAKE_PREFIX_PATH="${{env.VCPKG_PATH}}" ^ -DCMAKE_C_COMPILER=${{matrix.compiler.c}} ^ -DCMAKE_CXX_COMPILER=${{matrix.compiler.cxx}} ^ - -G "Unix MakeFiles" ^ + -G "Unix\ Makefiles" ^ -DUMF_BUILD_SHARED_LIBRARY=${{matrix.shared_library}} ^ -DUMF_FORMAT_CODE_STYLE=OFF ^ -DUMF_DEVELOPER_MODE=ON ^ From 371583643e0d7f563c8e2cfdb61e6eec7f02d2f8 Mon Sep 17 00:00:00 2001 From: opensource-krzysztof <152877665+opensource-krzysztof@users.noreply.github.com> Date: Thu, 15 May 2025 15:58:21 +0200 Subject: [PATCH 16/22] Update nightly.yml --- .github/workflows/nightly.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index d182e3220..d3b9867df 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -293,7 +293,7 @@ jobs: -DCMAKE_PREFIX_PATH="${{env.VCPKG_PATH}}" ^ -DCMAKE_C_COMPILER=${{matrix.compiler.c}} ^ -DCMAKE_CXX_COMPILER=${{matrix.compiler.cxx}} ^ - -G "Unix\ Makefiles" ^ + -G Unix\ Makefiles ^ -DUMF_BUILD_SHARED_LIBRARY=${{matrix.shared_library}} ^ -DUMF_FORMAT_CODE_STYLE=OFF ^ -DUMF_DEVELOPER_MODE=ON ^ From b02d34cc97ae5360601dd9adf7f0d626dad6ff05 Mon Sep 17 00:00:00 2001 From: opensource-krzysztof <152877665+opensource-krzysztof@users.noreply.github.com> Date: Fri, 16 May 2025 12:35:29 +0200 Subject: [PATCH 17/22] Update nightly.yml --- .github/workflows/nightly.yml | 42 ++++++++++++++++++++--------------- 1 file changed, 24 insertions(+), 18 deletions(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index d3b9867df..2af684cbe 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -267,27 +267,33 @@ jobs: -p=NEED_VS2019_INTEGRATION=0 -p=NEED_VS2022_INTEGRATION=0 --log-dir=. - - name: Install llvm-mingw - run: | - curl -LO https://github.com/mstorsjo/llvm-mingw/releases/download/20250430/llvm-mingw-20250430-ucrt-x86_64.zip - - name: Install llvm-mingw (extract) - run: | - powershell Expand-Archive llvm-mingw*.zip -DestinationPath . - del llvm-mingw*.zip - mv llvm-mingw* c:\llvm-mingw - echo "c:\llvm-mingw\bin" | Out-File -FilePath $Env:GITHUB_PATH -Encoding utf8 -Append - dir "c:\llvm-mingw\bin" - - name: cmake version - run: | - cmake --version - make --version - gcc --version + # - name: Install llvm-mingw + # run: | + # curl -LO https://github.com/mstorsjo/llvm-mingw/releases/download/20250430/llvm-mingw-20250430-ucrt-x86_64.zip + # - name: Install llvm-mingw (extract) + # run: | + # powershell Expand-Archive llvm-mingw*.zip -DestinationPath . + # del llvm-mingw*.zip + # mv llvm-mingw* c:\llvm-mingw + # echo "c:\llvm-mingw\bin" | Out-File -FilePath $Env:GITHUB_PATH -Encoding utf8 -Append + # dir "c:\llvm-mingw\bin" + # - name: cmake version + # run: | + # cmake --version + # make --version + # gcc --version + + - name: Install MSYS2 + uses: msys2/setup-msys2@v2 + with: + update: true + install: "make cmake" - name: Configure build - shell: cmd + shell: msys2 {0} run: | - call "C:\Program Files (x86)\Intel\oneAPI\setvars.bat" - call "C:\Program Files (x86)\Intel\oneAPI\setvars-vcvarsall.bat" + # call "C:\Program Files (x86)\Intel\oneAPI\setvars.bat" + # call "C:\Program Files (x86)\Intel\oneAPI\setvars-vcvarsall.bat" cmake ^ -B ${{env.BUILD_DIR}} ^ -DCMAKE_PREFIX_PATH="${{env.VCPKG_PATH}}" ^ From 6451fc864fa6d2a9d04699b2fc4f5f6b28c41853 Mon Sep 17 00:00:00 2001 From: opensource-krzysztof <152877665+opensource-krzysztof@users.noreply.github.com> Date: Fri, 16 May 2025 13:01:58 +0200 Subject: [PATCH 18/22] Update nightly.yml --- .github/workflows/nightly.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 2af684cbe..e49a8affe 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -292,8 +292,6 @@ jobs: - name: Configure build shell: msys2 {0} run: | - # call "C:\Program Files (x86)\Intel\oneAPI\setvars.bat" - # call "C:\Program Files (x86)\Intel\oneAPI\setvars-vcvarsall.bat" cmake ^ -B ${{env.BUILD_DIR}} ^ -DCMAKE_PREFIX_PATH="${{env.VCPKG_PATH}}" ^ From 01c9369acb82e44fa625b5a675a7b2177064d04a Mon Sep 17 00:00:00 2001 From: opensource-krzysztof <152877665+opensource-krzysztof@users.noreply.github.com> Date: Mon, 19 May 2025 12:54:31 +0200 Subject: [PATCH 19/22] Update nightly.yml --- .github/workflows/nightly.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index e49a8affe..03b7e1ecd 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -1,4 +1,4 @@ -name: Nightly +name: Nightly. # This job is run at 04:00 UTC every day or on demand. on: @@ -294,10 +294,10 @@ jobs: run: | cmake ^ -B ${{env.BUILD_DIR}} ^ - -DCMAKE_PREFIX_PATH="${{env.VCPKG_PATH}}" ^ + -DCMAKE_PREFIX_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" ^ -DCMAKE_C_COMPILER=${{matrix.compiler.c}} ^ -DCMAKE_CXX_COMPILER=${{matrix.compiler.cxx}} ^ - -G Unix\ Makefiles ^ + -G "Unix Makefiles" ^ -DUMF_BUILD_SHARED_LIBRARY=${{matrix.shared_library}} ^ -DUMF_FORMAT_CODE_STYLE=OFF ^ -DUMF_DEVELOPER_MODE=ON ^ From 51d896ad34125183cd81e7a9e10cd221241ad25a Mon Sep 17 00:00:00 2001 From: opensource-krzysztof <152877665+opensource-krzysztof@users.noreply.github.com> Date: Mon, 19 May 2025 13:23:47 +0200 Subject: [PATCH 20/22] Update nightly.yml --- .github/workflows/nightly.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 03b7e1ecd..3d61498fc 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -266,7 +266,11 @@ jobs: extracted\bootstrapper.exe -s --action install --eula=accept -p=NEED_VS2017_INTEGRATION=0 ^ -p=NEED_VS2019_INTEGRATION=0 -p=NEED_VS2022_INTEGRATION=0 --log-dir=. - + - name: test msys2 + shell: msys2 {0} + run: | + pwd + find . # - name: Install llvm-mingw # run: | # curl -LO https://github.com/mstorsjo/llvm-mingw/releases/download/20250430/llvm-mingw-20250430-ucrt-x86_64.zip From 0cd775dc79d5c573052f7dc10978a7c08cf6e99c Mon Sep 17 00:00:00 2001 From: opensource-krzysztof <152877665+opensource-krzysztof@users.noreply.github.com> Date: Mon, 19 May 2025 13:56:13 +0200 Subject: [PATCH 21/22] Update nightly.yml --- .github/workflows/nightly.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 3d61498fc..2cddab425 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -1,4 +1,4 @@ -name: Nightly. +name: Nightly # This job is run at 04:00 UTC every day or on demand. on: From 3c34eea136b69027562bbb22c8867ada914280b5 Mon Sep 17 00:00:00 2001 From: opensource-krzysztof <152877665+opensource-krzysztof@users.noreply.github.com> Date: Tue, 20 May 2025 11:04:09 +0200 Subject: [PATCH 22/22] Update nightly.yml --- .github/workflows/nightly.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 2cddab425..c22d2a6cf 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -269,8 +269,8 @@ jobs: - name: test msys2 shell: msys2 {0} run: | - pwd - find . + dir /s /b /o:gn + # - name: Install llvm-mingw # run: | # curl -LO https://github.com/mstorsjo/llvm-mingw/releases/download/20250430/llvm-mingw-20250430-ucrt-x86_64.zip