diff --git a/src/UnitTests/Matrices/CMakeLists.txt b/src/UnitTests/Matrices/CMakeLists.txt index 668e272df62e5f31552854bf41000192a10410ff..e4616f23b55e6a597fbcc9d995f9e3fbae7b7783 100644 --- a/src/UnitTests/Matrices/CMakeLists.txt +++ b/src/UnitTests/Matrices/CMakeLists.txt @@ -55,8 +55,7 @@ ADD_TEST( SparseMatrixCopyTest ${EXECUTABLE_OUTPUT_PATH}/SparseMatrixCopyTest${C ADD_TEST( SparseMatrixTest ${EXECUTABLE_OUTPUT_PATH}/SparseMatrixTest${CMAKE_EXECUTABLE_SUFFIX} ) # TODO: Uncomment the following when AdEllpack works #ADD_TEST( SparseMatrixTest_AdEllpack ${EXECUTABLE_OUTPUT_PATH}/SparseMatrixTest_AdEllpack${CMAKE_EXECUTABLE_SUFFIX} ) -# TODO: DenseMatrixTest is not finished -#ADD_TEST( DenseMatrixTest ${EXECUTABLE_OUTPUT_PATH}/DenseMatrixTest${CMAKE_EXECUTABLE_SUFFIX} ) +ADD_TEST( DenseMatrixTest ${EXECUTABLE_OUTPUT_PATH}/DenseMatrixTest${CMAKE_EXECUTABLE_SUFFIX} ) #### # Segments tests diff --git a/src/UnitTests/Matrices/DenseMatrixTest.h b/src/UnitTests/Matrices/DenseMatrixTest.h index 2184e636077b929d23f6d9a9b3e546cba082ec0e..c7ada1240d5fabaeaa1f7fe86f8a1dd00babc515 100644 --- a/src/UnitTests/Matrices/DenseMatrixTest.h +++ b/src/UnitTests/Matrices/DenseMatrixTest.h @@ -585,6 +585,7 @@ void test_SetRow() for( IndexType j = 0; j < cols; j++ ) m->setElement( i, j, value++ ); + // TODO: replace this with dense matrix view Matrix* m_ptr = &m.template modifyData< DeviceType >(); auto f = [=] __cuda_callable__ ( IndexType rowIdx ) mutable { RealType values[ 3 ][ 5 ] { @@ -597,7 +598,7 @@ void test_SetRow() { 2, 3, 4, 5, 6 } }; auto row = m_ptr->getRow( rowIdx ); for( IndexType i = 0; i < 5; i++ ) - row.setElement( columnIndexes[ rowIdx ][ i ], values[ rowIdx ][ i ] ); + / row.setElement( rowIdx, i ); //columnIndexes[ rowIdx ][ i ], values[ rowIdx ][ i ] ); }; TNL::Pointers::synchronizeSmartPointersOnDevice< DeviceType >(); TNL::Algorithms::ParallelFor< DeviceType >::exec( 0, 3, f );