Skip to content

Commit b8d88ee

Browse files
Merge branch 'main' into cmake-new
2 parents 1408bcd + be747d0 commit b8d88ee

22 files changed

+192
-375
lines changed

.github/workflows/nightly.yml

Lines changed: 0 additions & 264 deletions
Original file line numberDiff line numberDiff line change
@@ -13,185 +13,6 @@ env:
1313
INSTALL_DIR: "${{github.workspace}}/build/install"
1414

1515
jobs:
16-
# fuzz-test:
17-
# name: Fuzz test
18-
# strategy:
19-
# fail-fast: false
20-
# matrix:
21-
# build_type: [Debug, Release]
22-
# compiler: [{c: clang, cxx: clang++}]
23-
24-
# runs-on: ubuntu-latest
25-
26-
# steps:
27-
# - name: Checkout repository
28-
# uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
29-
# with:
30-
# fetch-depth: 0
31-
32-
# - name: Install apt packages
33-
# run: |
34-
# sudo apt-get update
35-
# sudo apt-get install -y cmake hwloc libhwloc-dev libnuma-dev libtbb-dev
36-
37-
# - name: Configure CMake
38-
# run: >
39-
# cmake
40-
# -B ${{github.workspace}}/build
41-
# -DCMAKE_BUILD_TYPE=${{matrix.build_type}}
42-
# -DCMAKE_C_COMPILER=${{matrix.compiler.c}}
43-
# -DCMAKE_CXX_COMPILER=${{matrix.compiler.cxx}}
44-
# -DUMF_TESTS_FAIL_ON_SKIP=ON
45-
# -DUMF_DEVELOPER_MODE=ON
46-
# -DUMF_BUILD_FUZZTESTS=ON
47-
48-
# - name: Build
49-
# run: cmake --build ${{github.workspace}}/build --config ${{matrix.build_type}} --verbose -j$(nproc)
50-
51-
# - name: Fuzz long test
52-
# working-directory: ${{github.workspace}}/build
53-
# run: ctest -C ${{matrix.build_type}} --output-on-failure --verbose -L "fuzz-long"
54-
55-
# valgrind:
56-
# name: Valgrind
57-
# strategy:
58-
# fail-fast: false
59-
# matrix:
60-
# tool: ['memcheck', 'drd', 'helgrind']
61-
# runs-on: ubuntu-latest
62-
63-
# steps:
64-
# - name: Checkout repository
65-
# uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
66-
# with:
67-
# fetch-depth: 0
68-
69-
# - name: Install apt packages
70-
# run: |
71-
# sudo apt-get update
72-
# sudo apt-get install -y cmake hwloc libhwloc-dev libnuma-dev libtbb-dev valgrind
73-
74-
# - name: Configure CMake
75-
# run: >
76-
# cmake
77-
# -B ${{github.workspace}}/build
78-
# -DCMAKE_BUILD_TYPE=Debug
79-
# -DUMF_FORMAT_CODE_STYLE=OFF
80-
# -DUMF_DEVELOPER_MODE=ON
81-
# -DUMF_BUILD_LIBUMF_POOL_JEMALLOC=ON
82-
# -DUMF_BUILD_LEVEL_ZERO_PROVIDER=OFF
83-
# -DUMF_BUILD_CUDA_PROVIDER=OFF
84-
# -DUMF_USE_VALGRIND=1
85-
# -DUMF_TESTS_FAIL_ON_SKIP=ON
86-
87-
# - name: Build
88-
# run: cmake --build ${{github.workspace}}/build --config Debug -j$(nproc)
89-
90-
# - name: Run tests under valgrind
91-
# run: ${{github.workspace}}/test/test_valgrind.sh ${{github.workspace}} ${{github.workspace}}/build ${{matrix.tool}}
92-
93-
# Windows-generators:
94-
# name: Windows ${{matrix.generator}} generator.
95-
# strategy:
96-
# matrix:
97-
# build_type: [Debug, Release]
98-
# compiler: [{c: cl, cxx: cl}]
99-
# shared_library: ['ON', 'OFF']
100-
# static_hwloc: ['ON', 'OFF']
101-
# generator: ['Unix Makefiles']
102-
# umfd_lib: ['ON', 'OFF']
103-
104-
# runs-on: windows-latest
105-
106-
# steps:
107-
# - name: Checkout
108-
# uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
109-
# with:
110-
# fetch-depth: 0
111-
112-
# - name: Set VCPKG_PATH with hwloc
113-
# if: matrix.static_hwloc == 'OFF'
114-
# 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
115-
116-
# - name: Set VCPKG_PATH without hwloc
117-
# if: matrix.static_hwloc == 'ON'
118-
# run: echo "VCPKG_PATH=${{github.workspace}}/build/vcpkg/packages/tbb_x64-windows;${{github.workspace}}/build/vcpkg/packages/jemalloc_x64-windows" >> $env:GITHUB_ENV
119-
120-
# - name: Initialize vcpkg
121-
# uses: lukka/run-vcpkg@5e0cab206a5ea620130caf672fce3e4a6b5666a1 # v11.5
122-
# env:
123-
# VCPKG_PATH: ${{env.VCPKG_PATH}}
124-
# with:
125-
# vcpkgGitCommitId: ea2a964f9303270322cf3f2d51c265ba146c422d # 1.04.2025
126-
# vcpkgDirectory: ${{env.BUILD_DIR}}/vcpkg
127-
# vcpkgJsonGlob: '**/vcpkg.json'
128-
129-
# - name: Install dependencies
130-
# run: vcpkg install --triplet x64-windows
131-
132-
# - name: Install Ninja
133-
# if: matrix.generator == 'Ninja'
134-
# uses: seanmiddleditch/gha-setup-ninja@3b1f8f94a2f8254bd26914c4ab9474d4f0015f67 # v6
135-
136-
# # - name: NMake Makefiles
137-
# # if: matrix.generator == 'Unix Makefiles'
138-
# # env:
139-
# # UMF_TESTS_FAIL_ON_SKIP: ON
140-
# # run: cmake -G "Unix Makefiles" -DUMF_TESTS_FAIL_ON_SKIP=ON
141-
142-
143-
144-
145-
# - name: Configure MSVC environment
146-
# uses: ilammy/msvc-dev-cmd@0b201ec74fa43914dc39ae48a89fd1d8cb592756 # v1.13.0
147-
148-
# - name: Configure build
149-
# run: >
150-
# cmake
151-
# -B ${{env.BUILD_DIR}}
152-
# -DCMAKE_BUILD_TYPE=${{matrix.build_type}}
153-
# -DCMAKE_PREFIX_PATH="${{env.VCPKG_PATH}}"
154-
# -DCMAKE_C_COMPILER=${{matrix.compiler.c}}
155-
# -DCMAKE_CXX_COMPILER=${{matrix.compiler.cxx}}
156-
# -G "${{matrix.generator}}"
157-
# -DUMF_BUILD_SHARED_LIBRARY=${{matrix.shared_library}}
158-
# -DUMF_LINK_HWLOC_STATICALLY=${{matrix.static_hwloc}}
159-
# -DUMF_FORMAT_CODE_STYLE=OFF
160-
# -DUMF_DEVELOPER_MODE=ON
161-
# -DUMF_BUILD_LIBUMF_POOL_JEMALLOC=ON
162-
# -DUMF_BUILD_LEVEL_ZERO_PROVIDER=ON
163-
# -DUMF_BUILD_CUDA_PROVIDER=ON
164-
# -DUMF_TESTS_FAIL_ON_SKIP=ON
165-
# ${{ matrix.umfd_lib == 'ON' && '-DUMF_USE_DEBUG_POSTFIX=ON' || '' }}
166-
167-
# - name: Build UMF
168-
# shell: cmd
169-
# run: cmake --build ${{env.BUILD_DIR}} --config ${{matrix.build_type}} -j %NUMBER_OF_PROCESSORS%
170-
171-
# - name: Run tests
172-
# shell: cmd
173-
# working-directory: ${{env.BUILD_DIR}}
174-
# run: ctest -C ${{matrix.build_type}} --output-on-failure --test-dir test
175-
176-
# - name: Get UMF version
177-
# run: |
178-
# $version = (git describe --tags --abbrev=0 | Select-String -Pattern '\d+\.\d+\.\d+').Matches.Value
179-
# echo "UMF_VERSION=$version" >> $env:GITHUB_ENV
180-
# shell: pwsh
181-
182-
# - name: Test UMF installation and uninstallation
183-
# # The '--shared-library' parameter is added to the installation test when the UMF is built as a shared library
184-
# # The '--umfd-lib' parameter is added when the UMF is built with the umfd library
185-
# run: >
186-
# python3 ${{github.workspace}}/test/test_installation.py
187-
# --build-dir ${{env.BUILD_DIR}}
188-
# --install-dir ${{env.INSTALL_DIR}}
189-
# --build-type ${{matrix.build_type}}
190-
# --umf-version ${{env.UMF_VERSION}}
191-
# ${{ matrix.shared_library == 'ON' && '--proxy --shared-library' || '' }}
192-
# ${{ matrix.umfd_lib == 'ON' && '--umfd-lib' || ''}}
193-
# ${{ matrix.static_hwloc == 'ON' && '--hwloc' || '' }}
194-
19516
icx:
19617
name: ICX
19718
env:
@@ -277,88 +98,3 @@ jobs:
27798
call "C:\Program Files (x86)\Intel\oneAPI\setvars-vcvarsall.bat"
27899
ctest -C ${{matrix.build_type}} --output-on-failure --test-dir test
279100
280-
# # Scenarios where UMF_LINK_HWLOC_STATICALLY is set to OFF and hwloc is not installed in the system
281-
# # The hwloc library is fetched implicitly
282-
# hwloc-fallback:
283-
# name: "Fallback to static hwloc build"
284-
# strategy:
285-
# matrix:
286-
# include:
287-
# - os: 'ubuntu-latest'
288-
# build_type: Release
289-
# number_of_processors: '$(nproc)'
290-
# - os: 'windows-latest'
291-
# build_type: Release
292-
# number_of_processors: '$Env:NUMBER_OF_PROCESSORS'
293-
294-
# runs-on: ${{matrix.os}}
295-
296-
# steps:
297-
# - name: Install dependencies
298-
# if: matrix.os == 'ubuntu-latest'
299-
# run: sudo apt-get install -y libnuma-dev
300-
301-
# - name: Checkout
302-
# uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
303-
# with:
304-
# fetch-depth: 0
305-
306-
# - name: Configure build
307-
# run: >
308-
# cmake
309-
# -B ${{env.BUILD_DIR}}
310-
# -DCMAKE_BUILD_TYPE=${{matrix.build_type}}
311-
# -DUMF_BUILD_SHARED_LIBRARY=ON
312-
# -DUMF_BUILD_EXAMPLES=OFF
313-
# -DUMF_DEVELOPER_MODE=ON
314-
# -DUMF_LINK_HWLOC_STATICALLY=OFF
315-
# -DUMF_TESTS_FAIL_ON_SKIP=ON
316-
317-
# - name: Build UMF
318-
# run: >
319-
# cmake
320-
# --build ${{env.BUILD_DIR}}
321-
# --config ${{matrix.build_type}}
322-
# -j ${{matrix.number_of_processors}}
323-
324-
# - name: Run tests
325-
# working-directory: ${{env.BUILD_DIR}}
326-
# run: ctest -C ${{matrix.build_type}} --output-on-failure --test-dir test
327-
328-
# L0:
329-
# uses: ./.github/workflows/reusable_gpu.yml
330-
# with:
331-
# provider: "LEVEL_ZERO"
332-
# runner: "L0"
333-
# L0-BMG:
334-
# uses: ./.github/workflows/reusable_gpu.yml
335-
# with:
336-
# provider: "LEVEL_ZERO"
337-
# runner: "L0-BMG"
338-
# os: "['Ubuntu']"
339-
# CUDA:
340-
# uses: ./.github/workflows/reusable_gpu.yml
341-
# with:
342-
# provider: "CUDA"
343-
# runner: "CUDA"
344-
345-
# # Full execution of QEMU tests
346-
# QEMU:
347-
# uses: ./.github/workflows/reusable_qemu.yml
348-
# with:
349-
# short_run: false
350-
# # Beside the 2 LTS Ubuntu, we also test this on the latest Ubuntu - to be updated
351-
# # every 6 months, so we verify the latest version of packages (compilers, etc.).
352-
# os: "['ubuntu-22.04', 'ubuntu-24.04', 'ubuntu-24.10']"
353-
354-
# Benchmarks:
355-
# uses: ./.github/workflows/reusable_benchmarks.yml
356-
# permissions:
357-
# contents: write
358-
# pull-requests: write
359-
# with:
360-
# pr_no: '0'
361-
# bench_script_params: '--save Baseline_PVC'
362-
363-
# SYCL:
364-
# uses: ./.github/workflows/reusable_sycl.yml

