-
Notifications
You must be signed in to change notification settings - Fork 24
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' of git.nic.uoregon.edu:/gitroot/xpress-apex in…
…to develop
- Loading branch information
Showing
25 changed files
with
514 additions
and
334 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| # Copyright (c) 2019 University of Oregon | ||
| # | ||
| # Distributed under the Boost Software License, Version 1.0. (See accompanying | ||
| # file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) | ||
|
|
||
| if(APEX_WITH_ACTIVEHARMONY) | ||
|
|
||
| find_package(ActiveHarmony) | ||
| if(NOT ACTIVEHARMONY_FOUND) | ||
| hpx_error("apex" "Requested APEX_WITH_ACTIVEHARMONY but could not find \ | ||
| Active Harmony. Please specify ACTIVEHARMONY_ROOT.") | ||
| endif() | ||
|
|
||
| # Add an imported target | ||
| add_library(apex::activeharmony INTERFACE IMPORTED) | ||
| hpx_info("apex" "Building APEX with Active Harmony support.") | ||
| set_property(TARGET apex::activeharmony PROPERTY | ||
| INTERFACE_INCLUDE_DIRECTORIES ${ACTIVEHARMONY_INCLUDE_DIR}) | ||
| set_property(TARGET apex::activeharmony PROPERTY | ||
| INTERFACE_LINK_LIBRARIES ${ACTIVEHARMONY_LIBRARIES}) | ||
| set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_RPATH} ${ACTIVEHARMONY_LIBRARY_DIR}) | ||
|
|
||
| # Add the right definitions to the apex_flags target | ||
| target_compile_definitions(apex_flags INTERFACE APEX_HAVE_ACTIVEHARMONY) | ||
|
|
||
| list(APPEND _apex_imported_targets apex::activeharmony) | ||
|
|
||
| else() | ||
|
|
||
| add_custom_target(project_activeharmony) | ||
|
|
||
| endif() |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| # Copyright (c) 2019 University of Oregon | ||
| # | ||
| # Distributed under the Boost Software License, Version 1.0. (See accompanying | ||
| # file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) | ||
|
|
||
| find_package(BFD) | ||
|
|
||
| if (BFD_FOUND) | ||
|
|
||
| add_library(apex::bfd INTERFACE IMPORTED) | ||
| set_property(TARGET apex::bfd PROPERTY | ||
| INTERFACE_INCLUDE_DIRECTORIES ${BFD_INCLUDE_DIRS}) | ||
| set_property(TARGET apex::bfd PROPERTY | ||
| INTERFACE_LINK_LIBRARIES ${BFD_LIBRARIES}) | ||
| set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_RPATH} ${BFD_LIBRARY_DIR}) | ||
| message(INFO " Using binutils: ${BFD_LIBRARY_DIR} ${BFD_LIBRARIES}") | ||
|
|
||
| list(APPEND _apex_imported_targets apex::bfd) | ||
|
|
||
| endif() |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| # Copyright (c) 2019 University of Oregon | ||
| # | ||
| # Distributed under the Boost Software License, Version 1.0. (See accompanying | ||
| # file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) | ||
|
|
||
| find_package(Demangle) | ||
|
|
||
| if (DEMANGLE_FOUND) | ||
|
|
||
| # Add an imported target | ||
| add_library(apex::demangle INTERFACE IMPORTED) | ||
| set_property(TARGET apex::demangle PROPERTY | ||
| INTERFACE_INCLUDE_DIRECTORIES ${DEMANGLE_INCLUDE_DIRS}) | ||
| set_property(TARGET apex::demangle PROPERTY | ||
| INTERFACE_LINK_LIBRARIES ${DEMANGLE_LIBRARIES}) | ||
|
|
||
| set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_RPATH} ${DEMANGLE_LIBRARY_DIR}) | ||
| message(INFO " Using demangle: ${DEMANGLE_LIBRARY_DIR} ${DEMANGLE_LIBRARIES}") | ||
|
|
||
| list(APPEND _apex_imported_targets apex::demangle) | ||
|
|
||
| else() | ||
|
|
||
| unset(DEMANGLE_LIBRARY) | ||
| unset(DEMANGLE_LIBRARIES) | ||
| unset(DEMANGLE_DIR) | ||
|
|
||
| endif() |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| # Copyright (c) 2019 University of Oregon | ||
| # | ||
| # Distributed under the Boost Software License, Version 1.0. (See accompanying | ||
| # file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) | ||
|
|
||
| add_library(apex::hpxmp INTERFACE IMPORTED) | ||
| set_property(TARGET apex::hpxmp PROPERTY | ||
| INTERFACE_INCLUDE_DIRECTORIES ${HPXMP_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR}/hpxmp/src) | ||
| set_property(TARGET apex::hpxmp PROPERTY | ||
| INTERFACE_LINK_LIBRARIES ${HPXMP_LIBRARIES}) | ||
| set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_RPATH} ${HPXMP_LIBRARY_DIR}) | ||
| message(INFO " Using binutils: ${HPXMP_LIBRARY_DIR} ${HPXMP_LIBRARIES}") | ||
|
|
||
| list(APPEND _apex_imported_targets apex::hpxmp) | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| # Copyright (c) 2014 University of Oregon | ||
| # | ||
| # Distributed under the Boost Software License, Version 1.0. (See accompanying | ||
| # file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) | ||
|
|
||
| ################################################################################ | ||
| # LM Sensors configuration | ||
| ################################################################################ | ||
|
|
||
| # Setup an imported target for lmsensors | ||
| if(APEX_WITH_LM_SENSORS) | ||
|
|
||
| find_package(LMSensors) | ||
|
|
||
| if (NOT LM_SENSORS_FOUND) | ||
| hpx_error("apex" "Requested APEX_WITH_LM_SENSORS but could not find LM \ | ||
| Sensors. Please specify LM_SENSORS_ROOT.") | ||
| endif() | ||
|
|
||
| # Add an imported target | ||
| add_library(apex::lm_sensors INTERFACE IMPORTED) | ||
| set_property(TARGET apex::lm_sensors PROPERTY | ||
| INTERFACE_INCLUDE_DIRECTORIES ${LM_SENSORS_INCLUDE_DIRS}) | ||
| set_property(TARGET apex::lm_sensors PROPERTY | ||
| INTERFACE_LINK_LIBRARIES ${LM_SENSORS_LIBRARIES}) | ||
| set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_RPATH} ${LM_SENSORS_LIBRARY_DIR}) | ||
|
|
||
| target_compile_definitions(apex_flags INTERFACE APEX_HAVE_LM_SENSORS) | ||
|
|
||
| list(APPEND _apex_imported_targets apex::lm_sensors) | ||
|
|
||
| endif() | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| # Copyright (c) 2019 University of Oregon | ||
| # | ||
| # Distributed under the Boost Software License, Version 1.0. (See accompanying | ||
| # file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) | ||
|
|
||
| if(APEX_WITH_MSR) | ||
|
|
||
| find_package(MSR) | ||
| if(NOT MSR_FOUND) | ||
| hpx_error("apex" "Requested APEX_WITH_MSR but could not find MSR. \ | ||
| Please specify MSR_ROOT.") | ||
| endif() | ||
| hpx_info("apex" "Building APEX with libmsr support.") | ||
|
|
||
| # Add an imported target | ||
| add_library(apex::msr INTERFACE IMPORTED) | ||
| set_property(TARGET apex::msr PROPERTY | ||
| INTERFACE_INCLUDE_DIRECTORIES ${MSR_INCLUDE_DIR}) | ||
| set_property(TARGET apex::msr PROPERTY | ||
| INTERFACE_LINK_LIBRARIES ${MSR_LIBRARIES}) | ||
|
|
||
| set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_RPATH} ${MSR_LIBRARY_DIR}) | ||
| target_compile_definitions(apex_flags INTERFACE APEX_HAVE_MSR) | ||
|
|
||
| list(APPEND _apex_imported_targets apex::msr) | ||
|
|
||
| endif() |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| # Copyright (c) 2019 University of Oregon | ||
| # | ||
| # Distributed under the Boost Software License, Version 1.0. (See accompanying | ||
| # file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) | ||
|
|
||
| if(APEX_WITH_OTF2) | ||
|
|
||
| find_package(OTF2 REQUIRED) | ||
| if (NOT OTF2_FOUND) | ||
| hpx_error("apex" "Requested APEX_WITH_OTF2 but could not find OTF2 library. Please specify OTF2_ROOT.") | ||
| endif() | ||
|
|
||
| # Add an imported target | ||
| add_library(apex::otf2 INTERFACE IMPORTED) | ||
| set_property(TARGET apex::otf2 PROPERTY | ||
| INTERFACE_INCLUDE_DIRECTORIES ${OTF2_INCLUDE_DIRS}) | ||
| set_property(TARGET apex::otf2 PROPERTY | ||
| INTERFACE_LINK_LIBRARIES ${OTF2_LIBRARIES}) | ||
|
|
||
| set (CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_RPATH} ${OTF2_LIBRARY_DIR}) | ||
| #target_compile_definitions(apex_flags INTERFACE APEX_USE_CLOCK_TIMESTAMP=1) | ||
|
|
||
| list(APPEND _apex_imported_targets apex::otf2) | ||
|
|
||
| else() | ||
| add_custom_target(project_otf2) | ||
| endif() | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| # Copyright (c) 2014 University of Oregon | ||
| # | ||
| # Distributed under the Boost Software License, Version 1.0. (See accompanying | ||
| # file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) | ||
|
|
||
| # Setup an imported target for papi | ||
| if(APEX_WITH_PAPI) | ||
|
|
||
| find_package(PAPI) | ||
| if(NOT PAPI_FOUND) | ||
| hpx_error("apex" "Requested APEX_WITH_PAPI but could not find PAPI. Please specify PAPI_ROOT.") | ||
| endif() | ||
| hpx_info("apex" "Building APEX with PAPI support.") | ||
|
|
||
| # Add an imported target | ||
| add_library(apex::papi INTERFACE IMPORTED) | ||
| set_property(TARGET apex::papi PROPERTY | ||
| INTERFACE_INCLUDE_DIRECTORIES ${PAPI_INCLUDE_DIR}) | ||
| set_property(TARGET apex::papi PROPERTY | ||
| INTERFACE_LINK_LIBRARIES ${PAPI_LIBRARIES}) | ||
|
|
||
| set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_RPATH} ${PAPI_LIBRARY_DIR}) | ||
| target_compile_definitions(apex_flags INTERFACE APEX_HAVE_PAPI) | ||
|
|
||
| list(APPEND _apex_imported_targets apex::papi) | ||
|
|
||
| endif() |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| # Copyright (c) 2014 University of Oregon | ||
| # | ||
| # Distributed under the Boost Software License, Version 1.0. (See accompanying | ||
| # file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) | ||
|
|
||
| if(APEX_WITH_PLUGINS) | ||
| message(INFO " apex will be built with plugin support.") | ||
| set(LIBS ${LIBS} ${CMAKE_DL_LIBS}) | ||
| target_compile_definitions(apex_flags INTERFACE APEX_USE_PLUGINS) | ||
|
|
||
| include(GitExternal) | ||
| git_external(rapidjson | ||
| https://github.com/miloyip/rapidjson.git | ||
| master | ||
| VERBOSE) | ||
|
|
||
| find_path( | ||
| RAPIDJSON_INCLUDE_DIR | ||
| NAMES rapidjson | ||
| PATHS ${APEX_SOURCE_DIR}/rapidjson/include) | ||
|
|
||
| add_library(apex::rapidjson INTERFACE IMPORTED) | ||
| if(RAPIDJSON_INCLUDE_DIR) | ||
| message(INFO " Found rapidjson at ${RAPIDJSON_INCLUDE_DIR}") | ||
| set_property(TARGET apex::rapidjson PROPERTY | ||
| INTERFACE_INCLUDE_DIRECTORIES ${RAPIDJSON_INCLUDE_DIR}) | ||
|
|
||
| list(APPEND _apex_imported_targets apex::rapidjson) | ||
|
|
||
| else() | ||
| message(FATAL_ERROR " rapidjson not found. This should have been checked \ | ||
| out automatically. " "Try manually check out \ | ||
| https://github.com/miloyip/rapidjson.git to ${PROJECT_SOURCE_DIR}") | ||
| endif() | ||
| endif() |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| # Copyright (c) 2019 University of Oregon | ||
| # | ||
| # Distributed under the Boost Software License, Version 1.0. (See accompanying | ||
| # file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) | ||
|
|
||
| find_package(ZLIB) | ||
|
|
||
| if (ZLIB_FOUND) | ||
|
|
||
| # Add an imported target | ||
| add_library(apex::zlib INTERFACE IMPORTED) | ||
| set_property(TARGET apex::zlib PROPERTY | ||
| INTERFACE_LINK_LIBRARIES ${ZLIB_LIBRARIES}) | ||
| set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_RPATH} ${ZLIB_LIBRARY_DIR}) | ||
| message(INFO " Using zlib: ${ZLIB_LIBRARY_DIR} ${ZLIB_LIBRARIES}") | ||
|
|
||
| list(APPEND _apex_imported_targets apex::zlib) | ||
|
|
||
| endif() |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.