From f9cf85be75ebdaeff8d7b9748e9ce7888e1683b1 Mon Sep 17 00:00:00 2001 From: Terry Cojean Date: Tue, 8 Aug 2023 11:09:05 +0200 Subject: [PATCH] Try to not bundle SDE but rely on external only. --- third_party/CMakeLists.txt | 4 ---- third_party/papi_sde/CMakeLists.txt | 37 ----------------------------- 2 files changed, 41 deletions(-) delete mode 100644 third_party/papi_sde/CMakeLists.txt diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt index 062f520b8e8..c714a51c187 100644 --- a/third_party/CMakeLists.txt +++ b/third_party/CMakeLists.txt @@ -7,10 +7,6 @@ if(GINKGO_BUILD_HWLOC AND (NOT HWLOC_FOUND)) add_subdirectory(hwloc) endif() -if(GINKGO_WITH_PAPI_SDE AND (NOT PAPI_FOUND)) - add_subdirectory(papi_sde) -endif() - if(GINKGO_DEVEL_TOOLS) set(GCF_IGNORE_LIST "third_party" CACHE STRING "Ignore directories for GCF") add_subdirectory(git-cmake-format) diff --git a/third_party/papi_sde/CMakeLists.txt b/third_party/papi_sde/CMakeLists.txt deleted file mode 100644 index 5b300d973a5..00000000000 --- a/third_party/papi_sde/CMakeLists.txt +++ /dev/null @@ -1,37 +0,0 @@ -message(STATUS "Configuring and building PAPI-SDE") -set(TPL_PAPI_PATH "${PROJECT_BINARY_DIR}/third_party/papi_sde/src") -ginkgo_load_and_configure_package(papi_external - "https://github.com/icl-utk-edu/papi/archive/d2dd17a07a3c175fbb26ce5528671e3a7e00b80f.tar.gz" - "SHA1=55019037c47aff216ff831b4191e7147f6932464" - "${TPL_PAPI_PATH}/build" - "./configure" "--prefix=${TPL_PAPI_PATH}/install" - "--with-components=sde" "--with-libsde=yes" "--with-tests=no" - "--with-static-lib=no" "--with-shared-lib=yes" - ) - -add_library(PAPI SHARED IMPORTED GLOBAL) -add_library(PAPI::PAPI ALIAS PAPI) -add_dependencies(PAPI papi_external) -# NOTE: if changing this (e.g. to `.a`), please update the special case in -# `cmake/information_helpers.cmake` -set(PAPI_LIBRARIES "${TPL_PAPI_PATH}/install/lib/libpapi.so" - CACHE FILEPATH "The path to PAPI libraries" FORCE) -set(PAPI_INCLUDE_DIRS "${TPL_PAPI_PATH}/install/include" CACHE PATH - "The directory containing the PAPI header, papi.h" FORCE) -set_target_properties(PAPI PROPERTIES IMPORTED_LOCATION "${PAPI_LIBRARIES}") -set_target_properties(PAPI PROPERTIES INTERFACE_LINK_LIBRARIES "${PAPI_LIBRARIES}") -set_target_properties(PAPI PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${PAPI_INCLUDE_DIRS}") - - -add_library(PAPI_SDE SHARED IMPORTED GLOBAL) -add_library(PAPI::PAPI_SDE ALIAS PAPI_SDE) -add_dependencies(PAPI_SDE papi_external) -# NOTE: if changing this (e.g. to `.a`), please update the special case in -# `cmake/information_helpers.cmake` -set(PAPI_SDE_LIBRARIES "${TPL_PAPI_PATH}/install/lib/libsde.so" - CACHE FILEPATH "The path to PAPI SDE libraries" FORCE) -set(PAPI_SDE_INCLUDE_DIRS "${TPL_PAPI_PATH}/install/include" CACHE PATH - "The directory containing the PAPI SDE header, sde_lib.h" FORCE) -set_target_properties(PAPI_SDE PROPERTIES IMPORTED_LOCATION "${PAPI_SDE_LIBRARIES}") -set_target_properties(PAPI_SDE PROPERTIES INTERFACE_LINK_LIBRARIES "${PAPI_SDE_LIBRARIES}") -set_target_properties(PAPI_SDE PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${PAPI_SDE_INCLUDE_DIRS}")