Test umfd install

Author: PatKamin

.github/workflows/reusable_basic.yml

@@ -247,6 +247,13 @@ jobs:
             shared_library: 'ON'
             level_zero_provider: 'OFF'
             cuda_provider: 'OFF'
+          - os: 'windows-2022'
+            build_type: Release
+            compiler: {c: cl, cxx: cl}
+            shared_library: 'ON'
+            level_zero_provider: 'ON'
+            cuda_provider: 'ON'
+            umfd_lib: 'ON'
 
     runs-on: ${{matrix.os}}
 
@@ -289,6 +296,7 @@ jobs:
         -DUMF_BUILD_LEVEL_ZERO_PROVIDER=${{matrix.level_zero_provider}}
         -DUMF_BUILD_CUDA_PROVIDER=${{matrix.cuda_provider}}
         -DUMF_TESTS_FAIL_ON_SKIP=ON
+        -UMF_USE_DEBUG_POSTFIX=${{matrix.umfd_lib}}
 
     - name: Build UMF
       run: cmake --build ${{env.BUILD_DIR}} --config ${{matrix.build_type}} -j $Env:NUMBER_OF_PROCESSORS
@@ -307,6 +315,7 @@ jobs:
         ${{matrix.shared_library == 'ON' && '--proxy' || '' }}
         --umf-version ${{env.UMF_VERSION}}
         ${{ matrix.shared_library == 'ON' && '--shared-library' || ''}}
+        ${{ matrix.umfd_lib == 'ON' && '--umfd-lib' || ''}}
         
     - name: check /DEPENDENTLOADFLAG in umf.dll
       if: ${{matrix.shared_library == 'ON' && matrix.compiler.cxx == 'cl'}}

test/test_installation.py

@@ -41,6 +41,7 @@ def __init__(
         proxy: bool,
         pools: List[str],
         umf_version: Version,
+        umfd_lib: bool,
     ):
         self.workspace_dir = workspace_dir
         self.build_dir = build_dir
@@ -50,6 +51,7 @@ def __init__(
         self.proxy = proxy
         self.pools = pools
         self.umf_version = umf_version
+        self.umfd_lib = umfd_lib
         self.match_list = self._create_match_list()
 
     def _create_match_list(self) -> List[str]:
@@ -74,10 +76,14 @@ def _create_match_list(self) -> List[str]:
             lib_prefix = "lib"
 
         bin = []
-        if platform.system() == "Windows" and (self.shared_library or self.proxy):
+        if platform.system() == "Windows" and (
+            self.shared_library or self.proxy or self.umfd_lib
+        ):
             bin.append("bin")
             if self.shared_library:
                 bin.append("bin/umf.dll")
+                if self.umfd_lib:
+                    bin.append("bin/umfd.dll")
             if self.proxy:
                 bin.append("bin/umf_proxy.dll")
 
@@ -101,6 +107,8 @@ def _create_match_list(self) -> List[str]:
             lib.append(f"lib/{lib_prefix}{pool}.{lib_ext_static}")
         if self.shared_library:
             lib.append(f"lib/{lib_prefix}umf.{lib_ext_shared}")
+            if platform.system() == "Windows" and self.umfd_lib:
+                lib.append(f"lib/{lib_prefix}umfd.{lib_ext_shared}")
 
             if platform.system() == "Linux":
                 lib.append(
@@ -115,6 +123,9 @@ def _create_match_list(self) -> List[str]:
         else:
             lib.append(f"lib/{lib_prefix}umf.{lib_ext_static}")
 
+        if platform.system() == "Windows" and self.umfd_lib:
+            lib.append(f"lib/{lib_prefix}umfd.{lib_ext_shared}")
+
         if self.proxy:
             lib.append(f"lib/{lib_prefix}umf_proxy.{lib_ext_shared}")
 
@@ -283,6 +294,11 @@ def parse_arguments(self) -> argparse.Namespace:
             action="store",
             help="Current version of the UMF, e.g. 1.0.0",
         )
+        self.parser.add_argument(
+            "--umfd-lib",
+            action="store_true",
+            help="Add this argument if the UMF was built with the umfd library",
+        )
         return self.parser.parse_args()
 
     def run(self) -> None:
@@ -306,6 +322,7 @@ def run(self) -> None:
             self.args.proxy,
             pools,
             umf_version,
+            self.args.umfd_lib,
         )
 
         print("Installation test - BEGIN", flush=True)