From 5d9dc62787b854596479a94b4f7756c5d6f87b4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Klinkovsk=C3=BD?= <klinkjak@fjfi.cvut.cz>
Date: Fri, 4 Jan 2019 23:03:17 +0100
Subject: [PATCH] Fixed order of indices in the traverser benchmarks
---
.../Traversers/GridTraversersBenchmark_2D.h | 12 ++++++------
.../Traversers/GridTraversersBenchmark_3D.h | 12 ++++++------
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/Benchmarks/Traversers/GridTraversersBenchmark_2D.h b/src/Benchmarks/Traversers/GridTraversersBenchmark_2D.h
index d62d56f912..48f11bfb91 100644
--- a/src/Benchmarks/Traversers/GridTraversersBenchmark_2D.h
+++ b/src/Benchmarks/Traversers/GridTraversersBenchmark_2D.h
@@ -98,7 +98,7 @@ class GridTraversersBenchmark< 2, Device, Real, Index >
Index _size = this->size;
auto f = [=] __cuda_callable__ ( Index i, Index j, Real* data )
{
- data[ i * _size + j ] += 1.0;
+ data[ j * _size + i ] += 1.0;
};
ParallelFor2D< Device >::exec( ( Index ) 0,
@@ -114,8 +114,8 @@ class GridTraversersBenchmark< 2, Device, Real, Index >
auto f = [=] __cuda_callable__ ( Index i, Index j, Real* data )
{
Cell entity( *currentGrid );
- entity.getCoordinates().y() = i;
- entity.getCoordinates().x() = j;
+ entity.getCoordinates().x() = i;
+ entity.getCoordinates().y() = j;
entity.refresh();
data[ entity.getIndex() ] += 1.0;
};
@@ -134,8 +134,8 @@ class GridTraversersBenchmark< 2, Device, Real, Index >
auto f = [=] __cuda_callable__ ( Index i, Index j, Real* data )
{
Cell entity( *currentGrid );
- entity.getCoordinates().y() = i;
- entity.getCoordinates().x() = j;
+ entity.getCoordinates().x() = i;
+ entity.getCoordinates().y() = j;
entity.refresh();
( *_u )( entity ) += 1.0;
};
@@ -249,4 +249,4 @@ class GridTraversersBenchmark< 2, Device, Real, Index >
} // namespace Traversers
} // namespace Benchmarks
-} // namespace TNL
\ No newline at end of file
+} // namespace TNL
diff --git a/src/Benchmarks/Traversers/GridTraversersBenchmark_3D.h b/src/Benchmarks/Traversers/GridTraversersBenchmark_3D.h
index 383640d393..cceffa328d 100644
--- a/src/Benchmarks/Traversers/GridTraversersBenchmark_3D.h
+++ b/src/Benchmarks/Traversers/GridTraversersBenchmark_3D.h
@@ -104,7 +104,7 @@ class GridTraversersBenchmark< 3, Device, Real, Index >
Index _size = this->size;
auto f = [=] __cuda_callable__ ( Index i, Index j, Index k, Real* data )
{
- data[ ( i * _size + j ) * _size + k ] += 1.0;
+ data[ ( k * _size + j ) * _size + i ] += 1.0;
};
ParallelFor3D< Device >::exec( ( Index ) 0,
@@ -122,9 +122,9 @@ class GridTraversersBenchmark< 3, Device, Real, Index >
auto f = [=] __cuda_callable__ ( Index i, Index j, Index k, Real* data )
{
Cell entity( *currentGrid );
- entity.getCoordinates().z() = i;
+ entity.getCoordinates().x() = i;
entity.getCoordinates().y() = j;
- entity.getCoordinates().x() = k;
+ entity.getCoordinates().z() = k;
entity.refresh();
data[ entity.getIndex() ] += 1.0;
};
@@ -145,9 +145,9 @@ class GridTraversersBenchmark< 3, Device, Real, Index >
auto f = [=] __cuda_callable__ ( Index i, Index j, Index k, Real* data )
{
Cell entity( *currentGrid );
- entity.getCoordinates().z() = i;
+ entity.getCoordinates().x() = i;
entity.getCoordinates().y() = j;
- entity.getCoordinates().x() = k;
+ entity.getCoordinates().z() = k;
entity.refresh();
( *_u )( entity ) += 1.0;
};
@@ -257,4 +257,4 @@ class GridTraversersBenchmark< 3, Device, Real, Index >
} // namespace Traversers
} // namespace Benchmarks
-} // namespace TNL
\ No newline at end of file
+} // namespace TNL
--
GitLab