Commit 88244238 authored by Libor's avatar Libor
Browse files

Merging master branch

parent f8eb2105

install

+2 −2
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 


TARGET=TNL

INSTALL_PREFIX=${HOME}/local

WITH_CUDA=no

WITH_CUDA=yes

TEMPLATE_EXPLICIT_INSTANTIATION=yes

#VERBOSE="VERBOSE=1"
@@ -38,6 +38,6 @@ ${CMAKE} .. -DCMAKE_INSTALL_PREFIX=${HOME}/local \ 
            -DPETSC_DIR=${PETSC_DIR} \

            -DWITH_TEMPLATE_EXPLICIT_INSTANTIATION=${TEMPLATE_EXPLICIT_INSTANTIATION}

make -j${CPUS} ${VERBOSE}

make -j${CPUS} test

#make -j${CPUS} test

make -j${CPUS} install

src/implementation/matrices/tnlBiEllpackMatrix_impl.h

+1330 −1329
Original line number Diff line number Diff line
@@ -1093,6 +1093,7 @@ void tnlBiEllpackMatrix< Real, Device, Index, StripSize >::spmvCuda( const InVec 
        {

            if( this->columnIndexes[ elementPtr ] < this->getColumns() )

            temp[ threadIdx.x ] += inVector[ this->columnIndexes[ elementPtr ] ] * this->values[ elementPtr ];

            outVector.add( this->columnIndexes[ elementPtr ], inVector[ this->columnIndexes[ elementPtr ] ] * this->values[ elementPtr ] );

            elementPtr += this->warpSize;

        }

        IndexType bisection2 = this->warpSize;

src/implementation/matrices/tnlMatrixReader_impl.h

+2 −8
Original line number Diff line number Diff line
@@ -302,12 +302,7 @@ bool tnlMatrixReader< Matrix >::computeRowLengthsFromMtxFile( std::istream& file 
      }

      if( symmetricMatrix && row != column )

      {

         rowLengths[ column - 1 ]++;

         if( rowLengths[ column - 1 ] >= columns )

         {

            cerr << "There are more elements than the matrix columns at the row " << column << " ." << endl;

            return false;

         }

         continue;

      }

   }

   file.clear();
@@ -347,8 +342,7 @@ bool tnlMatrixReader< Matrix >::readMatrixElementsFromMtxFile( std::istream& fil 
      processedElements++;

      if( symmetricMatrix && row != column )

      {

         matrix.setElement( column - 1, row - 1, value );

         processedElements++;

          continue;

      }

      if( verbose )

         cout << " Reading the matrix elements ... " << processedElements << " / " << matrix.getNumberOfMatrixElements() << "                       \r" << flush;