Skip to content

Commit 07b22ab

Browse files
bratpiorkabratpiorka
committed
a
1 parent 0a63bbd commit 07b22ab

File tree

3 files changed

+14
-350
lines changed

3 files changed

+14
-350
lines changed

‎.github/workflows/nightly.yml

Lines changed: 4 additions & 267 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
# Various non-standard tests, requiring e.g. longer run
22
name: Nightly
33

4-
# This job is run at 04:00 UTC every day or on demand.
54
on:
6-
workflow_dispatch:
7-
schedule:
8-
- cron: '0 4 * * *'
5+
push:
6+
branches-ignore:
7+
- 'dependabot/**'
8+
pull_request:
99

1010
permissions:
1111
contents: read
@@ -15,98 +15,6 @@ env:
1515
INSTALL_DIR: "${{github.workspace}}/build/install"
1616

1717
jobs:
18-
fuzz-test:
19-
name: Fuzz test
20-
strategy:
21-
fail-fast: false
22-
matrix:
23-
build_type: [Debug, Release]
24-
compiler: [{c: clang, cxx: clang++}]
25-
26-
runs-on: ubuntu-latest
27-
28-
steps:
29-
- name: Checkout repository
30-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
31-
with:
32-
fetch-depth: 0
33-
34-
- name: Install apt packages
35-
run: |
36-
sudo apt-get update
37-
sudo apt-get install -y cmake hwloc libhwloc-dev libnuma-dev libtbb-dev
38-
39-
- name: Find Clang fuzzer lib
40-
run: |
41-
CLANG_LIBS_DIR=$(find /usr/lib -name "libclang_rt.fuzzer_no_main-x86_64.a" -exec dirname {} \; | head -n 1)
42-
echo "CLANG_LIBS_DIR=${CLANG_LIBS_DIR}" >> $GITHUB_ENV
43-
44-
- name: Configure CMake
45-
run: >
46-
cmake
47-
-B ${{github.workspace}}/build
48-
-DCMAKE_PREFIX_PATH=${{env.CLANG_LIBS_DIR}}
49-
-DCMAKE_BUILD_TYPE=${{matrix.build_type}}
50-
-DCMAKE_C_COMPILER=${{matrix.compiler.c}}
51-
-DCMAKE_CXX_COMPILER=${{matrix.compiler.cxx}}
52-
-DUMF_BUILD_SHARED_LIBRARY=ON
53-
-DUMF_TESTS_FAIL_ON_SKIP=ON
54-
-DUMF_DEVELOPER_MODE=ON
55-
-DUMF_BUILD_FUZZTESTS=ON
56-
57-
- name: Build
58-
run: cmake --build ${{github.workspace}}/build --config ${{matrix.build_type}} --verbose -j$(nproc)
59-
60-
- name: Run regular tests
61-
working-directory: ${{github.workspace}}/build
62-
run: ctest -C ${{matrix.build_type}} --output-on-failure -E "fuzz|test_init_teardown"
63-
64-
- name: Run regular tests with proxy library
65-
working-directory: ${{env.BUILD_DIR}}
66-
run: LD_PRELOAD=./lib/libumf_proxy.so ctest -C ${{matrix.build_type}} --output-on-failure -E "fuzz|test_init_teardown"
67-
68-
- name: Fuzz long test
69-
working-directory: ${{github.workspace}}/build
70-
run: ctest -C ${{matrix.build_type}} --output-on-failure --verbose -L "fuzz-long"
71-
72-
valgrind:
73-
name: Valgrind
74-
strategy:
75-
fail-fast: false
76-
matrix:
77-
tool: ['memcheck', 'drd', 'helgrind']
78-
runs-on: ubuntu-latest
79-
80-
steps:
81-
- name: Checkout repository
82-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
83-
with:
84-
fetch-depth: 0
85-
86-
- name: Install apt packages
87-
run: |
88-
sudo apt-get update
89-
sudo apt-get install -y cmake hwloc libhwloc-dev libnuma-dev libtbb-dev valgrind
90-
91-
- name: Configure CMake
92-
run: >
93-
cmake
94-
-B ${{github.workspace}}/build
95-
-DCMAKE_BUILD_TYPE=Debug
96-
-DUMF_FORMAT_CODE_STYLE=OFF
97-
-DUMF_DEVELOPER_MODE=ON
98-
-DUMF_BUILD_LIBUMF_POOL_JEMALLOC=ON
99-
-DUMF_BUILD_LEVEL_ZERO_PROVIDER=OFF
100-
-DUMF_BUILD_CUDA_PROVIDER=OFF
101-
-DUMF_USE_VALGRIND=1
102-
-DUMF_TESTS_FAIL_ON_SKIP=ON
103-
104-
- name: Build
105-
run: cmake --build ${{github.workspace}}/build --config Debug -j$(nproc)
106-
107-
- name: Run tests under valgrind
108-
run: ${{github.workspace}}/test/test_valgrind.sh ${{github.workspace}} ${{github.workspace}}/build ${{matrix.tool}}
109-
11018
Windows-generators:
11119
name: Windows ${{matrix.generator}} generator
11220
strategy:
@@ -199,174 +107,3 @@ jobs:
199107
${{ matrix.shared_library == 'ON' && '--proxy --shared-library' || '' }}
200108
${{ matrix.umfd_lib == 'ON' && '--umfd-lib' || ''}}
201109
${{ matrix.static_hwloc == 'ON' && '--hwloc' || '' }}
202-
203-
icx:
204-
name: ICX
205-
env:
206-
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"
207-
strategy:
208-
matrix:
209-
os: ['windows-2019', 'windows-2022']
210-
build_type: [Debug]
211-
compiler: [{c: icx, cxx: icx}]
212-
shared_library: ['ON', 'OFF']
213-
include:
214-
- os: windows-2022
215-
build_type: Release
216-
compiler: {c: icx, cxx: icx}
217-
shared_library: 'ON'
218-
219-
runs-on: ${{matrix.os}}
220-
221-
steps:
222-
- name: Checkout
223-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
224-
with:
225-
fetch-depth: 0
226-
227-
- name: Initialize vcpkg
228-
uses: lukka/run-vcpkg@5e0cab206a5ea620130caf672fce3e4a6b5666a1 # v11.5
229-
with:
230-
vcpkgGitCommitId: ea2a964f9303270322cf3f2d51c265ba146c422d # 1.04.2025
231-
vcpkgDirectory: ${{env.BUILD_DIR}}/vcpkg
232-
vcpkgJsonGlob: '**/vcpkg.json'
233-
234-
- name: Install dependencies
235-
run: vcpkg install --triplet x64-windows
236-
237-
- name: Install Ninja
238-
uses: seanmiddleditch/gha-setup-ninja@3b1f8f94a2f8254bd26914c4ab9474d4f0015f67 # v6
239-
240-
- name: Download icx compiler
241-
env:
242-
# Link source: https://www.intel.com/content/www/us/en/developer/tools/oneapi/dpc-compiler-download.html
243-
CMPLR_LINK: "https://registrationcenter-download.intel.com/akdlm/IRC_NAS/15a35578-2f9a-4f39-804b-3906e0a5f8fc/w_dpcpp-cpp-compiler_p_2024.2.1.83_offline.exe"
244-
run: |
245-
Invoke-WebRequest -Uri "${{ env.CMPLR_LINK }}" -OutFile compiler_install.exe
246-
247-
- name: Install icx compiler
248-
shell: cmd
249-
run: |
250-
start /b /wait .\compiler_install.exe -s -x -f extracted --log extract.log
251-
extracted\bootstrapper.exe -s --action install --eula=accept -p=NEED_VS2017_INTEGRATION=0 ^
252-
-p=NEED_VS2019_INTEGRATION=0 -p=NEED_VS2022_INTEGRATION=0 --log-dir=.
253-
254-
- name: Configure build
255-
shell: cmd
256-
run: |
257-
call "C:\Program Files (x86)\Intel\oneAPI\setvars.bat"
258-
call "C:\Program Files (x86)\Intel\oneAPI\setvars-vcvarsall.bat"
259-
cmake ^
260-
-B ${{env.BUILD_DIR}} ^
261-
-DCMAKE_PREFIX_PATH="${{env.VCPKG_PATH}}" ^
262-
-DCMAKE_C_COMPILER=${{matrix.compiler.c}} ^
263-
-DCMAKE_CXX_COMPILER=${{matrix.compiler.cxx}} ^
264-
-G Ninja ^
265-
-DUMF_BUILD_SHARED_LIBRARY=${{matrix.shared_library}} ^
266-
-DUMF_FORMAT_CODE_STYLE=OFF ^
267-
-DUMF_DEVELOPER_MODE=ON ^
268-
-DUMF_BUILD_LIBUMF_POOL_JEMALLOC=ON ^
269-
-DUMF_BUILD_LEVEL_ZERO_PROVIDER=ON ^
270-
-DUMF_BUILD_CUDA_PROVIDER=ON ^
271-
-DUMF_TESTS_FAIL_ON_SKIP=ON
272-
273-
- name: Build UMF
274-
shell: cmd
275-
run: |
276-
call "C:\Program Files (x86)\Intel\oneAPI\setvars.bat"
277-
call "C:\Program Files (x86)\Intel\oneAPI\setvars-vcvarsall.bat"
278-
cmake --build ${{env.BUILD_DIR}} --config ${{matrix.build_type}} -j %NUMBER_OF_PROCESSORS%
279-
280-
- name: Run tests
281-
shell: cmd
282-
working-directory: ${{env.BUILD_DIR}}
283-
run: |
284-
call "C:\Program Files (x86)\Intel\oneAPI\setvars.bat"
285-
call "C:\Program Files (x86)\Intel\oneAPI\setvars-vcvarsall.bat"
286-
ctest -C ${{matrix.build_type}} --output-on-failure --test-dir test
287-
288-
# Scenarios where UMF_LINK_HWLOC_STATICALLY is set to OFF and hwloc is not installed in the system
289-
# The hwloc library is fetched implicitly
290-
hwloc-fallback:
291-
name: "Fallback to static hwloc build"
292-
strategy:
293-
matrix:
294-
include:
295-
- os: 'ubuntu-latest'
296-
build_type: Release
297-
number_of_processors: '$(nproc)'
298-
- os: 'windows-latest'
299-
build_type: Release
300-
number_of_processors: '$Env:NUMBER_OF_PROCESSORS'
301-
302-
runs-on: ${{matrix.os}}
303-
304-
steps:
305-
- name: Install dependencies
306-
if: matrix.os == 'ubuntu-latest'
307-
run: sudo apt-get install -y libnuma-dev
308-
309-
- name: Checkout
310-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
311-
with:
312-
fetch-depth: 0
313-
314-
- name: Configure build
315-
run: >
316-
cmake
317-
-B ${{env.BUILD_DIR}}
318-
-DCMAKE_BUILD_TYPE=${{matrix.build_type}}
319-
-DUMF_BUILD_SHARED_LIBRARY=ON
320-
-DUMF_BUILD_EXAMPLES=OFF
321-
-DUMF_DEVELOPER_MODE=ON
322-
-DUMF_LINK_HWLOC_STATICALLY=OFF
323-
-DUMF_TESTS_FAIL_ON_SKIP=ON
324-
325-
- name: Build UMF
326-
run: >
327-
cmake
328-
--build ${{env.BUILD_DIR}}
329-
--config ${{matrix.build_type}}
330-
-j ${{matrix.number_of_processors}}
331-
332-
- name: Run tests
333-
working-directory: ${{env.BUILD_DIR}}
334-
run: ctest -C ${{matrix.build_type}} --output-on-failure --test-dir test
335-
336-
L0:
337-
uses: ./.github/workflows/reusable_gpu.yml
338-
with:
339-
provider: "LEVEL_ZERO"
340-
runner: "L0"
341-
L0-BMG:
342-
uses: ./.github/workflows/reusable_gpu.yml
343-
with:
344-
provider: "LEVEL_ZERO"
345-
runner: "L0-BMG"
346-
os: "['Ubuntu']"
347-
CUDA:
348-
uses: ./.github/workflows/reusable_gpu.yml
349-
with:
350-
provider: "CUDA"
351-
runner: "CUDA"
352-
353-
# Full execution of QEMU tests
354-
QEMU:
355-
uses: ./.github/workflows/reusable_qemu.yml
356-
with:
357-
short_run: false
358-
# Beside the 2 LTS Ubuntu, we also test this on the latest Ubuntu - to be updated
359-
# every 6 months, so we verify the latest version of packages (compilers, etc.).
360-
os: "['ubuntu-22.04', 'ubuntu-24.04', 'ubuntu-24.10']"
361-
362-
Benchmarks:
363-
uses: ./.github/workflows/reusable_benchmarks.yml
364-
permissions:
365-
contents: write
366-
pull-requests: write
367-
with:
368-
pr_no: '0'
369-
bench_script_params: '--save Baseline_PVC'
370-
371-
SYCL:
372-
uses: ./.github/workflows/reusable_sycl.yml

