refactor: mapping: #26: Files are renamed and refactored

DARMA-tasking · Oct 5, 2017 · fb2b603 · fb2b603
1 parent f7f078c
commit fb2b603
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 8 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -32,7 +32,8 @@ set(
   barrier collective configs/debug configs/features configs/types context
   event messaging pool data registry parameterization handler sequence
   termination trace tree scheduler utils/demangle utils/bits demangle
-  location topos topos/index utils/container utils/detector serialization
+  location topos/mapping topos/index utils/container utils/detector
+  serialization
 )
 
 include_directories(${PROJECT_SOURCE_DIR})

diff --git a/src/topos/topos_mapping.h → src/topos/mapping/mapping.h b/src/topos/topos_mapping.h → src/topos/mapping/mapping.h
diff --git a/src/topos/topos_mapping_dense.cc → src/topos/mapping/mapping_dense.cc b/src/topos/topos_mapping_dense.cc → src/topos/mapping/mapping_dense.cc
@@ -1,7 +1,7 @@
 
 #include "config.h"
 #include "topos/index/index.h"
-#include "topos_mapping_dense.h"
+#include "mapping_dense.h"
 
 namespace vt { namespace mapping {
 

diff --git a/src/topos/topos_mapping_dense.h → src/topos/mapping/mapping_dense.h b/src/topos/topos_mapping_dense.h → src/topos/mapping/mapping_dense.h
@@ -6,7 +6,7 @@
 
 #include "config.h"
 #include "topos/index/index.h"
-#include "topos_mapping.h"
+#include "mapping.h"
 
 namespace vt { namespace mapping {
 
@@ -45,6 +45,6 @@ NodeType dense3DBlockMap(Idx3DRef idx, Idx3DRef max_idx, NodeRef nnodes);
 
 }}  // end namespace vt::location
 
-#include "topos_mapping_dense.impl.h"
+#include "mapping_dense.impl.h"
 
 #endif /*INCLUDED_TOPOS_MAPPING_DENSE*/
diff --git a/src/topos/topos_mapping_dense.impl.h → src/topos/mapping/mapping_dense.impl.h b/src/topos/topos_mapping_dense.impl.h → src/topos/mapping/mapping_dense.impl.h
@@ -6,7 +6,7 @@
 
 #include "config.h"
 #include "topos/index/index.h"
-#include "topos_mapping.h"
+#include "mapping.h"
 
 namespace vt { namespace mapping {
 

diff --git a/src/topos/topos_mapping_headers.h → src/topos/mapping/mapping_headers.h b/src/topos/topos_mapping_headers.h → src/topos/mapping/mapping_headers.h
@@ -2,7 +2,7 @@
 #if !defined INCLUDED_TOPOS_MAPPING_HEADERS
 #define INCLUDED_TOPOS_MAPPING_HEADERS
 
-#include "topos_mapping.h"
-#include "topos_mapping_dense.h"
+#include "mapping.h"
+#include "mapping_dense.h"
 
 #endif  /*INCLUDED_TOPOS_MAPPING_HEADERS*/
diff --git a/src/transport.h b/src/transport.h
@@ -24,7 +24,7 @@
 #include "scheduler.h"
 #include "location.h"
 #include "topos/index/index.h"
-#include "topos/topos_mapping_headers.h"
+#include "topos/mapping/mapping_headers.h"
 #include "context_vrtheaders.h"
 
 #endif /*__RUNTIME_TRANSPORT__*/