From c374324d3c862aa0562f99481cb9e9d2ca427457 Mon Sep 17 00:00:00 2001 From: Kevin Huck Date: Thu, 7 Nov 2019 08:49:00 -0600 Subject: [PATCH 1/2] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5fa97a6b..687a2579 100644 --- a/README.md +++ b/README.md @@ -99,7 +99,7 @@ Supported Runtime Systems HPX (Louisiana State University) --------------------------------- -HPX (High Performance ParalleX) is the original implementation of the ParalleX model. Developed and maintained by the Ste||ar Group at Louisiana State University, HPX is implemented in C++. For more information, see [http://stellar.cct.lsu.edu/tag/hpx/](http://stellar.cct.lsu.edu/tag/hpx/). For a tutorial on HPX with APEX (presented at SC'17, Austin TX) see [http://www.nic.uoregon.edu/~khuck/SC17-HPX-APEX.pdf](http://www.nic.uoregon.edu/~khuck/SC17-HPX-APEX.pdf). +HPX (High Performance ParalleX) is the original implementation of the ParalleX model. Developed and maintained by the Ste||ar Group at Louisiana State University, HPX is implemented in C++. For more information, see [http://stellar.cct.lsu.edu/tag/hpx/](http://stellar.cct.lsu.edu/tag/hpx/). For a tutorial on HPX with APEX (presented at SC'17, Austin TX) see [http://www.nic.uoregon.edu/~khuck/SC17-HPX-APEX.pdf](http://www.nic.uoregon.edu/~khuck/SC17-HPX-APEX.pdf). The integration specification is available [here](http://www.nic.uoregon.edu/~khuck/Phylanx/2019_report.pdf). HPX5 (Indiana University) ------------------------- From 8c8acd0c3f1f8aecdfd9ad5084704c86c9e951d3 Mon Sep 17 00:00:00 2001 From: Kevin Huck Date: Fri, 8 Nov 2019 09:28:55 -0800 Subject: [PATCH 2/2] Adding cmake settings for hpxmp / apex integration --- cmake/Modules/APEX_SetupHPXMP.cmake | 15 +++++++++++++++ src/apex/CMakeLists.hpx | 9 +++++++++ 2 files changed, 24 insertions(+) create mode 100644 cmake/Modules/APEX_SetupHPXMP.cmake diff --git a/cmake/Modules/APEX_SetupHPXMP.cmake b/cmake/Modules/APEX_SetupHPXMP.cmake new file mode 100644 index 00000000..7da1f3fe --- /dev/null +++ b/cmake/Modules/APEX_SetupHPXMP.cmake @@ -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) + diff --git a/src/apex/CMakeLists.hpx b/src/apex/CMakeLists.hpx index c612ac47..87178c4c 100644 --- a/src/apex/CMakeLists.hpx +++ b/src/apex/CMakeLists.hpx @@ -270,6 +270,13 @@ if(APEX_WITH_OTF2) set(otf2_sources otf2_listener.cpp) endif() +if(HPX_WITH_HPXMP) + set(ompt_sources apex_ompt.cpp) + include(APEX_SetupHPXMP) + set(ompt_dependency apex::hpxmp) +endif(HPX_WITH_HPXMP) + + ################################## # Setup main apex static library # set(apex_headers @@ -318,6 +325,7 @@ set(apex_sources ${bfd_sources} ${sensor_sources} ${otf2_sources} + ${ompt_sources} ) #add_hpx_library(taudummy SHARED NOLIBS SOURCES tau_dummy.cpp HEADERS ${apex_headers} FOLDER "Core/Dependencies") @@ -357,6 +365,7 @@ add_hpx_library(apex hpx_thread_support hpx_topology hpx_util + ${ompt_dependency} FOLDER "Core/Dependencies") target_include_directories(apex PUBLIC