‎.github/workflows/pr_push.yml

Lines changed: 0 additions & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -18,86 +18,3 @@ permissions:
1818
jobs:
1919
CodeChecks:
2020
uses: ./.github/workflows/reusable_checks.yml
21-
FastBuild:
22-
name: Fast builds
23-
needs: [CodeChecks]
24-
uses: ./.github/workflows/reusable_fast.yml
25-
Build:
26-
name: Basic builds
27-
needs: [FastBuild]
28-
uses: ./.github/workflows/reusable_basic.yml
29-
DevDax:
30-
needs: [FastBuild]
31-
uses: ./.github/workflows/reusable_dax.yml
32-
MultiNuma:
33-
needs: [FastBuild]
34-
uses: ./.github/workflows/reusable_multi_numa.yml
35-
L0:
36-
needs: [Build]
37-
uses: ./.github/workflows/reusable_gpu.yml
38-
with:
39-
provider: "LEVEL_ZERO"
40-
runner: "L0"
41-
shared_lib: "['ON']"
42-
L0-BMG:
43-
needs: [Build]
44-
uses: ./.github/workflows/reusable_gpu.yml
45-
with:
46-
provider: "LEVEL_ZERO"
47-
runner: "L0-BMG"
48-
shared_lib: "['ON']"
49-
os: "['Ubuntu']"
50-
CUDA:
51-
needs: [Build]
52-
uses: ./.github/workflows/reusable_gpu.yml
53-
with:
54-
provider: "CUDA"
55-
runner: "CUDA"
56-
shared_lib: "['ON']"
57-
Sanitizers:
58-
needs: [FastBuild]
59-
uses: ./.github/workflows/reusable_sanitizers.yml
60-
QEMU:
61-
needs: [FastBuild]
62-
uses: ./.github/workflows/reusable_qemu.yml
63-
with:
64-
short_run: true
65-
ProxyLib:
66-
needs: [Build]
67-
uses: ./.github/workflows/reusable_proxy_lib.yml
68-
Valgrind:
69-
needs: [Build]
70-
uses: ./.github/workflows/reusable_valgrind.yml
71-
Coverage:
72-
# total coverage (on upstream only)
73-
if: github.repository == 'oneapi-src/unified-memory-framework'
74-
needs: [Build, DevDax, L0, CUDA, MultiNuma, QEMU, ProxyLib]
75-
uses: ./.github/workflows/reusable_coverage.yml
76-
secrets: inherit
77-
with:
78-
trigger: "${{github.event_name}}"
79-
Coverage_partial:
80-
# partial coverage (on forks)
81-
if: github.repository != 'oneapi-src/unified-memory-framework'
82-
needs: [Build, QEMU, ProxyLib]
83-
uses: ./.github/workflows/reusable_coverage.yml
84-
CodeQL:
85-
needs: [Build]
86-
permissions:
87-
contents: read
88-
security-events: write
89-
uses: ./.github/workflows/reusable_codeql.yml
90-
Trivy:
91-
needs: [Build]
92-
permissions:
93-
contents: read
94-
security-events: write
95-
uses: ./.github/workflows/reusable_trivy.yml
96-
Compatibility:
97-
needs: [Build]
98-
uses: ./.github/workflows/reusable_compatibility.yml
99-
strategy:
100-
matrix:
101-
tag: ["v0.11.0-rc1"]
102-
with:
103-
tag: ${{matrix.tag}}

‎test/test_installation.py

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,16 @@ def install_umf(self) -> None:
183183

184184
install_cmd = f"cmake --build {self.build_dir} --config {self.build_type.title()} --target install"
185185

186+
cmake_cache_file = self.build_dir / "CMakeCache.txt"
187+
if cmake_cache_file.exists():
188+
with cmake_cache_file.open() as f:
189+
for line in f:
190+
if "CMAKE_GENERATOR:INTERNAL" in line:
191+
print(line)
192+
if "CMAKE_GENERATOR:INTERNAL=Ninja" in line:
193+
install_cmd = f"cmake --install {self.build_dir} --config {self.build_type.title()} --prefix {self.install_dir}"
194+
break
195+
186196
try:
187197
print(f"Running command: {install_cmd}", flush=True)
188198
subprocess.run(install_cmd.split()).check_returncode() # nosec B603

0 commit comments

Comments
 (0)