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

Merge branch 'develop' into transport-equation

parents da317558 1f6c38c8

CMakeLists.txt

+2 −2
Original line number Diff line number Diff line
@@ -44,8 +44,8 @@ endif() 
# set Debug/Release options

set( CMAKE_CXX_FLAGS "-std=c++11 -Wall -Wno-unused-local-typedefs -Wno-unused-variable" )

set( CMAKE_CXX_FLAGS_DEBUG "-g" )

set( CMAKE_CXX_FLAGS_RELEASE "-O3 -march=native -DNDEBUG" )

#set( CMAKE_CXX_FLAGS_RELEASE "-O3 -march=native -DNDEBUG -ftree-vectorizer-verbose=1 -ftree-vectorize -fopt-info-vec-missed -funroll-loops" )

set( CMAKE_CXX_FLAGS_RELEASE "-O3 -march=native -mtune=native -DNDEBUG" )

#set( CMAKE_CXX_FLAGS_RELEASE "-O3 -march=native -mtune=native -DNDEBUG -ftree-vectorizer-verbose=1 -ftree-vectorize -fopt-info-vec-missed -funroll-loops" )

# pass -rdynamic only in Debug mode

set( CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "" )

set( CMAKE_SHARED_LIBRARY_LINK_C_FLAGS_DEBUG "-rdynamic" )

src/TNL/Assert.h

+5 −3
Original line number Diff line number Diff line
@@ -24,7 +24,8 @@ 


#ifndef NDEBUG   

   

#ifdef HAVE_CUDA

// __CUDA_ARCH__ is defined by the compiler only for code executed on GPU

#ifdef __CUDA_ARCH__

#define TNL_ASSERT( ___tnl__assert_condition, ___tnl__assert_command )                                    \

   if( ! ( ___tnl__assert_condition ) )                                                                  \

   {                                                                                                     \
@@ -35,7 +36,7 @@ 
                                                              \

   }



#else // HAVE_CUDA

#else // __CUDA_ARCH__

#define TNL_ASSERT( ___tnl__assert_condition, ___tnl__assert_command )                       \

	if( ! ( ___tnl__assert_condition ) )                                                     \

	{                                                                                        \
@@ -47,7 +48,8 @@ 
        ___tnl__assert_command;                                                             \

        throw EXIT_FAILURE;                                                                 \

	}

#endif /* HAVE_CUDA */

#endif // __CUDA_ARCH__



#else /* #ifndef NDEBUG */

#define TNL_ASSERT( ___tnl__assert_condition, ___tnl__assert_command )

#endif /* #ifndef NDEBUG */

src/TNL/Containers/Algorithms/CudaMultireductionKernel.h

+3 −1
Original line number Diff line number Diff line 
/***************************************************************************

                          CudaMultireductionKernel.h  -  description

                             -------------------

    begin                : Oct 4, 2016

    begin                : May 13, 2016

    copyright            : (C) 2016 by Tomas Oberhuber et al.

    email                : tomas.oberhuber@fjfi.cvut.cz

 ***************************************************************************/



/* See Copyright Notice in tnl/Copyright */



// Implemented by: Jakub Klinkovsky



#pragma once



#ifdef HAVE_CUDA

src/TNL/Containers/Algorithms/Multireduction.h

+3 −1
Original line number Diff line number Diff line 
/***************************************************************************

                          Multireduction.h  -  description

                             -------------------

    begin                : Oct 4, 2016

    begin                : May 13, 2016

    copyright            : (C) 2016 by Tomas Oberhuber et al.

    email                : tomas.oberhuber@fjfi.cvut.cz

 ***************************************************************************/



/* See Copyright Notice in tnl/Copyright */



// Implemented by: Jakub Klinkovsky



#pragma once



#include <TNL/Devices/Host.h>

src/TNL/Containers/Algorithms/Multireduction_impl.h

+3 −1
Original line number Diff line number Diff line 
/***************************************************************************

                          Multireduction_impl.h  -  description

                             -------------------

    begin                : Oct 4, 2016

    begin                : May 13, 2016

    copyright            : (C) 2016 by Tomas Oberhuber et al.

    email                : tomas.oberhuber@fjfi.cvut.cz

 ***************************************************************************/



/* See Copyright Notice in tnl/Copyright */



// Implemented by: Jakub Klinkovsky



#pragma once



#include "Multireduction.h"