From 3ca3ff60894b59b718513e4ce148086546b471f1 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 UMF with hwloc on Linux. This will enable hwloc support in UMF on Linux. Also, always use the v2.9.3 hwloc version for hwloc builds. --- .github/workflows/sycl-docs.yml | 2 +- .github/workflows/sycl-macos-build-and-test.yml | 2 +- devops/scripts/install_build_tools.sh | 1 - sycl/cmake/modules/FetchUnifiedRuntime.cmake | 9 +++------ sycl/doc/GetStartedGuide.md | 2 -- 5 files changed, 5 insertions(+), 11 deletions(-) diff --git a/.github/workflows/sycl-docs.yml b/.github/workflows/sycl-docs.yml index 5c1e8e425111..d4d0be9826cb 100644 --- a/.github/workflows/sycl-docs.yml +++ b/.github/workflows/sycl-docs.yml @@ -33,7 +33,7 @@ jobs: path: repo - name: Install deps run: | - sudo apt-get install -y graphviz ssh ninja-build libhwloc-dev + sudo apt-get install -y graphviz ssh ninja-build sudo pip3 install -r repo/llvm/docs/requirements.txt - name: Build Docs run: | diff --git a/.github/workflows/sycl-macos-build-and-test.yml b/.github/workflows/sycl-macos-build-and-test.yml index f25e847d8a34..26c77b96c464 100644 --- a/.github/workflows/sycl-macos-build-and-test.yml +++ b/.github/workflows/sycl-macos-build-and-test.yml @@ -30,7 +30,7 @@ jobs: CCACHE_MAXSIZE: ${{ inputs.build_cache_size }} steps: - name: Install dependencies - run: brew install ccache ninja hwloc zstd + run: brew install ccache ninja zstd - uses: actions/checkout@v4 with: ref: ${{ inputs.build_ref }} diff --git a/devops/scripts/install_build_tools.sh b/devops/scripts/install_build_tools.sh index 37d9761751eb..6be4bfe8ec78 100755 --- a/devops/scripts/install_build_tools.sh +++ b/devops/scripts/install_build_tools.sh @@ -23,6 +23,5 @@ apt update && apt install -yqq \ unzip \ jq \ curl \ - libhwloc-dev \ libzstd-dev diff --git a/sycl/cmake/modules/FetchUnifiedRuntime.cmake b/sycl/cmake/modules/FetchUnifiedRuntime.cmake index 72841724fa01..75e4ffe6145e 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 10359d6fefce..0714e921c790 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)