Apex integration

CMakeLists.txt

@@ -411,6 +411,12 @@ foreach(_scheduler ${HPX_WITH_THREAD_SCHEDULERS_UC})
     hpx_add_config_define(HPX_HAVE_STATIC_SCHEDULER)
     set(HPX_HAVE_STATIC_SCHEDULER ON CACHE INTERNAL "")
   endif()
+  if(HPX_WITH_APEX)
+    if(_scheduler STREQUAL "THROTTLE" OR _all)
+      hpx_add_config_define(HPX_HAVE_THROTTLE_SCHEDULER)
+      set(HPX_HAVE_THROTTLE_SCHEDULER ON CACHE INTERNAL "")
+    endif()
+  endif(HPX_WITH_APEX)
   if(_scheduler STREQUAL "HIERARCHY" OR _all)
     hpx_add_config_define(HPX_HAVE_HIERARCHY_SCHEDULER)
     set(HPX_HAVE_HIERARCHY_SCHEDULER ON CACHE INTERNAL "")
@@ -520,6 +526,12 @@ if(HPX_WITH_THREAD_MANAGER_IDLE_BACKOFF)
   hpx_add_config_define(HPX_HAVE_THREAD_MANAGER_IDLE_BACKOFF)
 endif()
 
+# If APEX is defined, the action timers need thread debug info.
+if(HPX_WITH_APEX)
+    hpx_add_config_define(HPX_HAVE_THREAD_DESCRIPTION)
+    set(HPX_HAVE_THREAD_DESCRIPTION ON CACHE INTERNAL "")
+endif()
+
 if(HPX_WITH_THREAD_DEBUG_INFO)
   hpx_add_config_define(HPX_HAVE_THREAD_PARENT_REFERENCE)
   hpx_add_config_define(HPX_HAVE_THREAD_PHASE_INFORMATION)
@@ -871,7 +883,7 @@ if(HPX_WITH_COMPILER_WARNINGS)
 
     # OpenMPI triggers a lot of forcing value to bool 'true' or 'false'
     # (performance warning)
-    if(MPI_FOUND)
+    if(MPI_FOUND OR HPX_WITH_APEX)
       hpx_add_compile_flag(-wd4800)
     endif()
   else() # Trial and error approach for any other compiler ...
@@ -962,6 +974,7 @@ else()
   endif()
 
   # Check if our libraries have unresolved symbols
+  #if(NOT APPLE AND NOT HPX_WITH_APEX)
   if(NOT APPLE)
     hpx_add_link_flag_if_available(-Wl,-z,defs TARGETS SHARED EXE)
   endif()
@@ -1072,16 +1085,50 @@ endif()
 # Enable integration with Apex event counters
 ################################################################################
 if(HPX_WITH_APEX)
