From 206d69a6f782997cb9b29f5b0e3c36780df37bf5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Oberhuber?= <oberhuber.tomas@gmail.com>
Date: Tue, 9 Apr 2019 22:13:03 +0200
Subject: [PATCH] Fixing ArrayView evaluate test.
---
src/UnitTests/Containers/ArrayViewTest.h | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/src/UnitTests/Containers/ArrayViewTest.h b/src/UnitTests/Containers/ArrayViewTest.h
index 046d10619b..50c8d624be 100644
--- a/src/UnitTests/Containers/ArrayViewTest.h
+++ b/src/UnitTests/Containers/ArrayViewTest.h
@@ -306,20 +306,20 @@ TYPED_TEST( ArrayViewTest, elementwiseAccess )
testArrayViewElementwiseAccess( ArrayType() );
}
-TYPED_TEST( ArrayViewTest, evaluate )
+template< typename ArrayType >
+void ArrayViewEvaluateTest( ArrayType& u )
{
- using ArrayType = typename TestFixture::ArrayType;
using ValueType = typename ArrayType::ValueType;
using DeviceType = typename ArrayType::DeviceType;
using IndexType = typename ArrayType::IndexType;
using ViewType = ArrayView< ValueType, DeviceType, IndexType >;
- ArrayType u( 10 );
ViewType v( u );
-
+
auto f = [] __cuda_callable__ ( IndexType i )
{
return 3 * i % 4;
};
+
v.evaluate( f );
for( int i = 0; i < 10; i++ )
{
@@ -328,6 +328,13 @@ TYPED_TEST( ArrayViewTest, evaluate )
}
}
+TYPED_TEST( ArrayViewTest, evaluate )
+{
+ using ArrayType = typename TestFixture::ArrayType;
+ ArrayType u( 10 );
+ ArrayViewEvaluateTest( u );
+}
+
TYPED_TEST( ArrayViewTest, containsValue )
{
using ArrayType = typename TestFixture::ArrayType;
--
GitLab