Skip to content

Commit ca2af37

Browse files
authored
[UR] Remove UMF_DISABLE_HWLOC flag (#17676)
This flag will be removed from UMF. Either `hwloc` installed in the system is used or it's fetched if not found. Ref.: #15261
1 parent 1203597 commit ca2af37

File tree

2 files changed

+1
-4
lines changed

2 files changed

+1
-4
lines changed

.github/workflows/ur-source-checks.yml

+1-2
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
if: matrix.os == 'ubuntu-22.04'
3434
run: |
3535
sudo apt-get update
36-
sudo apt-get install -y doxygen
36+
sudo apt-get install -y doxygen libhwloc-dev
3737
3838
- name: "[Win] Install doxygen"
3939
if: matrix.os == 'windows-2022'
@@ -53,7 +53,6 @@ jobs:
5353
-DCMAKE_BUILD_TYPE=Debug
5454
-DUR_BUILD_TESTS=OFF
5555
-DUR_FORMAT_CPP_STYLE=ON
56-
-DUMF_DISABLE_HWLOC=ON
5756
5857
# Verifying license should be enough on a single OS
5958
- name: Verify that each source file contains a license

sycl/cmake/modules/FetchUnifiedRuntime.cmake

-2
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,6 @@ if(IS_DIRECTORY "${UR_INTREE_SOURCE_DIR}")
8787
if(WIN32)
8888
set(UMF_BUILD_SHARED_LIBRARY OFF CACHE INTERNAL "Build UMF shared library")
8989
set(UMF_LINK_HWLOC_STATICALLY ON CACHE INTERNAL "static HWLOC")
90-
else()
91-
set(UMF_DISABLE_HWLOC ${SYCL_UMF_DISABLE_HWLOC} CACHE INTERNAL "Disable hwloc for UMF")
9290
endif()
9391
add_subdirectory(${UNIFIED_RUNTIME_SOURCE_DIR} ${UR_INTREE_BINARY_DIR})
9492
elseif(SYCL_UR_USE_FETCH_CONTENT)

0 commit comments

Comments
 (0)