Merge pull request #628 from pbalcer/disjoint-pool-gcc-7

[usm allocator] add linking with pthreads

Author: pbalcer

.github/workflows/cmake.yml

@@ -24,6 +24,9 @@ jobs:
             build_type: Release
             compiler: {c: clang, cxx: clang++}
             libbacktrace: '-DVAL_USE_LIBBACKTRACE_BACKTRACE=ON'
+          - os: 'ubuntu-20.04'
+            build_type: Release
+            compiler: {c: gcc-7, cxx: g++-7}
 
     runs-on: ${{matrix.os}}
 
@@ -35,6 +38,11 @@ jobs:
         sudo apt-get update
         sudo apt-get install -y doxygen ${{matrix.compiler.c}}
 
+    - name: Install g++-7
+      if: matrix.compiler.cxx == 'g++-7'
+      run: |
+        sudo apt-get install -y ${{matrix.compiler.cxx}}
+
     - name: Install pip packages
       run: pip install -r third_party/requirements.txt
 

CMakeLists.txt

@@ -96,8 +96,16 @@ if(UR_ENABLE_TRACING)
     set(XPTI_SOURCE_DIR ${xpti_SOURCE_DIR})
     set(XPTI_DIR ${xpti_SOURCE_DIR})
     set(XPTI_ENABLE_TESTS OFF CACHE INTERNAL "Turn off xptifw tests")
+
     FetchContentSparse_Declare(xptifw https://github.com/intel/llvm.git "sycl-nightly/20230304" "xptifw")
+
     FetchContent_MakeAvailable(xptifw)
+
+    check_cxx_compiler_flag("-Wno-error=maybe-uninitialized" HAS_MAYBE_UNINIT)
+    if (HAS_MAYBE_UNINIT)
+        target_compile_options(xptifw PRIVATE -Wno-error=maybe-uninitialized)
+    endif()
+
     set_target_properties(xptifw PROPERTIES
         LIBRARY_OUTPUT_DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
     )

source/common/uma_pools/CMakeLists.txt

@@ -14,4 +14,11 @@ target_link_libraries(disjoint_pool PRIVATE
     unified_memory_allocation
     ${PROJECT_NAME}::headers)
 
+if (UNIX)
+    set(CMAKE_THREAD_PREFER_PTHREAD TRUE)
+    set(THREADS_PREFER_PTHREAD_FLAG TRUE)
+    find_package(Threads REQUIRED)
+    target_link_libraries(disjoint_pool PRIVATE Threads::Threads)
+endif()
+
 target_include_directories(disjoint_pool PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})

test/unified_memory_allocation/memoryPool.hpp

@@ -117,8 +117,8 @@ TEST_P(umaMultiPoolTest, memoryTracking) {
         ASSERT_EQ(pool, expectedPool);
     }
 
-    for (auto [ptr, _1, _2] : ptrs) {
-        umaFree(ptr);
+    for (auto p : ptrs) {
+        umaFree(std::get<0>(p));
     }
 }