From cb8e2c0c734a4cb28a2657bb2182526b3966f049 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Widera?= Date: Wed, 3 Jun 2015 14:47:03 +0200 Subject: [PATCH] add host support for kernel mapper change `DINLINE` to `HDINLINE` --- src/libPMacc/include/mappings/kernel/AreaMapping.hpp | 4 ++-- src/libPMacc/include/mappings/kernel/ExchangeMapping.hpp | 4 ++-- src/libPMacc/include/mappings/kernel/StrideMapping.hpp | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/libPMacc/include/mappings/kernel/AreaMapping.hpp b/src/libPMacc/include/mappings/kernel/AreaMapping.hpp index 1720206a1e..5ce356d952 100644 --- 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 getSuperCellIndex(const DataSpace& realSuperCellIdx) const + HDINLINE DataSpace getSuperCellIndex(const DataSpace& realSuperCellIdx) const { return AreaMappingMethods::getBlockIndex(*this, this->getGridSuperCells(), diff --git a/src/libPMacc/include/mappings/kernel/ExchangeMapping.hpp b/src/libPMacc/include/mappings/kernel/ExchangeMapping.hpp index 559f799049..b4c67412f9 100644 --- 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 getSuperCellIndex(const DataSpace& realSuperCellIdx) const + HDINLINE DataSpace getSuperCellIndex(const DataSpace& realSuperCellIdx) const { return ExchangeMappingMethods::getBlockIndex( *this, diff --git a/src/libPMacc/include/mappings/kernel/StrideMapping.hpp b/src/libPMacc/include/mappings/kernel/StrideMapping.hpp index c607e7f60e..32a190455e 100644 --- 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 > : public * @param realSuperCellIdx current SuperCell index (block index) * @return mapped SuperCell index */ - DINLINE DataSpace getSuperCellIndex(const DataSpace& realSuperCellIdx) const + HDINLINE DataSpace getSuperCellIndex(const DataSpace& realSuperCellIdx) const { const DataSpace blockId((realSuperCellIdx * (int)Stride) + offset); return StrideMappingMethods::shift(*this, blockId);