Skip to content

fixup: capture by reference due to Kokkos C++20 update #124

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
streeve wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fixup: capture by reference due to Kokkos C++20 update #124

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
76 changes: 38 additions & 38 deletions src/Picasso_BatchedLinearAlgebra.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -383,23 +383,23 @@ struct Tensor4Expression
const int q ) const
{
return createVectorExpression<T, M>(
[=]( const int i ) { return ( *this )( i, n, p, q ); } );
[&]( const int i ) { return ( *this )( i, n, p, q ); } );
}
// Get a row as a vector view.
KOKKOS_INLINE_FUNCTION
auto vector( const int m, const ALL_INDEX_t, const int p,
const int q ) const
{
return createVectorExpression<T, N>(
[=]( const int i ) { return ( *this )( m, i, p, q ); } );
[&]( const int i ) { return ( *this )( m, i, p, q ); } );
}
// Get a row as a vector view.
KOKKOS_INLINE_FUNCTION
auto vector( const int m, const int n, const ALL_INDEX_t,
const int q ) const
{
return createVectorExpression<T, P>(
[=]( const int i ) { return ( *this )( m, n, i, q ); } );
[&]( const int i ) { return ( *this )( m, n, i, q ); } );
}

// Get a row as a vector view.
Expand All @@ -408,7 +408,7 @@ struct Tensor4Expression
const ALL_INDEX_t ) const
{
return createVectorExpression<T, Q>(
[=]( const int i ) { return ( *this )( m, n, p, i ); } );
[&]( const int i ) { return ( *this )( m, n, p, i ); } );
}

// Get a matrix as a matrix view.
Expand All @@ -417,7 +417,7 @@ struct Tensor4Expression
const int q ) const
{
return createMatrixExpression<T, M, N>(
[=]( const int i, const int j )
[&]( const int i, const int j )
{ return ( *this )( i, j, p, q ); } );
}
// Get a matrix as a matrix view.
Expand All @@ -426,7 +426,7 @@ struct Tensor4Expression
const int q ) const
{
return createMatrixExpression<T, M, P>(
[=]( const int i, const int j )
[&]( const int i, const int j )
{ return ( *this )( i, n, j, q ); } );
}
// Get a matrix as a matrix view.
Expand All @@ -435,7 +435,7 @@ struct Tensor4Expression
const int q ) const
{
return createMatrixExpression<T, N, P>(
[=]( const int i, const int j )
[&]( const int i, const int j )
{ return ( *this )( m, i, j, q ); } );
}
// Get a matrix as a matrix view.
Expand All @@ -444,7 +444,7 @@ struct Tensor4Expression
const ALL_INDEX_t ) const
{
return createMatrixExpression<T, M, Q>(
[=]( const int i, const int j )
[&]( const int i, const int j )
{ return ( *this )( i, n, p, j ); } );
}
// Get a matrix as a matrix view.
Expand All @@ -453,7 +453,7 @@ struct Tensor4Expression
const ALL_INDEX_t ) const
{
return createMatrixExpression<T, N, Q>(
[=]( const int i, const int j )
[&]( const int i, const int j )
{ return ( *this )( m, i, p, j ); } );
}
// Get a matrix as a matrix view.
Expand All @@ -462,7 +462,7 @@ struct Tensor4Expression
const ALL_INDEX_t ) const
{
return createMatrixExpression<T, P, Q>(
[=]( const int i, const int j )
[&]( const int i, const int j )
{ return ( *this )( m, n, i, j ); } );
}

