From 5d1b48591c7ed34504415bd914ac248263045680 Mon Sep 17 00:00:00 2001 From: Lukas Cejka <lukas.ostatek@gmail.com> Date: Thu, 6 Dec 2018 22:24:39 +0100 Subject: [PATCH] Reformatted code. --- src/TNL/Matrices/CSR.h | 6 +----- src/TNL/Matrices/CSR_impl.h | 1 + src/TNL/Matrices/SparseRow_impl.h | 1 + 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/TNL/Matrices/CSR.h b/src/TNL/Matrices/CSR.h index c8f87553ab..e456456252 100644 --- a/src/TNL/Matrices/CSR.h +++ b/src/TNL/Matrices/CSR.h @@ -83,14 +83,10 @@ public: __cuda_callable__ IndexType getRowLengthFast( const IndexType row ) const; -#ifdef HAVE_CUDA - //__device__ - //void getNonZeroRowLengthCudaKernel( const MatrixRow row, typename MatrixRow::IndexType* result ); - IndexType getNonZeroRowLength( const IndexType row ) const; IndexType getNonZeroRowLengthFast( const IndexType row ) const; -#endif + template< typename Real2, typename Device2, typename Index2 > void setLike( const CSR< Real2, Device2, Index2 >& matrix ); diff --git a/src/TNL/Matrices/CSR_impl.h b/src/TNL/Matrices/CSR_impl.h index 537c81df74..0a682a9dc2 100644 --- a/src/TNL/Matrices/CSR_impl.h +++ b/src/TNL/Matrices/CSR_impl.h @@ -138,6 +138,7 @@ Index CSR< Real, Device, Index >::getNonZeroRowLength( const IndexType row ) con { // TODO: Fix/Implement TNL_ASSERT( false, std::cerr << "TODO: Fix/Implement" ); + return 0; // if( std::is_same< DeviceType, Devices::Host >::value ) // { // ConstMatrixRow matrixRow = this->getRow( row ); diff --git a/src/TNL/Matrices/SparseRow_impl.h b/src/TNL/Matrices/SparseRow_impl.h index 000f961d6c..6c86b9d517 100644 --- a/src/TNL/Matrices/SparseRow_impl.h +++ b/src/TNL/Matrices/SparseRow_impl.h @@ -135,6 +135,7 @@ getNonZeroElementsCount() const { // TODO: Fix/Implement TNL_ASSERT( false, std::cerr << "TODO: Fix/Implement" ); + return 0; // using NonConstIndex = typename std::remove_const< Index >::type; // // NonConstIndex elementCount ( 0 ); -- GitLab