From 73c2230d23e6e18913d6e308035d83739046a700 Mon Sep 17 00:00:00 2001 From: Igor Chorazewicz Date: Fri, 2 Aug 2024 20:59:34 +0000 Subject: [PATCH 1/2] Disable opencl, cuda and nvml when configuring hwloc Without explicitly disabling them and if a system where hwloc is being build has opencl/cuda/nvml installed those libraries will become hwloc dependencies which would force umf to link with them. The problem manifested on a system where opencl was installed and umf compilation failed due to missing clGetDevices symbol. --- CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3edd86f4c..5e7badf81 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -173,7 +173,8 @@ elseif(NOT UMF_DISABLE_HWLOC) COMMAND ./configure --prefix=${hwloc_targ_BINARY_DIR} --enable-static=yes --enable-shared=no --disable-libxml2 --disable-levelzero - CFLAGS=-fPIC CXXFLAGS=-fPIC + --disable-opencl --disable-cuda --disable-nvml CFLAGS=-fPIC + CXXFLAGS=-fPIC WORKING_DIRECTORY ${hwloc_targ_SOURCE_DIR} OUTPUT ${hwloc_targ_SOURCE_DIR}/Makefile DEPENDS ${hwloc_targ_SOURCE_DIR}/configure) From a7dad77a13e4431e03d9bb17d1f67dbd889cfdcb Mon Sep 17 00:00:00 2001 From: Rafal Rudnicki Date: Mon, 5 Aug 2024 11:44:30 +0200 Subject: [PATCH 2/2] add googletest to 3rd party programs --- licensing/third-party-programs.txt | 34 ++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/licensing/third-party-programs.txt b/licensing/third-party-programs.txt index 4adbd8cf6..54520c141 100644 --- a/licensing/third-party-programs.txt +++ b/licensing/third-party-programs.txt @@ -386,6 +386,40 @@ _______________________________________________________________________________ and prospectively choose to deem waived or otherwise exclude such Section(s) of the License, but only in their entirety and only with respect to the Combined Software. + +_______________________________________________________________________________ + +7. googletest: + + Copyright 2008, Google Inc. + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are + met: + + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following disclaimer + in the documentation and/or other materials provided with the + distribution. + * Neither the name of Google Inc. nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + _______________________________________________________________________________ *Other names and brands may be claimed as the property of others.