Commit da0532c9 authored by Jakub Klinkovský's avatar Jakub Klinkovský
Browse files

Merge branch 'benchmarks' into develop

parents 63ee4485 6e692328

CMakeLists.txt

+13 −6
Original line number Diff line number Diff line
@@ -118,11 +118,19 @@ if( WITH_CUDA STREQUAL "yes" ) 
        ####

        # Check for cuBLAS

        #

        if( WITH_CUBLAS STREQUAL "yes" ) 

            message( "Enabling CUBLAS." )

            set( HAVE_CUBLAS TRUE)

        if( NOT WITH_CUBLAS STREQUAL "no" )

            find_path( CUBLAS_INCLUDE_DIR cublas_v2.h

                       /usr/local/cuda/include

                       ${CUDA_INCLUDE_DIR}

                       DOC "CUBLAS headers." )

            if( ${CUBLAS_INCLUDE_DIR} STREQUAL "CUBLAS_INCLUDE_DIR-NOTFOUND" )

                message( "CUBLAS not found." )

                set( HAVE_CUBLAS "//#define HAVE_CUBLAS 1" )

            else()

                message( "CUBLAS found. -- ${CUBLAS_INCLUDE_DIR}" )

                set( HAVE_CUBLAS "#define HAVE_CUBLAS 1" )

        endif( WITH_CUBLAS STREQUAL "yes" )       

            endif()

        endif( NOT WITH_CUBLAS STREQUAL "no" )



        ####

        # Check for CUSP
@@ -142,7 +150,6 @@ if( WITH_CUDA STREQUAL "yes" ) 
        # Check for CUSPARSE

        #

        if( NOT WITH_CUSPARSE STREQUAL "no" )

        

           find_path( CUSPARSE_INCLUDE_DIR cusparse.h

                      /usr/local/cuda/include                   

                      ${CUDA_INCLUDE_DIR}

build

+0 −3
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ WITH_CUDA="yes" 
WITH_TESTS="yes"



WITH_CUDA_ARCH="auto"

WITH_CUBLAS="no"

WITH_TEMPLATE_INSTANTIATION="yes"

INSTANTIATE_LONG_INT="no"

INSTANTIATE_INT="yes"
@@ -28,7 +27,6 @@ do 
        --build=*                        ) BUILD="${option#*=}" ;;

        --with-tests=*                   ) WITH_TESTS="${option#*=}" ;;

        --with-cuda=*                    ) WITH_CUDA="${option#*=}" ;;

        --with-cublas=*                  ) WITH_CUBLAS="${option#*=}" ;;

        --with-cuda-arch=*               ) WITH_CUDA_ARCH="${option#*=}";;

        --with-templates-instantiation=* ) WITH_TEMPLATE_INSTANTIATION="${option#*=}" ;;

        --instantiate-long-int=*         ) INSTANTIATE_LONG_INT="${option#*=}" ;;
@@ -82,7 +80,6 @@ ${CMAKE} ${ROOT_DIR} \ 
         -DCMAKE_INSTALL_PREFIX=${PREFIX} \

         -DWITH_CUDA=${WITH_CUDA} \

         -DWITH_CUDA_ARCH=${WITH_CUDA_ARCH} \

         -DWITH_CUBLAS=${WITH_CUBLAS} \

         -DWITH_TESTS=${WITH_TESTS} \

         -DPETSC_DIR=${PETSC_DIR} \

         -DDCMTK_DIR=${DCMTK_DIR} \

src/core/CMakeLists.txt

+2 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ set (headers tnlAssert.h 
             tnlStaticFor.h

             tnlStatistics.h 

             tnlString.h 

             tnlSystemInfo.h

             tnlReal.h

             tnlTimer.h

             tnlTimerCPU.h
@@ -48,6 +49,7 @@ set( common_SOURCES 
     ${CURRENT_DIR}/tnlObject.cpp

     ${CURRENT_DIR}/tnlStatistics.cpp

     ${CURRENT_DIR}/tnlString.cpp 

     ${CURRENT_DIR}/tnlSystemInfo.cpp 

     ${CURRENT_DIR}/tnlTimer.cpp 

     ${CURRENT_DIR}/tnlTimerCPU.cpp      

     ${CURRENT_DIR}/mfilename.cpp

src/core/param-types.h

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ template<> inline tnlString getType< bool >() { return tnlString( "bool" ); }; 
template<> inline tnlString getType< short int >() { return tnlString( "short int" ); };

template<> inline tnlString getType< int >() { return tnlString( "int" ); };

template<> inline tnlString getType< long int >() { return tnlString( "long int" ); };

template<> inline tnlString getType< unsigned int >() { return tnlString( "unsigned int" ); };

template<> inline tnlString getType< char >() { return tnlString( "char" ); };

template<> inline tnlString getType< float >() { return tnlString( "float" ); };

template<> inline tnlString getType< double >() { return tnlString( "double" ); };

src/core/tnlCudaDeviceInfo.cpp

+11 −4
Original line number Diff line number Diff line
@@ -26,6 +26,13 @@ getNumberOfDevices() 
   return -1;

}



int

tnlCudaDeviceInfo::

getActiveDevice()

{

   return -1;

}



tnlString

tnlCudaDeviceInfo::

getDeviceName( int deviceNum )