Commit 2c12430f authored by Jakub Klinkovský's avatar Jakub Klinkovský
Browse files

Fixed MeshEntity for CUDA 11.1

parent c9fdfacb

CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -225,7 +225,7 @@ if( ${WITH_CUDA} ) 
        # disable false compiler warnings

        #   reference for the -Xcudafe --diag_suppress and --display_error_number flags: https://stackoverflow.com/a/54142937

        #   incomplete list of tokens: http://www.ssl.berkeley.edu/~jimm/grizzly_docs/SSL/opt/intel/cc/9.0/lib/locale/en_US/mcpcom.msg

        set(CUDA_NVCC_FLAGS ${CUDA_NVCC_FLAGS} ; -Wno-deprecated-gpu-targets --expt-relaxed-constexpr --expt-extended-lambda -Xcudafe --diag_suppress=code_is_unreachable -Xcudafe --diag_suppress=loop_not_reachable -Xcudafe --diag_suppress=implicit_return_from_non_void_function -Xcudafe --diag_suppress=unsigned_compare_with_zero -Xcudafe --diag_suppress=2906 -Xcudafe --diag_suppress=2913 -Xcudafe --diag_suppress=2886 -Xcudafe --diag_suppress=2929 -Xcudafe --diag_suppress=2977 -Xcudafe --diag_suppress=3057 -Xcudafe --display_error_number)

        set(CUDA_NVCC_FLAGS ${CUDA_NVCC_FLAGS} ; -Wno-deprecated-gpu-targets --expt-relaxed-constexpr --expt-extended-lambda -Xcudafe --diag_suppress=code_is_unreachable -Xcudafe --diag_suppress=loop_not_reachable -Xcudafe --diag_suppress=implicit_return_from_non_void_function -Xcudafe --diag_suppress=unsigned_compare_with_zero -Xcudafe --diag_suppress=2906 -Xcudafe --diag_suppress=2913 -Xcudafe --diag_suppress=2886 -Xcudafe --diag_suppress=2929 -Xcudafe --diag_suppress=2977 -Xcudafe --diag_suppress=3057 -Xcudafe --diag_suppress=3124 -Xcudafe --display_error_number)

        # temporarily disable host-compler warnings about VLAs, which are caused by nvcc's modifications to the source code

        set(CUDA_NVCC_FLAGS ${CUDA_NVCC_FLAGS} ; -Xcompiler -Wno-vla)

        # Select GPU architecture

src/TNL/Meshes/MeshEntity.h

+2 −2
Original line number Diff line number Diff line
@@ -90,8 +90,8 @@ class MeshEntity 


      template< int Subdimension >

      __cuda_callable__

      const typename SubentityTraits< Subdimension >::OrientationArrayType&

      getSubentityOrientation( const LocalIndexType localIndex ) const;

      auto getSubentityOrientation( const LocalIndexType localIndex ) const

         -> const typename SubentityTraits< Subdimension >::OrientationArrayType&;



      /****

       * Superentities

src/TNL/Meshes/MeshEntity.hpp

+2 −1
Original line number Diff line number Diff line
@@ -129,9 +129,10 @@ template< typename MeshConfig, 
          typename EntityTopology >

   template< int Subdimension >

__cuda_callable__

const typename MeshEntity< MeshConfig, Device, EntityTopology >::template SubentityTraits< Subdimension >::OrientationArrayType&

auto

MeshEntity< MeshConfig, Device, EntityTopology >::

getSubentityOrientation( const LocalIndexType localIndex ) const

   -> const typename SubentityTraits< Subdimension >::OrientationArrayType&

{

   TNL_ASSERT_TRUE( meshPointer, "meshPointer was not set" );

   return meshPointer->template getSubentityOrientation< getEntityDimension(), Subdimension >( this->getIndex(), localIndex );