Merge pull request #87 from DARMA-tasking/mpi-interop-frontend

Provisional merge of MPI Interop Frontend
DARMA-tasking-internal · Apr 10, 2018 · d7f4135 · d7f4135
2 parents 762917f + ea69d81
commit d7f4135
Show file tree

Hide file tree

Showing 24 changed files with 1,920 additions and 21 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -74,3 +74,25 @@ endif()
 
 add_subdirectory(src)
 
+add_library(darma_frontend INTERFACE)
+target_include_directories(darma_frontend INTERFACE
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>
+  $<INSTALL_INTERFACE:include>
+)
+install(TARGETS darma_frontend EXPORT darma_frontend)
+install(EXPORT darma_frontend DESTINATION cmake)
+
+configure_file(
+  cmake/darma_frontendConfig.cmake.in
+  "${PROJECT_BINARY_DIR}/darma_frontendConfig.cmake" @ONLY
+)
+install(
+  FILES
+  "${PROJECT_BINARY_DIR}/darma_frontendConfig.cmake" 
+  DESTINATION cmake 
+)
+
+
+
+
+
diff --git a/cmake/darma_frontendConfig.cmake.in b/cmake/darma_frontendConfig.cmake.in
@@ -0,0 +1,4 @@
+# Get compiler and flags
+get_filename_component(SELF_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
+include(${SELF_DIR}/darma_frontend.cmake)
+
diff --git a/src/include/darma/impl/CMakeLists.txt b/src/include/darma/impl/CMakeLists.txt
@@ -37,6 +37,8 @@ FILE(GLOB impl_use_HEADERS RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}"
         "${CMAKE_CURRENT_SOURCE_DIR}/use/*.h")
 FILE(GLOB impl_util_HEADERS RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}"
     "${CMAKE_CURRENT_SOURCE_DIR}/util/*.h")
+FILE(GLOB impl_mpi_HEADERS RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}"
+    "${CMAKE_CURRENT_SOURCE_DIR}/mpi/*.h")
 
 install (FILES ${impl_HEADERS} DESTINATION include/darma/impl)
 install (FILES ${impl_access_handle_HEADERS} DESTINATION include/darma/impl/access_handle)
@@ -57,4 +59,4 @@ install (FILES ${impl_task_collection_HEADERS} DESTINATION include/darma/impl/ta
 install (FILES ${impl_task_collection_impl_HEADERS} DESTINATION include/darma/impl/task_collection/impl)
 install (FILES ${impl_use_HEADERS} DESTINATION include/darma/impl/use)
 install (FILES ${impl_util_HEADERS} DESTINATION include/darma/impl/util)
-
+install (FILES ${impl_mpi_HEADERS} DESTINATION include/darma/impl/mpi)
diff --git a/src/include/darma/impl/access_handle/access_handle_traits.h b/src/include/darma/impl/access_handle/access_handle_traits.h
@@ -635,15 +635,15 @@ struct access_handle_special_semantic_members
   void copy_conditional_members(
     access_handle_special_semantic_members<OtherTraits> const& other
   ) {
-    utility::constexpr_if<has_can_be_published_dynamic>(
+    utility::darma_constexpr_if<has_can_be_published_dynamic>(
       [](auto& this_) {
         this_.can_be_published_dynamic() =
           meta::get_conditional_member<_can_be_published_dynamic_index>(this_);
       },
       *this
     );
 #if _darma_has_feature(task_collection_token)
-    utility::constexpr_if<has_task_collection_token
+    utility::darma_constexpr_if<has_task_collection_token
       and access_handle_special_semantic_members<OtherTraits>::has_task_collection_token
     >(
       [](auto& this_, auto& other_) {
@@ -662,15 +662,15 @@ struct access_handle_special_semantic_members
   void move_conditional_members(
     access_handle_special_semantic_members<OtherTraits>&& other
   ) {
-    utility::constexpr_if<has_can_be_published_dynamic>(
+    utility::darma_constexpr_if<has_can_be_published_dynamic>(
       [](auto& this_) {
         this_.can_be_published_dynamic() =
           meta::get_conditional_member<_can_be_published_dynamic_index>(this_);
       },
       *this
     );
 #if _darma_has_feature(task_collection_token)
-    utility::constexpr_if<has_task_collection_token
+    utility::darma_constexpr_if<has_task_collection_token
       and access_handle_special_semantic_members<OtherTraits>::has_task_collection_token
     >(
       [](auto& this_, auto& other_) {

diff --git a/src/include/darma/impl/feature_testing_macros.h b/src/include/darma/impl/feature_testing_macros.h
@@ -107,7 +107,7 @@
 
 #define _darma_feature_date_backtrace 20170822
 
-#define _darma_feature_date_mpi_interoperability 20170919
+#define _darma_feature_date_mpi_interop 20170919
 #define _darma_feature_disabled_by_default_mpi_interoperability 1
 
 #define _darma_feature_date_unmanaged_data 20170919
@@ -116,6 +116,8 @@
 #define _darma_feature_date_darma_regions 20170919
 //#define _darma_feature_disabled_by_default_darma_regions 0
 
+#define _darma_feature_data_mpi_interop 20180327
+
 // </editor-fold> end Feature Dates and Defaults }}}1
 //==============================================================================