Skip to content

Commit c8eebe7

Browse files
bratpiorkabratpiorka
committed
add CUDA provider
1 parent 9f03d6b commit c8eebe7

30 files changed

+1416
-66
lines changed

‎.github/workflows/basic.yml

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ jobs:
2222
compiler: [{c: gcc, cxx: g++}]
2323
shared_library: ['OFF']
2424
level_zero_provider: ['ON']
25+
cuda_provider: ['ON']
2526
install_tbb: ['ON']
2627
disable_hwloc: ['OFF']
2728
link_hwloc_statically: ['OFF']
@@ -31,6 +32,7 @@ jobs:
3132
compiler: {c: gcc-7, cxx: g++-7}
3233
shared_library: 'OFF'
3334
level_zero_provider: 'ON'
35+
cuda_provider: 'ON'
3436
install_tbb: 'ON'
3537
disable_hwloc: 'OFF'
3638
link_hwloc_statically: 'OFF'
@@ -39,6 +41,7 @@ jobs:
3941
compiler: {c: clang, cxx: clang++}
4042
shared_library: 'OFF'
4143
level_zero_provider: 'ON'
44+
cuda_provider: 'ON'
4245
install_tbb: 'ON'
4346
disable_hwloc: 'OFF'
4447
link_hwloc_statically: 'OFF'
@@ -47,6 +50,7 @@ jobs:
4750
compiler: {c: gcc, cxx: g++}
4851
shared_library: 'ON'
4952
level_zero_provider: 'ON'
53+
cuda_provider: 'ON'
5054
install_tbb: 'ON'
5155
disable_hwloc: 'OFF'
5256
link_hwloc_statically: 'OFF'
@@ -55,15 +59,17 @@ jobs:
5559
compiler: {c: gcc, cxx: g++}
5660
shared_library: 'ON'
5761
level_zero_provider: 'ON'
62+
cuda_provider: 'ON'
5863
install_tbb: 'ON'
5964
disable_hwloc: 'OFF'
6065
link_hwloc_statically: 'OFF'
61-
# test level_zero_provider='OFF'
66+
# test level_zero_provider='OFF' and cuda_provider='OFF'
6267
- os: 'ubuntu-22.04'
6368
build_type: Release
6469
compiler: {c: gcc, cxx: g++}
6570
shared_library: 'OFF'
6671
level_zero_provider: 'OFF'
72+
cuda_provider: 'OFF'
6773
install_tbb: 'ON'
6874
disable_hwloc: 'OFF'
6975
link_hwloc_statically: 'OFF'
@@ -73,6 +79,7 @@ jobs:
7379
compiler: {c: icx, cxx: icpx}
7480
shared_library: 'ON'
7581
level_zero_provider: 'ON'
82+
cuda_provider: 'ON'
7683
install_tbb: 'ON'
7784
disable_hwloc: 'OFF'
7885
link_hwloc_statically: 'OFF'
@@ -82,6 +89,7 @@ jobs:
8289
compiler: {c: gcc, cxx: g++}
8390
shared_library: 'ON'
8491
level_zero_provider: 'ON'
92+
cuda_provider: 'ON'
8593
install_tbb: 'OFF'
8694
disable_hwloc: 'OFF'
8795
link_hwloc_statically: 'OFF'
@@ -90,6 +98,7 @@ jobs:
9098
compiler: {c: gcc, cxx: g++}
9199
shared_library: 'ON'
92100
level_zero_provider: 'ON'
101+
cuda_provider: 'ON'
93102
install_tbb: 'ON'
94103
disable_hwloc: 'ON'
95104
link_hwloc_statically: 'OFF'
@@ -98,6 +107,7 @@ jobs:
98107
compiler: {c: gcc, cxx: g++}
99108
shared_library: 'ON'
100109
level_zero_provider: 'ON'
110+
cuda_provider: 'ON'
101111
install_tbb: 'ON'
102112
disable_hwloc: 'OFF'
103113
link_hwloc_statically: 'ON'
@@ -149,6 +159,7 @@ jobs:
149159
-DCMAKE_C_COMPILER=${{matrix.compiler.c}}
150160
-DCMAKE_CXX_COMPILER=${{matrix.compiler.cxx}}
151161
-DUMF_BUILD_LEVEL_ZERO_PROVIDER=${{matrix.level_zero_provider}}
162+
-DUMF_BUILD_CUDA_PROVIDER=${{matrix.cuda_provider}}
152163
-DUMF_FORMAT_CODE_STYLE=OFF
153164
-DUMF_DEVELOPER_MODE=ON
154165
-DUMF_BUILD_LIBUMF_POOL_JEMALLOC=ON
@@ -195,23 +206,27 @@ jobs:
195206
compiler: [{c: cl, cxx: cl}]
196207
shared_library: ['ON', 'OFF']
197208
level_zero_provider: ['ON']
209+
cuda_provider: ['ON']
198210
include:
199211
- os: 'windows-2022'
200212
build_type: Release
201213
compiler: {c: clang-cl, cxx: clang-cl}
202214
shared_library: 'ON'
203215
level_zero_provider: 'ON'
216+
cuda_provider: 'ON'
204217
toolset: "-T ClangCL"
205218
- os: 'windows-2022'
206219
build_type: Release
207220
compiler: {c: cl, cxx: cl}
208221
shared_library: 'ON'
209222
level_zero_provider: 'ON'
223+
cuda_provider: 'ON'
210224
- os: 'windows-2022'
211225
build_type: Release
212226
compiler: {c: cl, cxx: cl}
213227
shared_library: 'ON'
214228
level_zero_provider: 'OFF'
229+
cuda_provider: 'OFF'
215230

