]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Make AssertCuda use Assert instead of AssertThrow 5700/head
authorBruno Turcksin <bruno.turcksin@gmail.com>
Fri, 5 Jan 2018 02:23:44 +0000 (21:23 -0500)
committerBruno Turcksin <bruno.turcksin@gmail.com>
Fri, 5 Jan 2018 02:23:44 +0000 (21:23 -0500)
We used AssertThrow instead of Assert in AssertCuda because of a bug that has
now been fixed.

include/deal.II/base/exceptions.h

index 2f36c5320d2aac3101eda646e49d7f49c4709538..cdc1d5013c0d492f2a07e3f5a8b312bc7cffd292 100644 (file)
@@ -1244,10 +1244,8 @@ namespace StandardExceptions
  * @ingroup Exceptions
  * @author Bruno Turcksin, 2016
  */
-// For now use AssertThrow instead of Assert because macros are not passed
-// correctly to nvcc.
-#define AssertCuda(error_code) AssertThrow(error_code == cudaSuccess, \
-                                           dealii::ExcCudaError(cudaGetErrorString(error_code)))
+#define AssertCuda(error_code) Assert(error_code == cudaSuccess, \
+                                      dealii::ExcCudaError(cudaGetErrorString(error_code)))
 #endif
 
 using namespace StandardExceptions;

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.