Expand All @@ -472,7 +472,7 @@ struct Tensor4Expression
const int b )
{
return createTensor3Expression<T, M, N, P>(
[=]( const int i, const int j, const int k )
[&]( const int i, const int j, const int k )
{ return ( *this )( i, j, k, b ); } );
}
// Get a tensor3 as a Tensor3 view.
Expand All @@ -481,7 +481,7 @@ struct Tensor4Expression
const ALL_INDEX_t )
{
return createTensor3Expression<T, M, N, Q>(
[=]( const int i, const int j, const int k )
[&]( const int i, const int j, const int k )
{ return ( *this )( i, j, b, k ); } );
}
// Get a tensor3 as a Tensor3 view.
Expand All @@ -490,7 +490,7 @@ struct Tensor4Expression
const ALL_INDEX_t )
{
return createTensor3Expression<T, M, P, Q>(
[=]( const int i, const int j, const int k )
[&]( const int i, const int j, const int k )
{ return ( *this )( i, b, j, k ); } );
}
// Get a tensor3 as a Tensor3 view.
Expand All @@ -499,7 +499,7 @@ struct Tensor4Expression
const ALL_INDEX_t )
{
return createTensor3Expression<T, N, P, Q>(
[=]( const int i, const int j, const int k )
[&]( const int i, const int j, const int k )
{ return ( *this )( b, i, j, k ); } );
}
};
Expand Down Expand Up @@ -550,21 +550,21 @@ struct Tensor3Expression
KOKKOS_INLINE_FUNCTION
auto vector( const ALL_INDEX_t, const int n, const int p ) const
{
return createVectorExpression<T, M>( [=]( const int i )
return createVectorExpression<T, M>( [&]( const int i )
{ return ( *this )( i, n, p ); } );
}
// Get a row as a vector view.
KOKKOS_INLINE_FUNCTION
auto vector( const int m, const ALL_INDEX_t, const int p ) const
{
return createVectorExpression<T, N>( [=]( const int i )
return createVectorExpression<T, N>( [&]( const int i )
{ return ( *this )( m, i, p ); } );
}
// Get a row as a vector view.
KOKKOS_INLINE_FUNCTION
auto vector( const int m, const int n, const ALL_INDEX_t ) const
{
return createVectorExpression<T, P>( [=]( const int i )
return createVectorExpression<T, P>( [&]( const int i )
{ return ( *this )( m, n, i ); } );
}

Expand All @@ -573,21 +573,21 @@ struct Tensor3Expression
auto matrix( const ALL_INDEX_t, const ALL_INDEX_t, const int p ) const
{
return createMatrixExpression<T, M, N>(
[=]( const int i, const int j ) { return ( *this )( i, j, p ); } );
[&]( const int i, const int j ) { return ( *this )( i, j, p ); } );
}
// Get a matrix as a matrix view.
KOKKOS_INLINE_FUNCTION
auto matrix( const ALL_INDEX_t, const int n, const ALL_INDEX_t ) const
{
return createMatrixExpression<T, M, P>(
[=]( const int i, const int j ) { return ( *this )( i, n, j ); } );
[&]( const int i, const int j ) { return ( *this )( i, n, j ); } );
}
// Get a matrix as a matrix view.
KOKKOS_INLINE_FUNCTION
auto matrix( const int m, const ALL_INDEX_t, const ALL_INDEX_t ) const
{
return createMatrixExpression<T, N, P>(
[=]( const int i, const int j ) { return ( *this )( m, i, j ); } );
[&]( const int i, const int j ) { return ( *this )( m, i, j ); } );
}
};

Expand Down Expand Up @@ -635,15 +635,15 @@ struct MatrixExpression
KOKKOS_INLINE_FUNCTION
auto row( const int n ) const
{
return createVectorExpression<T, N>( [=]( const int i )
return createVectorExpression<T, N>( [&]( const int i )
{ return ( *this )( n, i ); } );
}

// Get a column as a vector expression.
KOKKOS_INLINE_FUNCTION
auto column( const int n ) const
{
return createVectorExpression<T, M>( [=]( const int i )
return createVectorExpression<T, M>( [&]( const int i )
{ return ( *this )( i, n ); } );
}
};
Expand Down Expand Up @@ -3732,7 +3732,7 @@ KOKKOS_INLINE_FUNCTION auto operator~( const Expression& e )
{
return createMatrixExpression<typename Expression::value_type,
Expression::extent_1, Expression::extent_0>(
[=]( const int i, const int j ) { return e( j, i ); } );
[&]( const int i, const int j ) { return e( j, i ); } );
}

//---------------------------------------------------------------------------//
Expand All @@ -3743,7 +3743,7 @@ KOKKOS_INLINE_FUNCTION auto operator~( const Expression& e )
{
return createMatrixExpression<typename Expression::value_type, 1,
Expression::extent_0>(
[=]( const int, const int j ) { return e( j ); } );
[&]( const int, const int j ) { return e( j ); } );
}

//---------------------------------------------------------------------------//
Expand Down Expand Up @@ -3777,7 +3777,7 @@ KOKKOS_INLINE_FUNCTION auto operator+( const ExpressionA& a,
"extent_1 must match" );
return createMatrixExpression<typename ExpressionA::value_type,
ExpressionA::extent_0, ExpressionA::extent_1>(
[=]( const int i, const int j ) { return a( i, j ) + b( i, j ); } );
[&]( const int i, const int j ) { return a( i, j ) + b( i, j ); } );
}

//---------------------------------------------------------------------------//
Expand All @@ -3799,7 +3799,7 @@ KOKKOS_INLINE_FUNCTION auto operator-( const ExpressionA& a,
"extent_1 must_match" );
return createMatrixExpression<typename ExpressionA::value_type,
ExpressionA::extent_0, ExpressionA::extent_1>(
[=]( const int i, const int j ) { return a( i, j ) - b( i, j ); } );
[&]( const int i, const int j ) { return a( i, j ) - b( i, j ); } );
}

//---------------------------------------------------------------------------//
Expand Down Expand Up @@ -3913,7 +3913,7 @@ KOKKOS_INLINE_FUNCTION auto operator+( const ExpressionX& x,
"extent must match" );
return createVectorExpression<typename ExpressionX::value_type,
ExpressionX::extent_0>(
[=]( const int i ) { return x( i ) + y( i ); } );
[&]( const int i ) { return x( i ) + y( i ); } );
}