216231
runs-on: ${{matrix.os}}
217232

@@ -247,6 +262,7 @@ jobs:
247262
-DUMF_BUILD_LIBUMF_POOL_DISJOINT=ON
248263
-DUMF_BUILD_LIBUMF_POOL_JEMALLOC=ON
249264
-DUMF_BUILD_LEVEL_ZERO_PROVIDER=${{matrix.level_zero_provider}}
265+
-DUMF_BUILD_CUDA_PROVIDER=${{matrix.cuda_provider}}
250266
-DUMF_TESTS_FAIL_ON_SKIP=ON
251267
252268
- name: Build UMF
@@ -305,6 +321,7 @@ jobs:
305321
-DUMF_BUILD_LIBUMF_POOL_DISJOINT=ON
306322
-DUMF_BUILD_LIBUMF_POOL_JEMALLOC=OFF
307323
-DUMF_BUILD_LEVEL_ZERO_PROVIDER=ON
324+
-DUMF_BUILD_CUDA_PROVIDER=ON
308325
-DUMF_TESTS_FAIL_ON_SKIP=ON
309326
-DUMF_LINK_HWLOC_STATICALLY=ON
310327
@@ -347,6 +364,7 @@ jobs:
347364
-DUMF_BUILD_LIBUMF_POOL_DISJOINT=ON
348365
-DUMF_BUILD_LIBUMF_POOL_JEMALLOC=OFF
349366
-DUMF_BUILD_LEVEL_ZERO_PROVIDER=ON
367+
-DUMF_BUILD_CUDA_PROVIDER=ON
350368
-DUMF_TESTS_FAIL_ON_SKIP=ON
351369
-DUMF_LINK_HWLOC_STATICALLY=ON
352370

‎.github/workflows/benchmarks.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ jobs:
6363
-DUMF_FORMAT_CODE_STYLE=OFF
6464
-DUMF_DEVELOPER_MODE=OFF
6565
-DUMF_BUILD_LEVEL_ZERO_PROVIDER=ON
66+
-DUMF_BUILD_CUDA_PROVIDER=ON
6667
-DUMF_BUILD_LIBUMF_POOL_DISJOINT=ON
6768
-DUMF_BUILD_LIBUMF_POOL_JEMALLOC=ON
6869