.github/workflows/reusable_basic.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ permissions:
88

99
env:
1010
BUILD_DIR : "${{github.workspace}}/build"
11-
INSTL_DIR : "${{github.workspace}}/../install-dir"
11+
INSTL_DIR : "${{github.workspace}}/install-dir"
1212
COVERAGE_DIR : "${{github.workspace}}/coverage"
1313
COVERAGE_NAME : "exports-coverage-basic"
1414

.github/workflows/reusable_codeql.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ permissions:
88

99
env:
1010
BUILD_DIR : "${{github.workspace}}/build"
11-
INSTL_DIR : "${{github.workspace}}/../install-dir"
11+
INSTL_DIR : "${{github.workspace}}/install-dir"
1212

1313
jobs:
1414
analyze:
@@ -35,12 +35,12 @@ jobs:
3535
fetch-depth: 0
3636

3737
- name: Setup newer Python
38-
uses: actions/setup-python@8d9ed9ac5c53483de85588cdf95a591a75ab9f55 # v5.5.0
38+
uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
3939
with:
4040
python-version: "3.10"
4141

4242
- name: Initialize CodeQL
43-
uses: github/codeql-action/init@45775bd8235c68ba998cffa5171334d58593da47 # v3.28.15
43+
uses: github/codeql-action/init@28deaeda66b76a05916b6923827895f2b14ab387 # v3.28.16
4444
with:
4545
languages: cpp
4646

