Skip to content

Commit c2e9855

Browse files
committed
Test umfd install
1 parent 807612e commit c2e9855

File tree

2 files changed

+24
-1
lines changed

2 files changed

+24
-1
lines changed

.github/workflows/reusable_basic.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -247,6 +247,13 @@ jobs:
247247
shared_library: 'ON'
248248
level_zero_provider: 'OFF'
249249
cuda_provider: 'OFF'
250+
- os: 'windows-2022'
251+
build_type: Release
252+
compiler: {c: cl, cxx: cl}
253+
shared_library: 'ON'
254+
level_zero_provider: 'ON'
255+
cuda_provider: 'ON'
256+
umfd_lib: 'ON'
250257

251258
runs-on: ${{matrix.os}}
252259

@@ -289,6 +296,7 @@ jobs:
289296
-DUMF_BUILD_LEVEL_ZERO_PROVIDER=${{matrix.level_zero_provider}}
290297
-DUMF_BUILD_CUDA_PROVIDER=${{matrix.cuda_provider}}
291298
-DUMF_TESTS_FAIL_ON_SKIP=ON
299+
-UMF_USE_DEBUG_POSTFIX=${{matrix.umfd_lib}}
292300
293301
- name: Build UMF
294302
run: cmake --build ${{env.BUILD_DIR}} --config ${{matrix.build_type}} -j $Env:NUMBER_OF_PROCESSORS

test/test_installation.py

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ def __init__(
4141
proxy: bool,
4242
pools: List[str],
4343
umf_version: Version,
44+
umfd: bool,
4445
):
4546
self.workspace_dir = workspace_dir
4647
self.build_dir = build_dir
@@ -50,6 +51,7 @@ def __init__(
5051
self.proxy = proxy
5152
self.pools = pools
5253
self.umf_version = umf_version
54+
self.umfd = umfd
5355
self.match_list = self._create_match_list()
5456

5557
def _create_match_list(self) -> List[str]:
@@ -74,10 +76,12 @@ def _create_match_list(self) -> List[str]:
7476
lib_prefix = "lib"
7577

7678
bin = []
77-
if platform.system() == "Windows" and (self.shared_library or self.proxy):
79+
if platform.system() == "Windows" and (self.shared_library or self.proxy or self.umfd):
7880
bin.append("bin")
7981
if self.shared_library:
8082
bin.append("bin/umf.dll")
83+
if self.umfd:
84+
bin.append("bin/umfd.dll")
8185
if self.proxy:
8286
bin.append("bin/umf_proxy.dll")
8387

@@ -101,6 +105,8 @@ def _create_match_list(self) -> List[str]:
101105
lib.append(f"lib/{lib_prefix}{pool}.{lib_ext_static}")
102106
if self.shared_library:
103107
lib.append(f"lib/{lib_prefix}umf.{lib_ext_shared}")
108+
if platform.system() == "Windows" and self.umfd:
109+
lib.append(f"lib/{lib_prefix}umfd.{lib_ext_shared}")
104110

105111
if platform.system() == "Linux":
106112
lib.append(
@@ -115,6 +121,9 @@ def _create_match_list(self) -> List[str]:
115121
else:
116122
lib.append(f"lib/{lib_prefix}umf.{lib_ext_static}")
117123

124+
if platform.system() == "Windows" and self.umfd:
125+
lib.append(f"lib/{lib_prefix}umfd.{lib_ext_shared}")
126+
118127
if self.proxy:
119128
lib.append(f"lib/{lib_prefix}umf_proxy.{lib_ext_shared}")
120129

@@ -283,6 +292,11 @@ def parse_arguments(self) -> argparse.Namespace:
283292
action="store",
284293
help="Current version of the UMF, e.g. 1.0.0",
285294
)
295+
self.parser.add_argument(
296+
"--umfd",
297+
action="store_true",
298+
help="Add this argument if the UMF was built with the umfd library",
299+
)
286300
return self.parser.parse_args()
287301

288302
def run(self) -> None:
@@ -306,6 +320,7 @@ def run(self) -> None:
306320
self.args.proxy,
307321
pools,
308322
umf_version,
323+
self.args.umfd,
309324
)
310325

311326
print("Installation test - BEGIN", flush=True)

0 commit comments

Comments
 (0)