Merge pull request ComputationalRadiationPhysics#902 from psychocoder…

…HPC/topic-addMappingHostFlag add host support for kernel mapper
psychocoderHPC · Jun 3, 2015 · 2657763 · 2657763
2 parents fea3499 + cb8e2c0
commit 2657763
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/libPMacc/include/mappings/kernel/AreaMapping.hpp b/src/libPMacc/include/mappings/kernel/AreaMapping.hpp
@@ -1,5 +1,5 @@
 /**
- * Copyright 2013 Felix Schmitt, Heiko Burau, Rene Widera
+ * Copyright 2013-2015 Felix Schmitt, Heiko Burau, Rene Widera
  *
  * This file is part of libPMacc.
  *
@@ -73,7 +73,7 @@ namespace PMacc
          * @param realSuperCellIdx current SuperCell index (block index)
          * @return mapped SuperCell index
          */
-        DINLINE DataSpace<DIM> getSuperCellIndex(const DataSpace<DIM>& realSuperCellIdx) const
+        HDINLINE DataSpace<DIM> getSuperCellIndex(const DataSpace<DIM>& realSuperCellIdx) const
         {
             return AreaMappingMethods<areaType, DIM>::getBlockIndex(*this,
                                                                     this->getGridSuperCells(),

diff --git a/src/libPMacc/include/mappings/kernel/ExchangeMapping.hpp b/src/libPMacc/include/mappings/kernel/ExchangeMapping.hpp
@@ -1,5 +1,5 @@
 /**
- * Copyright 2013 Felix Schmitt, Heiko Burau, Rene Widera
+ * Copyright 2013-2015 Felix Schmitt, Heiko Burau, Rene Widera
  *
  * This file is part of libPMacc.
  *
@@ -97,7 +97,7 @@ namespace PMacc
          * @param realSuperCellIdx current SuperCell index (block index)
          * @return mapped SuperCell index
          */
-        DINLINE DataSpace<DIM> getSuperCellIndex(const DataSpace<DIM>& realSuperCellIdx) const
+        HDINLINE DataSpace<DIM> getSuperCellIndex(const DataSpace<DIM>& realSuperCellIdx) const
         {
             return ExchangeMappingMethods<areaType, DIM>::getBlockIndex(
                                                                         *this,

diff --git a/src/libPMacc/include/mappings/kernel/StrideMapping.hpp b/src/libPMacc/include/mappings/kernel/StrideMapping.hpp
@@ -1,5 +1,5 @@
 /**
- * Copyright 2013 Felix Schmitt, Heiko Burau, Rene Widera
+ * Copyright 2013-2015 Felix Schmitt, Heiko Burau, Rene Widera
  *
  * This file is part of libPMacc.
  *
@@ -74,7 +74,7 @@ class StrideMapping<areaType, stride, baseClass<DIM, SuperCellSize_> > : public
      * @param realSuperCellIdx current SuperCell index (block index)
      * @return mapped SuperCell index
      */
-    DINLINE DataSpace<DIM> getSuperCellIndex(const DataSpace<DIM>& realSuperCellIdx) const
+    HDINLINE DataSpace<DIM> getSuperCellIndex(const DataSpace<DIM>& realSuperCellIdx) const
     {
         const DataSpace<DIM> blockId((realSuperCellIdx * (int)Stride) + offset);
         return StrideMappingMethods<areaType, DIM>::shift(*this, blockId);