From f1fa58b46a6269e7f61d39cc4a6d9cd2dfa02ed3 Mon Sep 17 00:00:00 2001 From: Patryk Kaminski Date: Tue, 3 Sep 2024 08:47:37 +0200 Subject: [PATCH] [UR] Enable hwloc in UMF linux build Update UR to statically link hwloc v2.9.3 both on Linux and Windows. This will enable hwloc support in UMF on Linux. --- sycl/cmake/modules/FetchUnifiedRuntime.cmake | 9 +++------ sycl/doc/GetStartedGuide.md | 2 -- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/sycl/cmake/modules/FetchUnifiedRuntime.cmake b/sycl/cmake/modules/FetchUnifiedRuntime.cmake index 72841724fa01d..75e4ffe6145ee 100644 --- a/sycl/cmake/modules/FetchUnifiedRuntime.cmake +++ b/sycl/cmake/modules/FetchUnifiedRuntime.cmake @@ -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) @@ -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} diff --git a/sycl/doc/GetStartedGuide.md b/sycl/doc/GetStartedGuide.md index 10359d6fefce3..0714e921c790f 100644 --- a/sycl/doc/GetStartedGuide.md +++ b/sycl/doc/GetStartedGuide.md @@ -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)