From b910c365ad37f75a169301ab8ddd188c9ae18220 Mon Sep 17 00:00:00 2001
From: Pietro Incardona <incardon@mpi-cbg.de>
Date: Mon, 16 Dec 2019 14:33:44 +0100
Subject: [PATCH] Fixing for Clang
---
script/py/process_examples.py | 2 +-
src/Vector/vector_dist_kernel.hpp | 16 ++++++++--------
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/script/py/process_examples.py b/script/py/process_examples.py
index a77878e51..172a36f5a 100644
--- a/script/py/process_examples.py
+++ b/script/py/process_examples.py
@@ -7,7 +7,7 @@ from os import listdir
from os.path import isdir, join
from pack_examples import pack_example
-parser = argparse.ArgumentParser(description='Pack the examples, generate the vtk files to generate images, create the markdown pages for the wiki')
+parser = argparse.ArgumentParser(description='Pack the examples')
parser.add_argument('directory', help='directory where are located the examples')
args = parser.parse_args()
diff --git a/src/Vector/vector_dist_kernel.hpp b/src/Vector/vector_dist_kernel.hpp
index 4e825223c..48bdc5efa 100644
--- a/src/Vector/vector_dist_kernel.hpp
+++ b/src/Vector/vector_dist_kernel.hpp
@@ -113,7 +113,7 @@ public:
* \return the position of the element in space
*
*/
- __device__ inline auto getPos(int vec_key) -> decltype(v_pos.template get<0>(vec_key))
+ __device__ __host__ inline auto getPos(int vec_key) -> decltype(v_pos.template get<0>(vec_key))
{
return v_pos.template get<0>(vec_key);
}
@@ -127,7 +127,7 @@ public:
* \return the position of the element in space
*
*/
- __device__ inline auto getPos(const vect_dist_key_dx & vec_key) -> decltype(v_pos.template get<0>(vec_key.getKey()))
+ __device__ __host__ inline auto getPos(const vect_dist_key_dx & vec_key) -> decltype(v_pos.template get<0>(vec_key.getKey()))
{
return v_pos.template get<0>(vec_key.getKey());
}
@@ -141,7 +141,7 @@ public:
* \return the position of the element in space
*
*/
- __device__ inline auto getPos(int vec_key) const -> decltype(v_pos.template get<0>(vec_key))
+ __device__ __host__ inline auto getPos(int vec_key) const -> decltype(v_pos.template get<0>(vec_key))
{
return v_pos.template get<0>(vec_key);
}
@@ -155,7 +155,7 @@ public:
* \return the position of the element in space
*
*/
- __device__ inline auto getPos(const vect_dist_key_dx & vec_key) const -> decltype(v_pos.template get<0>(vec_key.getKey()))
+ __device__ __host__ inline auto getPos(const vect_dist_key_dx & vec_key) const -> decltype(v_pos.template get<0>(vec_key.getKey()))
{
return v_pos.template get<0>(vec_key.getKey());
}
@@ -170,7 +170,7 @@ public:
* \return return the selected property of the vector element
*
*/
- template<unsigned int id> __device__ inline auto getProp(int vec_key) -> decltype(v_prp.template get<id>(vec_key))
+ template<unsigned int id> __device__ __host__ inline auto getProp(int vec_key) -> decltype(v_prp.template get<id>(vec_key))
{
return v_prp.template get<id>(vec_key);
}
@@ -185,7 +185,7 @@ public:
* \return return the selected property of the vector element
*
*/
- template<unsigned int id> __device__ inline auto getProp(const vect_dist_key_dx & vec_key) -> decltype(v_prp.template get<id>(vec_key.getKey()))
+ template<unsigned int id> __device__ __host__ inline auto getProp(const vect_dist_key_dx & vec_key) -> decltype(v_prp.template get<id>(vec_key.getKey()))
{
return v_prp.template get<id>(vec_key.getKey());
}
@@ -200,7 +200,7 @@ public:
* \return return the selected property of the vector element
*
*/
- template<unsigned int id> __device__ inline auto getProp(int vec_key) const -> decltype(v_prp.template get<id>(vec_key))
+ template<unsigned int id> __device__ __host__ inline auto getProp(int vec_key) const -> decltype(v_prp.template get<id>(vec_key))
{
return v_prp.template get<id>(vec_key);
}
@@ -215,7 +215,7 @@ public:
* \return return the selected property of the vector element
*
*/
- template<unsigned int id> __device__ inline auto getProp(const vect_dist_key_dx & vec_key) const -> decltype(v_prp.template get<id>(vec_key.getKey()))
+ template<unsigned int id> __device__ __host__ inline auto getProp(const vect_dist_key_dx & vec_key) const -> decltype(v_prp.template get<id>(vec_key.getKey()))
{
return v_prp.template get<id>(vec_key.getKey());
}
--
GitLab