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

Merge branch 'develop' of geraldine.fjfi.cvut.cz:/local/projects/tnl/tnl into develop

parents d8e0c387 64576ef5

CMakeLists.txt

+4 −0
Original line number Diff line number Diff line
@@ -322,6 +322,10 @@ find_package( PythonInterp 3 ) 
#   endif()

#endif()



if( OPTIMIZED_VECTOR_HOST_OPERATIONS STREQUAL "yes" )

   AddCompilerFlag( "-DOPTIMIZED_VECTOR_HOST_OPERATIONS " )

endif()



set( CXX_TEST_FLAGS "-fprofile-arcs -ftest-coverage" )

set( LD_TEST_FLAGS "-lgcov -coverage" )

build

+4 −1
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ INSTANTIATE_INT="yes" 
INSTANTIATE_LONG_DOUBLE="no"

INSTANTIATE_DOUBLE="yes"

INSTANTIATE_FLOAT="no"

OPTIMIZED_VECTOR_HOST_OPERATIONS="no"

CMAKE="cmake"

CMAKE_ONLY="no"

HELP="no"
@@ -42,6 +43,7 @@ do 
                                           INSTANTIATE_DOUBLE="yes"

                                           INSTANTIATE_FLOAT="no"

                                           WITH_CUDA_ARCH="auto" ;;

        --optimize-vector-host-operations=* ) OPTIMIZED_VECTOR_HOST_OPERATIONS="yes" ;;

        --with-cmake=*                   ) CMAKE="${option#*=}" ;;

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

        --cmake-only=*                   ) CMAKE_ONLY="${option#*=}" ;;
@@ -97,7 +99,8 @@ ${CMAKE} ${ROOT_DIR} \ 
         -DINSTANTIATE_DOUBLE=${INSTANTIATE_DOUBLE} \

         -DINSTANTIATE_LONG_DOUBLE=${INSTANTIATE_LONG_DOUBLE} \

         -DINSTANTIATE_INT=${INSTANTIATE_INT} \

         -DINSTANTIATE_LONG_INT=${INSTANTIATE_LONG_INT}

         -DINSTANTIATE_LONG_INT=${INSTANTIATE_LONG_INT} \

         -DOPTIMIZED_VECTOR_HOST_OPERATIONS=${OPTIMIZED_VECTOR_HOST_OPERATIONS}



if test $? != 0; then

    echo "Error: cmake exited with error code."

examples/advection/advectionRhs.h

+2 −2
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ template< typename Mesh, typename Real >class advectionRhs 
         typedef typename MeshEntity::MeshType::VertexType VertexType;

         VertexType v = entity.getCenter();

         return 0.0;

      };

      }

};



} // namespace TNL

src/TNL/CMakeLists.txt

+2 −0
Original line number Diff line number Diff line
@@ -29,6 +29,8 @@ set( headers 
     Logger.h

     Logger_impl.h

     Math.h

     mpi-supp.h

     param-types.h

     SharedPointer.h

     SmartPointer.h

     SmartPointersRegister.h

src/TNL/Containers/Algorithms/CMakeLists.txt

+5 −1
Original line number Diff line number Diff line
@@ -6,7 +6,11 @@ set( headers cuda-prefix-sum.h 
             CudaReduction.h

             CudaReduction_impl.h

             CudaReductionBuffer.h

             CublasWrapper.h )

             CublasWrapper.h

             CudaMultireductionKernel.h

             Multireduction.h

             Multireduction_impl.h

   )



SET( CURRENT_DIR ${CMAKE_SOURCE_DIR}/src/TNL/Containers/Algorithms ) 

IF( BUILD_CUDA )