Commit dd4fed8e authored by Tomáš Oberhuber's avatar Tomáš Oberhuber
Browse files

Fixed scalar product.

parent 46f2f4b7

Documentation/Tutorials/Vectors/CMakeLists.txt

+0 −1
Original line number Diff line number Diff line 
IF( BUILD_CUDA )

   CUDA_ADD_EXECUTABLE( Expressions Expressions.cu )

   ADD_CUSTOM_COMMAND( COMMAND Expressions > Expressions.out OUTPUT Expressions.out )

   #ADD_EXECUTABLE( Reduction Reduction.cpp )

   CUDA_ADD_EXECUTABLE( Reduction Reduction.cu )

   ADD_CUSTOM_COMMAND( COMMAND Reduction > Reduction.out OUTPUT Reduction.out )

ENDIF()

Documentation/Tutorials/Vectors/Reduction.cpp

+2 −0
Original line number Diff line number Diff line
@@ -52,9 +52,11 @@ int main( int argc, char* argv[] ) 
   /****

    * Perform test on GPU

    */

#ifdef HAVE_CUDA

   std::cout << std::endl;

   std::cout << "Expressions on GPU ..." << std::endl;

   expressions< Devices::Cuda >();

#endif

}

src/TNL/Containers/Expressions/ExpressionTemplates.h

+4 −4
Original line number Diff line number Diff line
@@ -1399,7 +1399,7 @@ auto 
operator,( const BinaryExpressionTemplate< L1, L2, LOperation >& a,

           const BinaryExpressionTemplate< R1, R2, ROperation >& b )

{

   return TNL::sum( a * b );

   return ExpressionSum( a * b );

}



template< typename L1,
@@ -1410,7 +1410,7 @@ auto 
operator,( const UnaryExpressionTemplate< L1, LOperation >& a,

           const UnaryExpressionTemplate< R1, ROperation >& b )

{

   return TNL::sum( a * b );

   return ExpressionSum( a * b );

}



template< typename L1,
@@ -1422,7 +1422,7 @@ auto 
operator,( const UnaryExpressionTemplate< L1, LOperation >& a,

           const BinaryExpressionTemplate< R1, R2, ROperation >& b )

{

   return TNL::sum( a * b );

   return ExpressionSum( a * b );

}



template< typename L1,
@@ -1434,7 +1434,7 @@ auto 
operator,( const BinaryExpressionTemplate< L1, L2, LOperation >& a,

           const UnaryExpressionTemplate< R1,ROperation >& b )

{

   return TNL::sum( a * b );

   return ExpressionSum( a * b );

}



} // namespace Expressions

src/TNL/Containers/Expressions/StaticExpressionTemplates.h

+4 −4
Original line number Diff line number Diff line
@@ -1526,7 +1526,7 @@ auto 
operator,( const StaticBinaryExpressionTemplate< L1, L2, LOperation >& a,

           const StaticBinaryExpressionTemplate< R1, R2, ROperation >& b )

{

   return TNL::sum( a * b );

   return StaticExpressionSum( a * b );

}



template< typename L1,
@@ -1538,7 +1538,7 @@ auto 
operator,( const StaticUnaryExpressionTemplate< L1, LOperation >& a,

           const StaticUnaryExpressionTemplate< R1, ROperation >& b )

{

   return TNL::sum( a * b );

   return StaticExpressionSum( a * b );

}



template< typename L1,
@@ -1552,7 +1552,7 @@ auto 
operator,( const StaticUnaryExpressionTemplate< L1, LOperation, LParameter >& a,

           const StaticBinaryExpressionTemplate< R1, R2, ROperation >& b )

{

   return TNL::sum( a * b );

   return StaticExpressionSum( a * b );

}



template< typename L1,
@@ -1566,7 +1566,7 @@ auto 
operator,( const StaticBinaryExpressionTemplate< L1, L2, LOperation >& a,

           const StaticUnaryExpressionTemplate< R1,ROperation >& b )

{

   return TNL::sum( a * b );

   return StaticExpressionSum( a * b );

}



////

src/TNL/Containers/StaticVectorExpressions.h

+3 −3
Original line number Diff line number Diff line
@@ -303,7 +303,7 @@ __cuda_callable__ 
auto

operator,( const StaticVector< Size, Real >& a, const ET& b )

{

   return TNL::sum( a * b );

   return Containers::Expressions::StaticExpressionSum( a * b );

}



template< typename ET, int Size, typename Real,
@@ -312,7 +312,7 @@ __cuda_callable__ 
auto

operator,( const ET& a, const StaticVector< Size, Real >& b )

{

   return TNL::sum( a * b );

   return Containers::Expressions::StaticExpressionSum( a * b );

}



template< typename Real1, int Size, typename Real2 >
@@ -320,7 +320,7 @@ __cuda_callable__ 
auto

operator,( const StaticVector< Size, Real1 >& a, const StaticVector< Size, Real2 >& b )

{

   return TNL::sum( a * b );

   return Containers::Expressions::StaticExpressionSum( a * b );

}



} // namespace Containers