Commit 6fb9163f authored by Jakub Klinkovský's avatar Jakub Klinkovský
Browse files

Fixes after merge

parent a6d916b7

src/TNL/Matrices/BiEllpack.h

+2 −3
Original line number Diff line number Diff line
@@ -143,7 +143,6 @@ public: 


//	void verifyRowLengths( const typename BiEllpack< Real, Device, Index, StripSize >::CompressedRowLengthsVector& rowLengths );



   

	template< typename InVector,

			  typename OutVector >

#ifdef HAVE_CUDA

src/TNL/Matrices/Matrix_impl.h

+14 −14
Original line number Diff line number Diff line
@@ -130,20 +130,6 @@ bool Matrix< Real, Device, Index >::operator != ( const MatrixT& matrix ) const 
   return ! operator == ( matrix );

}



template< typename Real,

          typename Device,

          typename Index >

void

Matrix< Real, Device, Index >::

copyFromHostToCuda( Matrix< Real, Devices::Host, Index >& matrix )

{

    this->numberOfColors = matrix.getNumberOfColors();

    this->columns = matrix.getColumns();

    this->rows = matrix.getRows();



    this->values.setSize( matrix.getValuesSize() );

}



template< typename Real,

          typename Device,

          typename Index >
@@ -225,6 +211,20 @@ computeColorsVector(Containers::Vector<Index, Device, Index> &colorsVector) 
    }

}



template< typename Real,

          typename Device,

          typename Index >

void

Matrix< Real, Device, Index >::

copyFromHostToCuda( Matrix< Real, Devices::Host, Index >& matrix )

{

    this->numberOfColors = matrix.getNumberOfColors();

    this->columns = matrix.getColumns();

    this->rows = matrix.getRows();



    this->values.setSize( matrix.getValuesSize() );

}



#ifdef HAVE_CUDA

template< typename Matrix,

          typename InVector,

src/UnitTests/Meshes/CMakeLists.txt

+11 −11
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ TARGET_LINK_LIBRARIES( BoundaryTagsTest 
                           tnl )



# Mesh cannot be compiled by nvcc < 9 due to bugs in the compiler

if( ${BUILD_CUDA} AND ( ${CUDA_VERSION_MAJOR} GREATER 9 OR ${CUDA_VERSION_MAJOR} EQUAL 9 ) )

if( ${BUILD_CUDA} AND ${CUDA_VERSION_MAJOR} GREATER_EQUAL 9 )

   CUDA_ADD_EXECUTABLE( MeshTest MeshTest.cu

                        OPTIONS ${CXX_TESTS_FLAGS} )

   TARGET_LINK_LIBRARIES( MeshTest

src/TNL/Matrices/Matrix.h

+1 −1

File changed.

Contains only whitespace changes.

src/TNL/Matrices/SparseRow.h

+2 −2

File changed.

Contains only whitespace changes.