Deploy assert library in collectives

Author: bonachea

src/caffeine/collective_subroutines/co_max_s.f90 renamed to src/caffeine/collective_subroutines/co_max_s.F90

@@ -1,7 +1,11 @@
 ! Copyright (c), The Regents of the University of California
 ! Terms of use are as specified in LICENSE.txt
+
+#include "assert_macros.h"
+
 submodule(prif:prif_private_s) co_max_s
   use iso_c_binding, only : c_funloc
+  use assert_m
 
   implicit none
 
@@ -24,7 +28,7 @@
     function reverse_alphabetize(lhs, rhs) result(last_alphabetically)
       character(len=*), intent(in) :: lhs, rhs
       character(len=len(lhs)) :: last_alphabetically
-      call assert(len(lhs)==len(rhs), "caf_co_max: LHS/RHS length match", lhs//" , "//rhs)
+      call_assert_diagnose(len(lhs)==len(rhs), "caf_co_max: LHS/RHS length match", lhs//" , "//rhs)
       last_alphabetically = max(lhs,rhs)
     end function
 

src/caffeine/collective_subroutines/co_min_s.f90 renamed to src/caffeine/collective_subroutines/co_min_s.F90

@@ -1,7 +1,11 @@
 ! Copyright (c), The Regents of the University of California
 ! Terms of use are as specified in LICENSE.txt
+
+#include "assert_macros.h"
+
 submodule(prif:prif_private_s) co_min_s
   use iso_c_binding, only : c_funloc
+  use assert_m
 
   implicit none
 
@@ -24,7 +28,7 @@
     function alphabetize(lhs, rhs) result(first_alphabetically)
       character(len=*), intent(in) :: lhs, rhs
       character(len=len(lhs)) :: first_alphabetically
-      call assert(len(lhs)==len(rhs), "prif_co_min: LHS/RHS length match", lhs//" , "//rhs)
+      call_assert_diagnose(len(lhs)==len(rhs), "prif_co_min: LHS/RHS length match", lhs//" , "//rhs)
       first_alphabetically = min(lhs,rhs)
     end function
 

src/caffeine/collective_subroutines/co_reduce_s.f90 renamed to src/caffeine/collective_subroutines/co_reduce_s.F90

@@ -1,9 +1,13 @@
 ! Copyright (c), The Regents of the University of California
 ! Terms of use are as specified in LICENSE.txt
+
+#include "assert_macros.h"
+
 submodule(prif:prif_private_s) co_reduce_s
   use iso_c_binding, only : &
     c_loc, c_funloc, c_associated, c_f_pointer, c_f_procpointer, c_char, c_double, &
     c_float, c_int32_t
+  use assert_m
 
   implicit none
 
@@ -83,7 +87,7 @@ pure function c_double_complex_operation(lhs, rhs) result(lhs_op_rhs)
     procedure(c_double_complex_operation), pointer :: double_complex_op => null()
 
     if (present(stat)) stat=0
-    call assert(c_associated(operation), "caf_co_reduce: c_associated(operation)")
+    call_assert_describe(c_associated(operation), "caf_co_reduce: c_associated(operation)")
 
     if (caf_same_cfi_type(a, 0)) then
       call c_f_procpointer(operation, int32_op)
@@ -135,7 +139,7 @@ subroutine Coll_ReduceSub_c_int32_t(arg1, arg2_and_out, count, cdata) bind(C)
       integer(c_int32_t), pointer :: lhs(:)=>null(), rhs_and_result(:)=>null()
       integer(c_size_t) i
 
-      call assert(all([c_associated(arg1), c_associated(arg2_and_out)]), "Coll_ReduceSub_c_int32_t: operands associated")
+      call_assert_describe(all([c_associated(arg1), c_associated(arg2_and_out)]), "Coll_ReduceSub_c_int32_t: operands associated")
 
       call c_f_pointer(arg1, lhs, [count])
       call c_f_pointer(arg2_and_out, rhs_and_result, [count])
@@ -153,7 +157,7 @@ subroutine Coll_ReduceSub_c_int64_t(arg1, arg2_and_out, count, cdata) bind(C)
       integer(c_int64_t), pointer :: lhs(:)=>null(), rhs_and_result(:)=>null()
       integer(c_size_t) i
 
-      call assert(all([c_associated(arg1), c_associated(arg2_and_out)]), "Coll_ReduceSub_c_int64_t: operands associated")
+      call_assert_describe(all([c_associated(arg1), c_associated(arg2_and_out)]), "Coll_ReduceSub_c_int64_t: operands associated")
 
       call c_f_pointer(arg1, lhs, [count])
       call c_f_pointer(arg2_and_out, rhs_and_result, [count])
@@ -171,7 +175,7 @@ subroutine Coll_ReduceSub_c_double(arg1, arg2_and_out, count, cdata) bind(C)
       real(c_double), pointer :: lhs(:)=>null(), rhs_and_result(:)=>null()
       integer(c_size_t) i
 
-      call assert(all([c_associated(arg1), c_associated(arg2_and_out)]), "Coll_ReduceSub_c_double: operands associated")
+      call_assert_describe(all([c_associated(arg1), c_associated(arg2_and_out)]), "Coll_ReduceSub_c_double: operands associated")
 
       call c_f_pointer(arg1, lhs, [count])
       call c_f_pointer(arg2_and_out, rhs_and_result, [count])
@@ -189,7 +193,7 @@ subroutine Coll_ReduceSub_c_float(arg1, arg2_and_out, count, cdata) bind(C)
       real(c_float), pointer :: lhs(:)=>null(), rhs_and_result(:)=>null()
       integer(c_size_t) i
 
-      call assert(all([c_associated(arg1), c_associated(arg2_and_out)]), "Coll_ReduceSub_c_float: operands associated")
+      call_assert_describe(all([c_associated(arg1), c_associated(arg2_and_out)]), "Coll_ReduceSub_c_float: operands associated")
 
       call c_f_pointer(arg1, lhs, [count])
       call c_f_pointer(arg2_and_out, rhs_and_result, [count])
@@ -207,7 +211,7 @@ subroutine Coll_ReduceSub_c_double_complex(arg1, arg2_and_out, count, cdata) bin
       complex(c_double), pointer :: lhs(:)=>null(), rhs_and_result(:)=>null()
       integer(c_size_t) i
 
-      call assert(all([c_associated(arg1), c_associated(arg2_and_out)]), "Coll_ReduceSub_c_dobule_complex: operands associated")
+      call_assert_describe(all([c_associated(arg1), c_associated(arg2_and_out)]), "Coll_ReduceSub_c_dobule_complex: operands associated")
 
       call c_f_pointer(arg1, lhs, [count])
       call c_f_pointer(arg2_and_out, rhs_and_result, [count])
@@ -225,7 +229,7 @@ subroutine Coll_ReduceSub_c_float_complex(arg1, arg2_and_out, count, cdata) bind
       complex(c_float), pointer :: lhs(:)=>null(), rhs_and_result(:)=>null()
       integer(c_size_t) i
 
-      call assert(all([c_associated(arg1), c_associated(arg2_and_out)]), "Coll_ReduceSub_c_float_complex: operands associated")
+      call_assert_describe(all([c_associated(arg1), c_associated(arg2_and_out)]), "Coll_ReduceSub_c_float_complex: operands associated")
 
       call c_f_pointer(arg1, lhs, [count])
       call c_f_pointer(arg2_and_out, rhs_and_result, [count])
@@ -243,7 +247,7 @@ subroutine Coll_ReduceSub_c_bool(arg1, arg2_and_out, count, cdata) bind(C)
       logical(c_bool), pointer :: lhs(:)=>null(), rhs_and_result(:)=>null()
       integer(c_size_t) i
 
-      call assert(all([c_associated(arg1), c_associated(arg2_and_out)]), "Coll_ReduceSub_c_bool: operands associated")
+      call_assert_describe(all([c_associated(arg1), c_associated(arg2_and_out)]), "Coll_ReduceSub_c_bool: operands associated")
 
       call c_f_pointer(arg1, lhs, [count])
       call c_f_pointer(arg2_and_out, rhs_and_result, [count])
@@ -262,7 +266,7 @@ subroutine Coll_ReduceSub_c_char(arg1, arg2_and_out, count, cdata) bind(C)
       integer(c_int), pointer :: arglen=>null()
 
       associate(c_associated_args => [c_associated(arg1), c_associated(arg2_and_out), c_associated(cdata)])
-        call assert(all(c_associated_args), "Coll_ReduceSub_c_char: all(c_associated_args)")
+        call_assert_describe(all(c_associated_args), "Coll_ReduceSub_c_char: all(c_associated_args)")
       end associate
 
       call c_f_pointer(cdata, arglen)

src/caffeine/prif_private_s.f90

@@ -1,6 +1,7 @@
 ! Copyright (c), The Regents of the University of California
 ! Terms of use are as specified in LICENSE.txt
 submodule(prif) prif_private_s
+  !use assert_m
   implicit none
 
   type(team_data), target :: initial_team