//---------------------------------------------------------------------------//
Expand All @@ -3933,7 +3933,7 @@ KOKKOS_INLINE_FUNCTION auto operator-( const ExpressionX& x,
"extent must match" );
return createVectorExpression<typename ExpressionX::value_type,
ExpressionX::extent_0>(
[=]( const int i ) { return x( i ) - y( i ); } );
[&]( const int i ) { return x( i ) - y( i ); } );
}

//---------------------------------------------------------------------------//
Expand All @@ -3953,7 +3953,7 @@ KOKKOS_INLINE_FUNCTION auto operator+( const ExpressionX& x,
"extent must match" );
return createQuaternionExpression<typename ExpressionX::value_type,
ExpressionX::extent_0>(
[=]( const int i ) { return x( i ) + y( i ); } );
[&]( const int i ) { return x( i ) + y( i ); } );
}

//---------------------------------------------------------------------------//
Expand All @@ -3973,7 +3973,7 @@ KOKKOS_INLINE_FUNCTION auto operator-( const ExpressionX& x,
"extent must match" );
return createQuaternionExpression<typename ExpressionX::value_type,
ExpressionX::extent_0>(
[=]( const int i ) { return x( i ) - y( i ); } );
[&]( const int i ) { return x( i ) - y( i ); } );
}

//---------------------------------------------------------------------------//
Expand Down Expand Up @@ -4136,7 +4136,7 @@ KOKKOS_INLINE_FUNCTION auto operator&( const ExpressionX& x,
"extent_0 must match" );
return createVectorExpression<typename ExpressionX::value_type,
ExpressionX::extent_0>(
[=]( const int i ) { return x( i ) * y( i ); } );
[&]( const int i ) { return x( i ) * y( i ); } );
}

//---------------------------------------------------------------------------//
Expand All @@ -4155,7 +4155,7 @@ KOKKOS_INLINE_FUNCTION auto operator|( const ExpressionX& x,
"extent must match" );
return createVectorExpression<typename ExpressionX::value_type,
ExpressionX::extent_0>(
[=]( const int i ) { return x( i ) / y( i ); } );
[&]( const int i ) { return x( i ) / y( i ); } );
}

//---------------------------------------------------------------------------//
Expand All @@ -4170,7 +4170,7 @@ operator*( const typename ExpressionA::value_type& s, const ExpressionA& a )
return createTensor4Expression<
typename ExpressionA::value_type, ExpressionA::extent_0,
ExpressionA::extent_1, ExpressionA::extent_2, ExpressionA::extent_3>(
[=]( const int i, const int j, const int k, const int l )
[&]( const int i, const int j, const int k, const int l )
{ return s * a( i, j, k, l ); } );
}

Expand All @@ -4191,7 +4191,7 @@ operator*( const typename ExpressionA::value_type& s, const ExpressionA& a )
return createTensor3Expression<typename ExpressionA::value_type,
ExpressionA::extent_0, ExpressionA::extent_1,
ExpressionA::extent_2>(
[=]( const int i, const int j, const int k )
[&]( const int i, const int j, const int k )
{ return s * a( i, j, k ); } );
}

Expand All @@ -4211,7 +4211,7 @@ operator*( const typename ExpressionA::value_type& s, const ExpressionA& a )
{
return createMatrixExpression<typename ExpressionA::value_type,
ExpressionA::extent_0, ExpressionA::extent_1>(
[=]( const int i, const int j ) { return s * a( i, j ); } );
[&]( const int i, const int j ) { return s * a( i, j ); } );
}

template <class ExpressionA,
Expand All @@ -4231,7 +4231,7 @@ operator*( const typename ExpressionX::value_type& s, const ExpressionX& x )
{
return createVectorExpression<typename ExpressionX::value_type,
ExpressionX::extent_0>(
[=]( const int i ) { return s * x( i ); } );
[&]( const int i ) { return s * x( i ); } );
}

template <class ExpressionX,
Expand All @@ -4250,7 +4250,7 @@ KOKKOS_INLINE_FUNCTION auto
operator*( const typename ExpressionX::value_type& s, const ExpressionX& x )
{
return createQuaternionExpression<typename ExpressionX::value_type>(
[=]( const int i ) { return s * x( i ); } );
[&]( const int i ) { return s * x( i ); } );
}

template <class ExpressionX,
Expand Down Expand Up @@ -4452,7 +4452,7 @@ KOKKOS_INLINE_FUNCTION auto diagonal( const ExpressionX& x )
{
return createMatrixExpression<typename ExpressionX::value_type,
ExpressionX::extent_0, ExpressionX::extent_0>(
[=]( const int i, const int j )
[&]( const int i, const int j )
{
return ( i == j )
? x( i )
Expand Down
Loading