Commit 168192c3 authored by Jakub Klinkovský's avatar Jakub Klinkovský
Browse files

Updated nvcc diagnostic pragmas in TypeTraits.h and VectorBinaryOperationsTest.h

parent 77212d22
Loading
Loading
Loading
Loading
+12 −3
Original line number Diff line number Diff line
@@ -190,8 +190,13 @@ private:
      // disable nvcc warning: invalid narrowing conversion from "unsigned int" to "int"
      // (the implementation is based on the conversion)
      #ifdef __NVCC__
         #ifdef __NVCC_DIAG_PRAGMA_SUPPORT__
            #pragma nv_diagnostic push
            #pragma nv_diag_suppress 2361
         #else
            #pragma push
            #pragma diag_suppress 2361
         #endif
      #elif defined(__INTEL_COMPILER)
         #pragma warning(push)
         #pragma warning(disable:3291)
@@ -199,7 +204,11 @@ private:
      template< typename M, M method >
      static constexpr std::true_type is_constexpr_impl( decltype(int{((*method)(), 0U)}) );
      #ifdef __NVCC__
         #ifdef __NVCC_DIAG_PRAGMA_SUPPORT__
            #pragma nv_diagnostic pop
         #else
            #pragma pop
         #endif
      #elif defined(__INTEL_COMPILER)
         // FIXME: this does not work - warning would be shown again...
         //#pragma warning(pop)
+13 −3
Original line number Diff line number Diff line
@@ -134,9 +134,15 @@ protected:

#ifdef HAVE_CUDA
   // ignore useless nvcc warning: https://stackoverflow.com/a/49997636
   // https://developer.nvidia.com/blog/reducing-application-build-times-using-cuda-c-compilation-aids/
   #ifdef __NVCC_DIAG_PRAGMA_SUPPORT__
      #pragma nv_diagnostic push
      #pragma nv_diag_suppress declared_but_not_referenced
   #else
      #pragma push
      #pragma diag_suppress = declared_but_not_referenced
   #endif
#endif

#define MAYBE_UNUSED(expr) (void)(expr)

@@ -706,8 +712,12 @@ TYPED_TEST( VectorBinaryOperationsTest, comparisonOnDifferentDevices )
#endif

#ifdef HAVE_CUDA
   #ifdef __NVCC_DIAG_PRAGMA_SUPPORT__
      #pragma nv_diagnostic pop
   #else
      #pragma pop
   #endif
#endif

} // namespace binary_tests