‎.github/workflows/codeql.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ jobs:
8484
-DUMF_DEVELOPER_MODE=ON
8585
-DUMF_BUILD_LIBUMF_POOL_JEMALLOC=ON
8686
-DUMF_BUILD_LEVEL_ZERO_PROVIDER=ON
87+
-DUMF_BUILD_CUDA_PROVIDER=ON
8788
-DUMF_TESTS_FAIL_ON_SKIP=ON
8889
8990
- name: Build

‎.github/workflows/fast.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ jobs:
106106
-DUMF_BUILD_TESTS=${{matrix.build_tests}}
107107
-DUMF_BUILD_EXAMPLES=ON
108108
-DUMF_BUILD_LEVEL_ZERO_PROVIDER=ON
109+
-DUMF_BUILD_CUDA_PROVIDER=ON
109110
-DUMF_TESTS_FAIL_ON_SKIP=ON
110111
-DUMF_BUILD_SHARED_LIBRARY=ON
111112
${{matrix.extra_build_options}}

‎.github/workflows/gpu.yml

Lines changed: 75 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
# This workflow builds and tests providers using GPU memory. It requires
2-
# "level_zero" labeled self-hosted runners installed on systems with the
3-
# appropriate GPU and drivers.
41
name: GPU
52

63
on: [workflow_call]
@@ -63,6 +60,7 @@ jobs:
6360
-DUMF_BUILD_LIBUMF_POOL_DISJOINT=ON
6461
-DUMF_BUILD_LIBUMF_POOL_JEMALLOC=ON
6562
-DUMF_BUILD_LEVEL_ZERO_PROVIDER=ON
63+
-DUMF_BUILD_CUDA_PROVIDER=OFF
6664
-DUMF_TESTS_FAIL_ON_SKIP=ON
6765
6866
- name: Configure build for Ubuntu
@@ -84,11 +82,17 @@ jobs:
8482
-DUMF_BUILD_LIBUMF_POOL_DISJOINT=ON
8583
-DUMF_BUILD_LIBUMF_POOL_JEMALLOC=ON
8684
-DUMF_BUILD_LEVEL_ZERO_PROVIDER=ON
85+
-DUMF_BUILD_CUDA_PROVIDER=OFF
8786
-DUMF_TESTS_FAIL_ON_SKIP=ON
8887
8988
- name: Build UMF
89+
if: matrix.os == 'Ubuntu'
9090
run: cmake --build ${{env.BUILD_DIR}} --config ${{env.BUILD_TYPE}} -j ${{matrix.number_of_processors}}
9191

