From e8f91de7cb491ebe1283247b3aba55076a150ba5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Oberhuber?= <oberhuber.tomas@gmail.com>
Date: Wed, 15 Jun 2016 21:15:33 +0200
Subject: [PATCH] Debuging heat eqquation benchmark.
---
.../HeatEquationBenchmarkProblem.h | 2 +
.../HeatEquationBenchmarkProblem_impl.h | 83 +++++--------------
2 files changed, 21 insertions(+), 64 deletions(-)
diff --git a/tests/benchmarks/heat-equation-benchmark/HeatEquationBenchmarkProblem.h b/tests/benchmarks/heat-equation-benchmark/HeatEquationBenchmarkProblem.h
index 6fa97c0dc6..c8badd7856 100644
--- a/tests/benchmarks/heat-equation-benchmark/HeatEquationBenchmarkProblem.h
+++ b/tests/benchmarks/heat-equation-benchmark/HeatEquationBenchmarkProblem.h
@@ -87,6 +87,8 @@ class HeatEquationBenchmarkProblem:
BoundaryConditionPointer boundaryConditionPointer;
RightHandSidePointer rightHandSidePointer;
+ MeshFunctionPointer fu, u;
+
tnlString cudaKernelType;
MeshType* cudaMesh;
diff --git a/tests/benchmarks/heat-equation-benchmark/HeatEquationBenchmarkProblem_impl.h b/tests/benchmarks/heat-equation-benchmark/HeatEquationBenchmarkProblem_impl.h
index eebfbc3196..abd9110370 100644
--- a/tests/benchmarks/heat-equation-benchmark/HeatEquationBenchmarkProblem_impl.h
+++ b/tests/benchmarks/heat-equation-benchmark/HeatEquationBenchmarkProblem_impl.h
@@ -233,9 +233,9 @@ template< typename GridType,
typename BoundaryConditions,
typename MeshFunction >
__global__ void
-boundaryConditionsTemplatedCompact( const GridType grid,
- const BoundaryConditions boundaryConditions,
- MeshFunction u,
+boundaryConditionsTemplatedCompact( const GridType* grid,
+ const BoundaryConditions* boundaryConditions,
+ MeshFunction* u,
const typename GridType::RealType time,
const typename GridEntity::CoordinatesType begin,
const typename GridEntity::CoordinatesType end,
@@ -271,62 +271,17 @@ boundaryConditionsTemplatedCompact( const GridType grid,
}
}
-/*template< typename Grid,
- int EntityDimensions = 2,
- typename Config = tnlGridEntityNoStencilStorage >
-struct TestEntity
-{
- typedef Grid GridType;
- typedef GridType MeshType;
- typedef typename GridType::RealType RealType;
- typedef typename GridType::IndexType IndexType;
- typedef typename GridType::CoordinatesType CoordinatesType;
- typedef Config ConfigType;
-
- static const int meshDimensions = GridType::meshDimensions;
-
- static const int entityDimensions = EntityDimensions;
-
- constexpr static int getDimensions() { return EntityDimensions; };
-
- constexpr static int getMeshDimensions() { return meshDimensions; };
-
- typedef TestEntity< GridType, EntityDimensions, Config > ThisType;
- typedef tnlNeighbourGridEntitiesStorage< ThisType > NeighbourGridEntitiesStorageType;
-
-
- __cuda_callable__ TestEntity( const GridType& grid,
- const CoordinatesType& coordinates,
- const CoordinatesType& entityOrientation,
- const CoordinatesType& entityBasis )
- : grid( grid ), coordinates( coordinates ),
- entityOrientation( 0 ),
- entityBasis( 1 ),
- neighbourEntitiesStorage( *this )
- {
-
- }
-
- const GridType& grid;
-
- CoordinatesType coordinates;
- CoordinatesType entityOrientation;
- CoordinatesType entityBasis;
-
- NeighbourGridEntitiesStorageType neighbourEntitiesStorage;
-};*/
-
template< typename GridType,
typename GridEntity,
typename DifferentialOperator,
typename RightHandSide,
typename MeshFunction >
__global__ void
-heatEquationTemplatedCompact( const GridType grid,
- const DifferentialOperator differentialOperator,
- const RightHandSide rightHandSide,
- MeshFunction u,
- MeshFunction fu,
+heatEquationTemplatedCompact( const GridType* grid,
+ const DifferentialOperator* differentialOperator,
+ const RightHandSide* rightHandSide,
+ MeshFunction* u,
+ MeshFunction* fu,
const typename GridType::RealType time,
const typename GridEntity::CoordinatesType begin,
const typename GridEntity::CoordinatesType end,
@@ -474,9 +429,9 @@ getExplicitRHS( const RealType& time,
{
typedef typename MeshType::Cell CellType;
typedef typename CellType::CoordinatesType CoordinatesType;
- MeshFunctionType u( mesh, uDofs );
- MeshFunctionType fu( mesh, fuDofs );
- fu.getData().setValue( 1.0 );
+ u->bind( mesh, uDofs );
+ fu->bind( mesh, fuDofs );
+ fu->getData().setValue( 1.0 );
const CoordinatesType begin( 0,0 );
const CoordinatesType& end = mesh->getDimensions();
CellType cell( mesh.template getData< DeviceType >() );
@@ -493,9 +448,9 @@ getExplicitRHS( const RealType& time,
for( IndexType gridXIdx = 0; gridXIdx < cudaXGrids; gridXIdx ++ )
boundaryConditionsTemplatedCompact< MeshType, CellType, BoundaryCondition, MeshFunctionType >
<<< cudaBlocks, cudaBlockSize >>>
- ( mesh.template getData< DeviceType >(),
- boundaryConditionPointer.template getData< DeviceType >(),
- u,
+ ( &mesh.template getData< tnlCuda >(),
+ &boundaryConditionPointer.template getData< tnlCuda >(),
+ &u.template getData< tnlCuda >(),
time,
begin,
end,
@@ -510,11 +465,11 @@ getExplicitRHS( const RealType& time,
for( IndexType gridXIdx = 0; gridXIdx < cudaXGrids; gridXIdx ++ )
heatEquationTemplatedCompact< MeshType, CellType, DifferentialOperator, RightHandSide, MeshFunctionType >
<<< cudaBlocks, cudaBlockSize >>>
- ( mesh.template getData< DeviceType >(),
- differentialOperatorPointer.template getData< DeviceType >(),
- rightHandSidePointer.template getData< DeviceType >(),
- u,
- fu,
+ ( &mesh.template getData< DeviceType >(),
+ &differentialOperatorPointer.template getData< DeviceType >(),
+ &rightHandSidePointer.template getData< DeviceType >(),
+ &u.template getData< DeviceType >(),
+ &fu.template getData< DeviceType >(),
time,
begin,
end,
--
GitLab