From 53ef455d822d7271d8a64653c48fd2ce6507da6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Klinkovsk=C3=BD?= <klinkjak@fjfi.cvut.cz>
Date: Fri, 17 Feb 2017 22:35:01 +0100
Subject: [PATCH] Added missing __cuda_callable__ marks
---
src/TNL/Meshes/Mesh.h | 2 ++
src/TNL/Meshes/MeshDetails/Mesh_impl.h | 2 ++
src/TNL/Meshes/MeshDetails/layers/MeshBoundaryTagsLayer.h | 5 +++++
src/TNL/Meshes/MeshDetails/layers/MeshStorageLayer.h | 4 ++++
4 files changed, 13 insertions(+)
diff --git a/src/TNL/Meshes/Mesh.h b/src/TNL/Meshes/Mesh.h
index 3a6674af93..43ee0eeb65 100644
--- a/src/TNL/Meshes/Mesh.h
+++ b/src/TNL/Meshes/Mesh.h
@@ -113,6 +113,7 @@ class Mesh
static constexpr bool entitiesAvailable();
template< int Dimension >
+ __cuda_callable__
GlobalIndexType getEntitiesCount() const;
template< int Dimension >
@@ -126,6 +127,7 @@ class Mesh
// duplicated for compatibility with grids
template< typename EntityType >
+ __cuda_callable__
GlobalIndexType getEntitiesCount() const;
template< typename EntityType >
diff --git a/src/TNL/Meshes/MeshDetails/Mesh_impl.h b/src/TNL/Meshes/MeshDetails/Mesh_impl.h
index 02c22c853b..8ec0af8ff6 100644
--- a/src/TNL/Meshes/MeshDetails/Mesh_impl.h
+++ b/src/TNL/Meshes/MeshDetails/Mesh_impl.h
@@ -132,6 +132,7 @@ entitiesAvailable()
template< typename MeshConfig, typename Device >
template< int Dimension >
+__cuda_callable__
typename Mesh< MeshConfig, Device >::GlobalIndexType
Mesh< MeshConfig, Device >::
getEntitiesCount() const
@@ -166,6 +167,7 @@ getEntity( const GlobalIndexType& entityIndex ) const
// duplicated for compatibility with grids
template< typename MeshConfig, typename Device >
template< typename Entity >
+__cuda_callable__
typename Mesh< MeshConfig, Device >::GlobalIndexType
Mesh< MeshConfig, Device >::
getEntitiesCount() const
diff --git a/src/TNL/Meshes/MeshDetails/layers/MeshBoundaryTagsLayer.h b/src/TNL/Meshes/MeshDetails/layers/MeshBoundaryTagsLayer.h
index 282a774646..edafd8cd01 100644
--- a/src/TNL/Meshes/MeshDetails/layers/MeshBoundaryTagsLayer.h
+++ b/src/TNL/Meshes/MeshDetails/layers/MeshBoundaryTagsLayer.h
@@ -86,6 +86,7 @@ public:
boundaryTags[ entityIndex ] = isBoundary;
}
+ __cuda_callable__
bool isBoundaryEntity( DimensionTag, const GlobalIndexType& entityIndex ) const
{
return boundaryTags[ entityIndex ];
@@ -161,21 +162,25 @@ public:
return true;
}
+ __cuda_callable__
GlobalIndexType getBoundaryEntitiesCount( DimensionTag ) const
{
return boundaryIndices.getSize();
}
+ __cuda_callable__
GlobalIndexType getBoundaryEntityIndex( DimensionTag, const GlobalIndexType& i ) const
{
return boundaryIndices[ i ];
}
+ __cuda_callable__
GlobalIndexType getInteriorEntitiesCount( DimensionTag ) const
{
return interiorIndices.getSize();
}
+ __cuda_callable__
GlobalIndexType getInteriorEntityIndex( DimensionTag, const GlobalIndexType& i ) const
{
return interiorIndices[ i ];
diff --git a/src/TNL/Meshes/MeshDetails/layers/MeshStorageLayer.h b/src/TNL/Meshes/MeshDetails/layers/MeshStorageLayer.h
index 1cd25f675d..dff2802d72 100644
--- a/src/TNL/Meshes/MeshDetails/layers/MeshStorageLayer.h
+++ b/src/TNL/Meshes/MeshDetails/layers/MeshStorageLayer.h
@@ -91,6 +91,7 @@ protected:
}
template< int Dimension >
+ __cuda_callable__
typename EntityTraits< Dimension >::GlobalIndexType getBoundaryEntitiesCount() const
{
static_assert( EntityTraits< Dimension >::boundaryTagsEnabled, "You try to access boundary tags which are not configured for storage." );
@@ -106,6 +107,7 @@ protected:
}
template< int Dimension >
+ __cuda_callable__
typename EntityTraits< Dimension >::GlobalIndexType getInteriorEntitiesCount() const
{
static_assert( EntityTraits< Dimension >::boundaryTagsEnabled, "You try to access boundary tags which are not configured for storage." );
@@ -227,6 +229,7 @@ public:
return true;
}
+ __cuda_callable__
GlobalIndexType getEntitiesCount( DimensionTag ) const
{
return this->entities.getSize();
@@ -424,6 +427,7 @@ public:
return true;
}
+ __cuda_callable__
GlobalIndexType getEntitiesCount( DimensionTag ) const
{
return this->vertices.getSize();
--
GitLab