92+
- name: Build UMF
93+
if: matrix.os == 'Windows'
94+
run: cmake --build ${{env.BUILD_DIR}} --config ${{env.BUILD_TYPE}} -j ${{matrix.number_of_processors}} -- /p:VcpkgEnableManifest=true
95+
9296
- name: Run tests
9397
working-directory: ${{env.BUILD_DIR}}
9498
run: ctest -C ${{env.BUILD_TYPE}} --output-on-failure --test-dir test
@@ -100,3 +104,71 @@ jobs:
100104
- name: Run benchmarks
101105
working-directory: ${{env.BUILD_DIR}}
102106
run: ctest --output-on-failure --test-dir benchmark -C ${{env.BUILD_TYPE}} --exclude-regex umf-bench-multithreaded
107+
108+
gpu-CUDA:
109+
name: Build
110+
env:
111+
BUILD_TYPE: Release
112+
# run only on upstream; forks will not have the HW
113+
# if: github.repository == 'oneapi-src/unified-memory-framework'
114+
strategy:
115+
matrix:
116+
shared_library: ['ON', 'OFF']
117+
# TODO add windows
118+
os: ['Ubuntu']
119+
include:
120+
- os: 'Ubuntu'
121+
compiler: {c: gcc, cxx: g++}
122+
number_of_processors: '$(nproc)'
123+
124+
runs-on: ["DSS-CUDA", "DSS-${{matrix.os}}"]
125+
steps:
126+
- name: Checkout
127+
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
128+
with:
129+
fetch-depth: 0
130+
131+
- name: Get information about platform
132+
if: matrix.os == 'Ubuntu'
133+
run: .github/scripts/get_system_info.sh
134+
135+
- name: Configure build for Ubuntu
136+
if: matrix.os == 'Ubuntu'
137+
run: >
138+
cmake -B ${{env.BUILD_DIR}}
139+
-DCMAKE_INSTALL_PREFIX="${{env.INSTL_DIR}}"
140+
-DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
141+
-DCMAKE_C_COMPILER=${{matrix.compiler.c}}
142+
-DCMAKE_CXX_COMPILER=${{matrix.compiler.cxx}}
143+
-DUMF_BUILD_SHARED_LIBRARY=${{matrix.shared_library}}
144+
-DUMF_BUILD_BENCHMARKS=ON
145+
-DUMF_BUILD_TESTS=ON
146+
-DUMF_BUILD_GPU_TESTS=ON
147+
-DUMF_BUILD_GPU_EXAMPLES=ON
148+
-DUMF_FORMAT_CODE_STYLE=OFF
149+
-DUMF_DEVELOPER_MODE=ON
150+
-DUMF_BUILD_LIBUMF_POOL_DISJOINT=ON
151+
-DUMF_BUILD_LIBUMF_POOL_JEMALLOC=ON
152+
-DUMF_BUILD_LEVEL_ZERO_PROVIDER=OFF
153+
-DUMF_BUILD_CUDA_PROVIDER=ON
154+
-DUMF_TESTS_FAIL_ON_SKIP=ON
155+
156+
- name: Build UMF
157+
if: matrix.os == 'Ubuntu'
158+
run: cmake --build ${{env.BUILD_DIR}} --config ${{env.BUILD_TYPE}} -j ${{matrix.number_of_processors}}
159+
160+
- name: Build UMF
161+
if: matrix.os == 'Windows'
162+
run: cmake --build ${{env.BUILD_DIR}} --config ${{env.BUILD_TYPE}} -j ${{matrix.number_of_processors}} -- /p:VcpkgEnableManifest=true
163+
164+
- name: Run tests
165+
working-directory: ${{env.BUILD_DIR}}
166+
run: ctest -C ${{env.BUILD_TYPE}} --output-on-failure --test-dir test
167+
168+
- name: Run examples
169+
working-directory: ${{env.BUILD_DIR}}
170+
run: ctest --output-on-failure --test-dir examples -C ${{env.BUILD_TYPE}}
171+
172+
- name: Run benchmarks
173+
working-directory: ${{env.BUILD_DIR}}
174+
run: ctest --output-on-failure --test-dir benchmark -C ${{env.BUILD_TYPE}} --exclude-regex umf-bench-multithreaded

‎.github/workflows/nightly.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ jobs:
7979
-DUMF_BUILD_LIBUMF_POOL_DISJOINT=ON
8080
-DUMF_BUILD_LIBUMF_POOL_JEMALLOC=ON
8181
-DUMF_BUILD_LEVEL_ZERO_PROVIDER=OFF
82+
-DUMF_BUILD_CUDA_PROVIDER=OFF
8283
-DUMF_USE_VALGRIND=1
8384
-DUMF_TESTS_FAIL_ON_SKIP=ON
8485

‎.github/workflows/pr_push.yml

