Merge branch 'test_L0_win' of https://github.com/szadam/unified-memory-framework into test_L0_win

Author: szadam

.github/workflows/gpu.yml

@@ -23,7 +23,7 @@ jobs:
             compiler: [{c: gcc, cxx: g++}]
           - os: 'Windows'
             compiler: [{c: cl, cxx: cl}]
-            extra_arg: "-DCMAKE_TOOLCHAIN_FILE=C:/Users/Administrator/repo/vpckg/scripts/buildsystems/vpckg.cmake"
+            extra_arg: "-DCMAKE_TOOLCHAIN_FILE=${{github.workspace}}/build/vcpkg/scripts/buildsystems/vpckg.cmake"
 
     runs-on: ["DSS-LEVEL_ZERO", "DSS-${{matrix.os}}"]
 
@@ -35,6 +35,20 @@ jobs:
         if: matrix.os == 'Ubuntu'
         run: .github/scripts/get_system_info.sh
 
+      - name: Initialize vcpkg
+        if: matrix.os == 'Windows'
+        uses: lukka/run-vcpkg@5e0cab206a5ea620130caf672fce3e4a6b5666a1 # v11.5
+        with:
+          vcpkgGitCommitId: 3dd44b931481d7a8e9ba412621fa810232b66289
+          vcpkgDirectory: ${{github.workspace}}/build/vcpkg
+          vcpkgJsonGlob: '**/vcpkg.json'
+
+      - name: Install dependencies
+        if: matrix.os == 'Windows'
+        run: |
+          vcpkg install
+          vpckg integrate install
+      
       - name: Configure build
         run: >
           cmake

CMakeLists.txt

@@ -254,6 +254,17 @@ if(UMF_BUILD_EXAMPLES)
     add_subdirectory(examples)
 endif()
 
+# Conditional configuration for Level Zero provider
+if(UMF_BUILD_LEVEL_ZERO_PROVIDER)
+    set(OPTIONAL_SYMBOLS "umfLevelZeroMemoryProviderOps")
+else()
+    set(OPTIONAL_SYMBOLS "")
+endif()
+
+# Configure the DEF file based on whether Level Zero provider is built
+configure_file("${CMAKE_CURRENT_SOURCE_DIR}/src/libumf.def"
+               "${CMAKE_CURRENT_BINARY_DIR}/src/libumf.def" @ONLY)
+
 if(UMF_FORMAT_CODE_STYLE)
     find_program(CLANG_FORMAT NAMES clang-format-15 clang-format-15.0
                                     clang-format)

README.md

@@ -136,7 +136,7 @@ A memory provider that provides memory from an operating system.
 Required packages for tests (Linux-only yet):
    - libnuma-dev
 
-#### Level Zero memory provider (Linux-only yet)
+#### Level Zero memory provider
 
 A memory provider that provides memory from L0 device.
 
@@ -147,11 +147,10 @@ A memory provider that provides memory from L0 device.
 
 Additionally, required for tests:
 
-3) Linux OS
-4) The `UMF_BUILD_GPU_TESTS` option turned `ON`
-5) System with Level Zero compatible GPU
-6) Required packages:
-   - liblevel-zero-dev
+3) The `UMF_BUILD_GPU_TESTS` option turned `ON`
+4) System with Level Zero compatible GPU
+5) Required packages:
+   - liblevel-zero-dev (Linux) or level-zero-sdk (Windows)
 
 ### Memory pool managers
 

src/CMakeLists.txt

@@ -106,7 +106,7 @@ if(UMF_BUILD_SHARED_LIBRARY)
         SRCS ${UMF_SOURCES}
         LIBS ${UMF_LIBS}
         LINUX_MAP_FILE ${CMAKE_CURRENT_SOURCE_DIR}/libumf.map
-        WINDOWS_DEF_FILE ${CMAKE_CURRENT_SOURCE_DIR}/libumf.def)
+        WINDOWS_DEF_FILE ${CMAKE_CURRENT_BINARY_DIR}/libumf.def)
     set(UMF_PRIVATE_COMPILE_DEFINITIONS ${UMF_PRIVATE_COMPILE_DEFINITIONS}
                                         "UMF_SHARED_LIBRARY")
     set_target_properties(umf PROPERTIES RUNTIME_OUTPUT_DIRECTORY

src/libumf.def

@@ -14,7 +14,6 @@ EXPORTS
     umfFree
     umfGetIPCHandle
     umfGetLastFailedMemoryProvider
-    umfLevelZeroMemoryProviderOps
     umfMemoryProviderAlloc
     umfMemoryProviderAllocationMerge
     umfMemoryProviderAllocationSplit
@@ -50,3 +49,4 @@ EXPORTS
     umfProxyPoolOps
     umfPutIPCHandle
     umfOsMemoryProviderOps
+    @OPTIONAL_SYMBOLS@