-  find_package(APEX)
+  # handle APEX library
+  include(GitExternal)
+  git_external(apex
+    https://github.com/khuck/xpress-apex.git
+    master
+    NO_UPDATE VERBOSE)
+
+  LIST(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/apex/cmake/Modules")
+  add_subdirectory(apex/src/apex)
   if(NOT APEX_FOUND)
-    hpx_error("Apex could not be found and HPX_WITH_APEX=On, please specify APEX_ROOT to point to the root of your Apex installation")
+    hpx_error("Apex could not be found and HPX_WITH_APEX=On")
   endif()
-  hpx_libraries(${APEX_LIBRARIES})
-  include_directories(${APEX_INCLUDE_DIR})
   if(AMPLIFIER_FOUND)
     hpx_error("AMPLIFIER_FOUND has been set. Please disable the use of the Intel Amplifier (WITH_AMPLIFIER=Off) in order to use Apex")
   endif()
-  hpx_add_config_define(HPX_HAVE_ITTNOTIFY)
+
+  include_directories(${APEX_SOURCE_DIR})
+  hpx_add_config_define(HPX_HAVE_APEX 1)
+  set(HPX_ADDITIONAL_RUNTIME_DEPENDENCIES
+      ${HPX_ADDITIONAL_RUNTIME_DEPENDENCIES} apex_lib)
+  if(APEX_WITH_MSR)
+    set(HPX_ADDITIONAL_RUNTIME_DEPENDENCIES
+        ${HPX_ADDITIONAL_RUNTIME_DEPENDENCIES} -L${MSR_ROOT}/lib -lmsr)
+  endif()
+  if(APEX_WITH_ACTIVEHARMONY)
+    set(HPX_ADDITIONAL_RUNTIME_DEPENDENCIES
+        ${HPX_ADDITIONAL_RUNTIME_DEPENDENCIES} -L${ACTIVEHARMONY_ROOT}/lib -lharmony)
+  endif()
+  if(APEX_WITH_TAU)
+    set(HPX_ADDITIONAL_RUNTIME_DEPENDENCIES
+        ${HPX_ADDITIONAL_RUNTIME_DEPENDENCIES} -L${TAU_ROOT}/lib -lTAU)
+  endif()
+
+  # handle optional ITTNotify library
+  if(HPX_WITH_ITTNOTIFY)
+    add_subdirectory(apex/src/ITTNotify)
+    if(NOT ITTNOTIFY_FOUND)
+      hpx_error("ITTNotify could not be found and HPX_WITH_ITTNOTIFY=On")
+    endif()
+    include_directories(${ITTNOTIFY_SOURCE_DIR})
+    hpx_add_config_define(HPX_HAVE_ITTNOTIFY 1)
+    set(HPX_ADDITIONAL_RUNTIME_DEPENDENCIES
+        ${HPX_ADDITIONAL_RUNTIME_DEPENDENCIES} ittnotify_lib)
+  endif()
 endif()
 
 if(HPX_WITH_GOOGLE_PERFTOOLS)
@@ -1402,11 +1449,11 @@ install( # Install HPX Python scripts
 #       #make copy, so that we have intact symlink in CMAKE_BINARY_DIR
 #       execute_process(
 #         COMMAND "${CMAKE_COMMAND}" -E copy_if_different "${script}" "${script_name}"
-# 	WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/python/scripts")
+#   WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/python/scripts")
 #
 #       execute_process(
 #         COMMAND "${CMAKE_COMMAND}" -E create_symlink "${script_name}" "${script_name_we}"
-# 	WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/python/scripts")
+#   WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/python/scripts")
 #
 #       install(FILES "${CMAKE_BINARY_DIR}/python/scripts/${script_name_we}" DESTINATION "bin")
 #     endforeach()

cmake/templates/HPXConfig.cmake.in

@@ -38,6 +38,10 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} @CXX_FLAG@")
 
 set(HPX_BOOST_ROOT @BOOST_ROOT@)
 set(HPX_WITH_MALLOC_DEFAULT @HPX_WITH_MALLOC@)
+set(HPX_WITH_PARCELPORT_TCP @HPX_WITH_PARCELPORT_TCP@)
+set(HPX_WITH_PARCELPORT_MPI @HPX_WITH_PARCELPORT_MPI@)
+set(HPX_WITH_PARCELPORT_IPC @HPX_WITH_PARCELPORT_IPC@)
+set(HPX_WITH_PARCELPORT_IBVERBS @HPX_WITH_PARCELPORT_IBVERBS@)
 
 if(NOT HPX_CMAKE_LOGLEVEL)
   set(HPX_CMAKE_LOGLEVEL "WARN")

cmake/templates/hpxrun.py.in

@@ -271,7 +271,9 @@ if __name__ == '__main__':
                 msg += ')'
                 print(msg)
                 while procs:
-                    term(procs.pop(0))
+                    nextproc = procs.pop(0)
+                    if nextproc != proc:
+                        term(nextproc)
         except:
             pass
         finally: procs_lock.release()

docs/CMakeLists.txt

@@ -52,6 +52,7 @@ set(doxygen_dependencies
     "${PROJECT_SOURCE_DIR}/hpx/error.hpp"
     "${PROJECT_SOURCE_DIR}/hpx/exception.hpp"
     "${PROJECT_SOURCE_DIR}/hpx/exception_list.hpp"
+    "${PROJECT_SOURCE_DIR}/hpx/lcos_fwd.hpp"
     "${PROJECT_SOURCE_DIR}/hpx/components/component_storage/migrate_from_storage.hpp"
     "${PROJECT_SOURCE_DIR}/hpx/components/component_storage/migrate_to_storage.hpp"
     "${PROJECT_SOURCE_DIR}/hpx/parallel/execution_policy.hpp"
@@ -105,6 +106,7 @@ set(doxygen_dependencies
     "${PROJECT_SOURCE_DIR}/hpx/parallel/executors/static_chunk_size.hpp"
     "${PROJECT_SOURCE_DIR}/hpx/parallel/executors/thread_pool_executors.hpp"
     "${PROJECT_SOURCE_DIR}/hpx/parallel/executors/timed_executor_traits.hpp"
+    "${PROJECT_SOURCE_DIR}/hpx/runtime/basename_registration.hpp"
     "${PROJECT_SOURCE_DIR}/hpx/runtime/get_ptr.hpp"
     "${PROJECT_SOURCE_DIR}/hpx/runtime/get_locality_name.hpp"
     "${PROJECT_SOURCE_DIR}/hpx/runtime/launch_policy.hpp"
@@ -122,6 +124,7 @@ set(doxygen_dependencies
     "${PROJECT_SOURCE_DIR}/hpx/runtime/components/new.hpp"
     "${PROJECT_SOURCE_DIR}/hpx/runtime/naming/unmanaged.hpp"
     "${PROJECT_SOURCE_DIR}/hpx/runtime/threads/thread_enums.hpp"
+    "${PROJECT_SOURCE_DIR}/hpx/runtime/threads_fwd.hpp"
     "${PROJECT_SOURCE_DIR}/hpx/lcos/broadcast.hpp"
     "${PROJECT_SOURCE_DIR}/hpx/lcos/fold.hpp"
     "${PROJECT_SOURCE_DIR}/hpx/lcos/reduce.hpp"

docs/hpx.idx

@@ -19,11 +19,11 @@ find_all_localities                   "" "hpx\.find_all_localities.*"
 find_remote_localities                "" "hpx\.find_remote_localities.*"
 find_locality                         "" "hpx\.find_locality.*"
 
-find_all_ids_from_basename            "" "hpx\.find_all_ids_from_basename.*"
-find_ids_from_basename                "" "hpx\.find_ids_from_basename.*"
-find_id_from_basename                 "" "hpx\.find_id_from_basename.*"
-register_id_with_basename             "" "hpx\.register_id_with_basename.*"
-unregister_id_with_basename           "" "hpx\.unregister_id_with_basename.*"
+# hpx/runtime/basename_registration.hpp
+find_all_from_basename                "" "hpx\.find_all_from_basename.*"
+find_from_basename                    "" "hpx\.find_from_basenam_id.*"
+register_with_basename                "" "hpx\.register_with_bas_id.*"
+unregister_with_basename              "" "hpx\.unregister_with_basename.*"
 
 get_num_localities_sync               "" "hpx\.get_num_localitie_id.*"
 get_num_localities                    "" "hpx\.get_num_localitie_id.*"
@@ -45,13 +45,16 @@ is_stopped_or_shutting_down           "" "hpx\.is_stopped_or_shutting_down.*"
 
 get_worker_thread_num                 "" "hpx\.get_worker_thread_num.*"
 get_thread_name                       "" "hpx\.get_thread_name.*"
-get_locality_name                     "" "hpx\.get_locality_name.*"
 get_num_worker_threads                "" "hpx\.get_num_worker_threads.*"
 
+# hpx/runtime/get_locality_name.hpp
+get_locality_name                     "" "hpx\.get_locality_name.*"
+
 get_system_uptime                     "" "hpx\.get_system_uptime.*"
 get_colocation_id                     "" "hpx\.get_colocation_id.*"
 get_colocation_id_sync                "" "hpx\.get_colocation_id_sync.*"
 
+# hpx/runtime/trigger_lco.hpp
 trigger_lco_event                     "" "hpx\.trigger_lco_event.*"
 set_lco_event                         "" "hpx\.set_lco_event.*"
 set_lco_value                         "" "hpx\.set_lco_value.*"
@@ -62,6 +65,7 @@ reset_active_counters                 "" "hpx\.reset_active_counters.*"
 stop_active_counters                  "" "hpx\.stop_active_counters.*"
 evaluate_active_counters              "" "hpx\.evaluate_active_counters.*"
 
+# hpx/runtime/set_parcel_write_handler.hpp
 set_parcel_write_handler              "" "hpx\.set_parcel_write_.*"
 parcel_write_handler_type             "" "hpx\.parcel_write_hand.*"
 
@@ -392,7 +396,7 @@ task_region_not_active                "" "hpx\.error"
 unmanaged                             "" "header\.hpx\.runtime\.naming\.unmanaged.*"
 
 # hpx/runtime/get_ptr.hpp
-get_ptr                               "" "hpx\.get_ptr.*"
+get_ptr                               "" "hpx\.runtime\.get_ptr.*"
 
 # hpx/lcos/broadcast.hpp
 broadcast                             "" "header\.hpx\.lcos\.broadcast.*"

docs/html/src/boostbook.css

@@ -424,7 +424,8 @@ Colors
 
         h1 a, h2 a, h3 a, h4 a, h5 a, h6 a,
         h1 a:hover, h2 a:hover, h3 a:hover, h4 a:hover, h5 a:hover, h6 a:hover,
-        h1 a:visited, h2 a:visited, h3 a:visited, h4 a:visited, h5 a:visited, h6 a:visited
+        h1 a:visited, h2 a:visited, h3 a:visited,
+         h4 a:visited, h5 a:visited, h6 a:visited
         {
             text-decoration: none; /* no underline */
             color: #000000;

docs/manual/parallel_algorithms.qbk

@@ -134,6 +134,9 @@ __hpx__ provides implementations of the following parallel algorithms:
     [[ [algoref for_each] ]
      [Applies a function to a range of elements.]
      [`<hpx/include/parallel_for_each.hpp>`]]
+    [[ [algoref for_each_n] ]
+     [Applies a function to a number of elements.]
+     [`<hpx/include/parallel_for_each.hpp>`]]
     [[ [algoref count] ]
      [Returns the number of elements equal to a given value.]
      [`<hpx/include/parallel_count.hpp>`]]