Lines changed: 2 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ jobs:
3737
-DUMF_FORMAT_CODE_STYLE=ON
3838
-DUMF_BUILD_TESTS=OFF
3939
-DUMF_BUILD_LEVEL_ZERO_PROVIDER=OFF
40+
-DUMF_BUILD_CUDA_PROVIDER=OFF
4041
-DUMF_BUILD_LIBUMF_POOL_JEMALLOC=OFF
4142
4243
- name: Check C/C++ formatting
@@ -74,38 +75,6 @@ jobs:
7475
- name: Build the documentation
7576
working-directory: scripts
7677
run: python3 generate_docs.py
77-
78-
Spellcheck:
79-
uses: ./.github/workflows/spellcheck.yml
80-
FastBuild:
81-
name: Fast builds
82-
needs: [Spellcheck, CodeStyle]
83-
uses: ./.github/workflows/fast.yml
84-
Build:
85-
name: Basic builds
86-
needs: [FastBuild]
87-
uses: ./.github/workflows/basic.yml
88-
DevDax:
89-
needs: [FastBuild]
90-
uses: ./.github/workflows/devdax.yml
91-
Sanitizers:
92-
needs: [FastBuild]
93-
uses: ./.github/workflows/sanitizers.yml
94-
Qemu:
95-
needs: [FastBuild]
96-
uses: ./.github/workflows/qemu.yml
97-
Benchmarks:
98-
needs: [Build]
99-
uses: ./.github/workflows/benchmarks.yml
100-
ProxyLib:
101-
needs: [Build]
102-
uses: ./.github/workflows/proxy_lib.yml
78+
10379
GPU:
104-
needs: [Build]
10580
uses: ./.github/workflows/gpu.yml
106-
Valgrind:
107-
needs: [Build]
108-
uses: ./.github/workflows/valgrind.yml
109-
MultiNuma:
110-
needs: [Build]
111-
uses: ./.github/workflows/multi_numa.yml

‎.github/workflows/sanitizers.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ jobs:
5555
-DCMAKE_C_COMPILER=${{matrix.compiler.c}}
5656
-DCMAKE_CXX_COMPILER=${{matrix.compiler.cxx}}
5757
-DUMF_BUILD_LEVEL_ZERO_PROVIDER=ON
58+
-DUMF_BUILD_CUDA_PROVIDER=ON
5859
-DUMF_FORMAT_CODE_STYLE=OFF
5960
-DUMF_DEVELOPER_MODE=ON
6061
-DUMF_BUILD_LIBUMF_POOL_JEMALLOC=ON
@@ -132,6 +133,7 @@ jobs:
132133
-DUMF_USE_ASAN=${{matrix.sanitizers.asan}}
133134
-DUMF_BUILD_EXAMPLES=ON
134135
-DUMF_BUILD_LEVEL_ZERO_PROVIDER=OFF
136+
-DUMF_BUILD_CUDA_PROVIDER=OFF
135137
-DUMF_TESTS_FAIL_ON_SKIP=ON
136138
137139
- name: Build UMF

‎.github/workflows/valgrind.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ jobs:
3535
-DUMF_BUILD_LIBUMF_POOL_DISJOINT=ON
3636
-DUMF_BUILD_LIBUMF_POOL_JEMALLOC=ON
3737
-DUMF_BUILD_LEVEL_ZERO_PROVIDER=OFF
38+
-DUMF_BUILD_CUDA_PROVIDER=OFF
3839
-DUMF_USE_VALGRIND=1
3940
-DUMF_TESTS_FAIL_ON_SKIP=ON
4041

‎CMakeLists.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ find_package(PkgConfig)
3636
# Build Options
3737
option(UMF_BUILD_SHARED_LIBRARY "Build UMF as shared library" OFF)
3838
option(UMF_BUILD_LEVEL_ZERO_PROVIDER "Build Level Zero memory provider" ON)
39+
option(UMF_BUILD_CUDA_PROVIDER "Build CUDA memory provider" ON)
3940
option(UMF_BUILD_LIBUMF_POOL_DISJOINT
4041
"Build the libumf_pool_disjoint static library" OFF)
4142
option(UMF_BUILD_LIBUMF_POOL_JEMALLOC
@@ -417,6 +418,11 @@ if(UMF_BUILD_LEVEL_ZERO_PROVIDER)
417418
add_optional_symbol(umfLevelZeroMemoryProviderOps)
418419
endif()
419420

421+
# Conditional configuration for CUDA provider
422+
if(UMF_BUILD_CUDA_PROVIDER)
423+
add_optional_symbol(umfCUDAMemoryProviderOps)
424+
endif()
425+
420426
if(NOT UMF_DISABLE_HWLOC)
421427
add_optional_symbol(umfOsMemoryProviderOps)
422428
if(LINUX)

0 commit comments

Comments
 (0)