Skip to content

Commit

Permalink
[UR] Enable hwloc in UMF linux build
Browse files Browse the repository at this point in the history
Update UR to statically link hwloc v2.9.3 both on Linux and Windows.
This will enable hwloc support in UMF on Linux.
  • Loading branch information
PatKamin committed Dec 31, 2024
1 parent 5e10744 commit f1fa58b
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 8 deletions.
9 changes: 3 additions & 6 deletions sycl/cmake/modules/FetchUnifiedRuntime.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,6 @@ option(SYCL_UR_USE_FETCH_CONTENT
set(SYCL_UR_SOURCE_DIR
"" CACHE PATH "Path to root of Unified Runtime repository")

option(SYCL_UMF_DISABLE_HWLOC
"Disable hwloc support in UMF" ON)

# Here we override the defaults to disable building tests from unified-runtime
set(UR_BUILD_EXAMPLES OFF CACHE BOOL "Build example applications." FORCE)
set(UR_BUILD_TESTS OFF CACHE BOOL "Build unit tests." FORCE)
Expand Down Expand Up @@ -124,10 +121,10 @@ if(SYCL_UR_USE_FETCH_CONTENT)
# to link statically on windows
if(WIN32)
set(UMF_BUILD_SHARED_LIBRARY OFF CACHE INTERNAL "Build UMF shared library")
set(UMF_LINK_HWLOC_STATICALLY ON CACHE INTERNAL "static HWLOC")
else()
set(UMF_DISABLE_HWLOC ${SYCL_UMF_DISABLE_HWLOC} CACHE INTERNAL "Disable hwloc for UMF")
endif()

set(UMF_LINK_HWLOC_STATICALLY ON CACHE INTERNAL "static HWLOC")
set(UMF_HWLOC_TAG hwloc-2.9.3 CACHE INTERNAL "hwloc version")

fetch_adapter_source(level_zero
${UNIFIED_RUNTIME_REPO}
Expand Down
2 changes: 0 additions & 2 deletions sycl/doc/GetStartedGuide.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,6 @@ and a wide range of compute accelerators such as GPU and FPGA.
* `python` - [Download](https://www.python.org/downloads/)
* `ninja` -
[Download](https://github.com/ninja-build/ninja/wiki/Pre-built-Ninja-packages)
* `hwloc` version 2.3 or later (Linux only)
* libhwloc-dev or hwloc-devel package on linux
* C++ compiler
* See LLVM's [host compiler toolchain requirements](https://github.com/intel/llvm/blob/sycl/llvm/docs/GettingStarted.rst#host-c-toolchain-both-compiler-and-standard-library)

Expand Down

0 comments on commit f1fa58b

Please sign in to comment.