Loading configure.ac +1 −1 Original line number Diff line number Diff line Loading @@ -109,7 +109,7 @@ then CUDA_CXXFLAGS="$CUDA_CXXFLAGS -arch=sm_13 -DCUDA_ARCH=1.3" ;; esac DBGCXXFLAGS="$DBGCXXFLAGS -deviceemu" dnl DBGCXXFLAGS="$DBGCXXFLAGS -deviceemu" else CUDA_LDFLAGS="" CUDA_CXXFLAGS="" Loading src/core/tnlLongVectorCUDA.h +2 −3 Original line number Diff line number Diff line Loading @@ -111,11 +111,10 @@ template< class T > class tnlLongVectorCUDA : public tnlObject } size = _size; shared_data = false; cerr << "###########" << endl; if( cudaMalloc( ( void** ) &data, size * sizeof( T ) ) != cudaSuccess ) { cerr << "Unable to allocate new long vector with size " << size << " on CUDA device for " << size * sizeof( T ) << " on CUDA device for " << GetName() << "." << endl; data = NULL; size = 0; Loading src/core/tnlLongVectorCUDATester.h +1 −0 Original line number Diff line number Diff line Loading @@ -122,6 +122,7 @@ template< class T > class tnlLongVectorCUDATester : public CppUnit :: TestCase void testAllocationFromNonCUDA() { #ifdef HAVE_CUDA tnlLongVector< T > hostV( "hostV", 100 ); for( int i = 0; i < 100; i ++ ) hostV[ i ] = i; Loading src/diff/drawGrid2D.h +9 −1 Original line number Diff line number Diff line Loading @@ -26,6 +26,7 @@ #include <diff/tnlGridCUDA2D.h> #include <core/compress-file.h> #include <core/mfuncs.h> #include <debug/tnlDebug.h> template< class T > bool Draw( const tnlGrid2D< T >& u, ostream& str, Loading @@ -33,6 +34,7 @@ template< class T > bool Draw( const tnlGrid2D< T >& u, const int i_step = 1, const int j_step = 1 ) { dbgFunctionName( "", "Draw" ); if( ! format ) { cerr << "No format given for drawing 2D grid. " << endl; Loading @@ -50,7 +52,9 @@ template< class T > bool Draw( const tnlGrid2D< T >& u, for( i = 0; i < x_size; i += i_step ) { for( j = 0; j < y_size; j += j_step ) { str << setprecision( 12 ) << ax + i * hx << " " << ay + j * hy << " " << u( i, j ) << endl; } str << endl; } return true; Loading Loading @@ -93,6 +97,10 @@ template< class T > bool Draw( const tnlGrid2D< T >& u, const int i_step = 1, const int j_step = 1 ) { dbgFunctionName( "", "Draw" ); dbgCout( "Drawing tnlGrid2D in " << format << " format " << u. GetName() << " with dimensions " << u. GetXSize() << "x" << u. GetYSize() ); fstream file; if( strncmp( format, "bin",3 ) == 0 ) file. open( file_name, ios :: out | ios :: binary ); Loading Loading @@ -171,7 +179,7 @@ template< class T > bool Draw( const tnlGridCUDA2D< T >& u, { #ifdef HAVE_CUDA tnlGrid2D< T > hostAux( u ); hostAux. SetName( "drawAux" ); hostAux. SetName( "drawAux:" + u. GetName() ); hostAux. copyFrom( u ); return Draw( hostAux, file_name, Loading src/core/tnlField2D.h +1 −1 File changed.Contains only whitespace changes. Show changes Loading
configure.ac +1 −1 Original line number Diff line number Diff line Loading @@ -109,7 +109,7 @@ then CUDA_CXXFLAGS="$CUDA_CXXFLAGS -arch=sm_13 -DCUDA_ARCH=1.3" ;; esac DBGCXXFLAGS="$DBGCXXFLAGS -deviceemu" dnl DBGCXXFLAGS="$DBGCXXFLAGS -deviceemu" else CUDA_LDFLAGS="" CUDA_CXXFLAGS="" Loading
src/core/tnlLongVectorCUDA.h +2 −3 Original line number Diff line number Diff line Loading @@ -111,11 +111,10 @@ template< class T > class tnlLongVectorCUDA : public tnlObject } size = _size; shared_data = false; cerr << "###########" << endl; if( cudaMalloc( ( void** ) &data, size * sizeof( T ) ) != cudaSuccess ) { cerr << "Unable to allocate new long vector with size " << size << " on CUDA device for " << size * sizeof( T ) << " on CUDA device for " << GetName() << "." << endl; data = NULL; size = 0; Loading
src/core/tnlLongVectorCUDATester.h +1 −0 Original line number Diff line number Diff line Loading @@ -122,6 +122,7 @@ template< class T > class tnlLongVectorCUDATester : public CppUnit :: TestCase void testAllocationFromNonCUDA() { #ifdef HAVE_CUDA tnlLongVector< T > hostV( "hostV", 100 ); for( int i = 0; i < 100; i ++ ) hostV[ i ] = i; Loading
src/diff/drawGrid2D.h +9 −1 Original line number Diff line number Diff line Loading @@ -26,6 +26,7 @@ #include <diff/tnlGridCUDA2D.h> #include <core/compress-file.h> #include <core/mfuncs.h> #include <debug/tnlDebug.h> template< class T > bool Draw( const tnlGrid2D< T >& u, ostream& str, Loading @@ -33,6 +34,7 @@ template< class T > bool Draw( const tnlGrid2D< T >& u, const int i_step = 1, const int j_step = 1 ) { dbgFunctionName( "", "Draw" ); if( ! format ) { cerr << "No format given for drawing 2D grid. " << endl; Loading @@ -50,7 +52,9 @@ template< class T > bool Draw( const tnlGrid2D< T >& u, for( i = 0; i < x_size; i += i_step ) { for( j = 0; j < y_size; j += j_step ) { str << setprecision( 12 ) << ax + i * hx << " " << ay + j * hy << " " << u( i, j ) << endl; } str << endl; } return true; Loading Loading @@ -93,6 +97,10 @@ template< class T > bool Draw( const tnlGrid2D< T >& u, const int i_step = 1, const int j_step = 1 ) { dbgFunctionName( "", "Draw" ); dbgCout( "Drawing tnlGrid2D in " << format << " format " << u. GetName() << " with dimensions " << u. GetXSize() << "x" << u. GetYSize() ); fstream file; if( strncmp( format, "bin",3 ) == 0 ) file. open( file_name, ios :: out | ios :: binary ); Loading Loading @@ -171,7 +179,7 @@ template< class T > bool Draw( const tnlGridCUDA2D< T >& u, { #ifdef HAVE_CUDA tnlGrid2D< T > hostAux( u ); hostAux. SetName( "drawAux" ); hostAux. SetName( "drawAux:" + u. GetName() ); hostAux. copyFrom( u ); return Draw( hostAux, file_name, Loading