@@ -91,4 +91,4 @@ jobs:
9191
run: cmake --build ${{env.BUILD_DIR}} --config Release -j
9292

9393
- name: Perform CodeQL Analysis
94-
uses: github/codeql-action/analyze@45775bd8235c68ba998cffa5171334d58593da47 # v3.28.15
94+
uses: github/codeql-action/analyze@28deaeda66b76a05916b6923827895f2b14ab387 # v3.28.16

.github/workflows/reusable_coverage.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
sudo apt-get install -y lcov
3333
3434
- name: Download all coverage artifacts
35-
uses: actions/download-artifact@95815c38cf2ff2164869cbab79da8d1f422bc89e # v4.2.1
35+
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
3636
with:
3737
pattern: exports-coverage-*
3838
path: coverage

.github/workflows/reusable_dax.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ env:
2828
UMF_TESTS_FSDAX_PATH: "/mnt/pmem1/file"
2929
UMF_TESTS_FSDAX_PATH_2: "/mnt/pmem1/file_2"
3030
BUILD_DIR : "${{github.workspace}}/build"
31-
INSTL_DIR : "${{github.workspace}}/../install-dir"
31+
INSTL_DIR : "${{github.workspace}}/install-dir"
3232
COVERAGE_DIR : "${{github.workspace}}/coverage"
3333
COVERAGE_NAME : "exports-coverage-dax"
3434
DAX_TESTS: "./test/test_provider_file_memory ./test/test_provider_devdax_memory"

