aboutsummaryrefslogtreecommitdiffhomepage
path: root/test
diff options
context:
space:
mode:
authorGravatar Gael Guennebaud <g.gael@free.fr>2014-10-15 16:33:14 +0200
committerGravatar Gael Guennebaud <g.gael@free.fr>2014-10-15 16:33:14 +0200
commitfd1aaf4772515f7a0ff124d2d79ed94aa3f66bdc (patch)
tree3c0abd1d200a20b2cda3153c4382057ef8e4de38 /test
parentc8060094535882e4fc46e5d54a13358d6c23b7a9 (diff)
parent0ec1fc9e114a2fb8fd0cbeee38669547f46804c8 (diff)
merge
Diffstat (limited to 'test')
-rw-r--r--test/cuda_basic.cu6
1 files changed, 3 insertions, 3 deletions
diff --git a/test/cuda_basic.cu b/test/cuda_basic.cu
index 4c7e96c10..300bced02 100644
--- a/test/cuda_basic.cu
+++ b/test/cuda_basic.cu
@@ -65,7 +65,7 @@ struct redux {
};
template<typename T1, typename T2>
-struct prod {
+struct prod_test {
EIGEN_DEVICE_FUNC
void operator()(int i, const typename T1::Scalar* in, typename T1::Scalar* out) const
{
@@ -125,8 +125,8 @@ void test_cuda_basic()
CALL_SUBTEST( run_and_compare_to_cuda(redux<Array4f>(), nthreads, in, out) );
CALL_SUBTEST( run_and_compare_to_cuda(redux<Matrix3f>(), nthreads, in, out) );
- CALL_SUBTEST( run_and_compare_to_cuda(prod<Matrix3f,Matrix3f>(), nthreads, in, out) );
- CALL_SUBTEST( run_and_compare_to_cuda(prod<Matrix4f,Vector4f>(), nthreads, in, out) );
+ CALL_SUBTEST( run_and_compare_to_cuda(prod_test<Matrix3f,Matrix3f>(), nthreads, in, out) );
+ CALL_SUBTEST( run_and_compare_to_cuda(prod_test<Matrix4f,Vector4f>(), nthreads, in, out) );
CALL_SUBTEST( run_and_compare_to_cuda(diagonal<Matrix3f,Vector3f>(), nthreads, in, out) );
CALL_SUBTEST( run_and_compare_to_cuda(diagonal<Matrix4f,Vector4f>(), nthreads, in, out) );