Commit e143ec06 authored by Tomáš Oberhuber's avatar Tomáš Oberhuber
Browse files

Fixing (temporarly) OpenMP support.

parent 33f506a9

CMakeLists.txt

+1 −0
Original line number Diff line number Diff line
@@ -175,6 +175,7 @@ if( OPENMP_FOUND ) 
   message( "Compiler supports OpenMP." )

   set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DHAVE_OPENMP -fopenmp" )

endif()

#set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DHAVE_OPENMP -fopenmp=libgomp" )



####

# Check for MPI

build

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ do 
    case $option in

        --prefix=*                       ) PREFIX="${option#*=}" ;;

        --build=*                        ) BUILD="${option#*=}" ;;

        --with-clang=                    ) WITH_CLANG="${option#*=}" ;;

        --with-clang=*                   ) WITH_CLANG="${option#*=}" ;;

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

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

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

src/TNL/Containers/Array_impl.h

+2 −2
Original line number Diff line number Diff line
@@ -557,8 +557,8 @@ boundLoad( File& file ) 
   {

      if( this->getSize() != _size )

      {

         std::cerr << "Error: The current array size is not zero and it is different from the size of" << std::endl

                   << "the array being loaded. This is not possible. Call method reset() before." << std::endl;

         std::cerr << "Error: The current array size is not zero ( " << this->getSize() << ") and it is different from the size of" << std::endl

                   << "the array being loaded (" << _size << "). This is not possible. Call method reset() before." << std::endl;

         return false;

      }

   }

src/TNL/Devices/Host.cpp

+0 −1
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ 
namespace TNL {

namespace Devices {   





bool Host::ompEnabled( true );

int Host::maxThreadsCount( -1 );

src/TNL/Logger.h

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ class Logger 


   void writeSeparator();



   // TODO: move this to Devices::Host

   bool writeSystemInformation( const Config::ParameterContainer& parameters );