.github/workflows/reusable_fast.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ permissions:
88

99
env:
1010
BUILD_DIR : "${{github.workspace}}/build"
11-
INSTL_DIR : "${{github.workspace}}/../install-dir"
11+
INSTL_DIR : "${{github.workspace}}/install-dir"
1212

1313
jobs:
1414
FastBuild:

.github/workflows/reusable_gpu.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ permissions:
3131

3232
env:
3333
BUILD_DIR : "${{github.workspace}}/build"
34-
INSTL_DIR : "${{github.workspace}}/../install-dir"
34+
INSTL_DIR : "${{github.workspace}}/install-dir"
3535
COVERAGE_DIR : "${{github.workspace}}/coverage"
3636

3737
jobs:

.github/workflows/reusable_proxy_lib.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ permissions:
88

99
env:
1010
BUILD_DIR : "${{github.workspace}}/build"
11-
INSTL_DIR : "${{github.workspace}}/../install-dir"
11+
INSTL_DIR : "${{github.workspace}}/install-dir"
1212
COVERAGE_DIR : "${{github.workspace}}/coverage"
1313
COVERAGE_NAME : "exports-coverage-proxy"
1414

.github/workflows/reusable_sanitizers.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on: workflow_call
55

66
env:
77
BUILD_DIR : "${{github.workspace}}/build"
8-
INSTL_DIR : "${{github.workspace}}/../install-dir"
8+
INSTL_DIR : "${{github.workspace}}/install-dir"
99

1010
permissions:
1111
contents: read

0 commit comments

Comments
 (0)