Unit test with Julienne

install.sh

@@ -356,12 +356,21 @@ EOF
 
 exit_if_pkg_config_pc_file_missing "caffeine"
 
+compiler_version=$($FPM_FC --version)
+if [[ $compiler_version == *llvm* ]]; then
+  compiler_flag="-mmlir -allow-assumed-rank -g -Ofast"
+else
+  compiler_flag="-g -O3"
+fi
+
 RUN_FPM_SH="build/run-fpm.sh"
 cat << EOF > $RUN_FPM_SH
 #!/bin/sh
 #-- DO NOT EDIT -- created by caffeine/install.sh
 fpm_sub_cmd=\$1; shift
 "${FPM}" "\$fpm_sub_cmd" \\
+--profile debug \\
+--flag "$compiler_flag" \\
 --compiler "`$PKG_CONFIG caffeine --variable=CAFFEINE_FPM_FC`"   \\
 --c-compiler "`$PKG_CONFIG caffeine --variable=CAFFEINE_FPM_CC`" \\
 --c-flag "`$PKG_CONFIG caffeine --variable=CAFFEINE_FPM_CFLAGS`" \\

manifest/fpm.toml.template

@@ -6,7 +6,6 @@ maintainer = "rouson@lbl.gov"
 copyright = "2021-2024 UC Regents"
 
 [dev-dependencies]
-veggies = {git = "https://gitlab.com/everythingfunctional/veggies", tag = "v1.1.2"}
-iso_varying_string = {git = "https://gitlab.com/everythingfunctional/iso_varying_string.git", tag = "v3.0.4"}
+julienne = {git = "https://github.com/berkeleylab/julienne", tag = "1.3.0"}
 
 [build]

src/caffeine/collective_subroutines/co_reduce_s.f90

@@ -259,28 +259,26 @@ subroutine Coll_ReduceSub_c_char(arg1, arg2_and_out, count, cdata) bind(C)
       integer(c_size_t), value :: count  !! Operand count
       type(c_ptr), value ::  cdata       !! Client data
 
-      character(kind=c_char, len=:), allocatable, target :: prototype(:)
-      character(kind=c_char, len=:), pointer :: lhs(:)=>null(), rhs_and_result(:)=>null()
       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)")
       end associate
 
       call c_f_pointer(cdata, arglen)
-      allocate(character(kind=c_char, len=arglen) :: prototype(count))
-      lhs => prototype ! set string length
-      rhs_and_result => prototype ! set string length
+      block
+        character(kind=c_char, len=arglen), pointer :: lhs(:)=>null(), rhs_and_result(:)=>null()
 
-      call c_f_pointer(arg1, lhs, [count])
-      call c_f_pointer(arg2_and_out, rhs_and_result, [count])
+        call c_f_pointer(arg1, lhs, [count])
+        call c_f_pointer(arg2_and_out, rhs_and_result, [count])
 
-      block
-        integer(c_size_t) i
+        block
+          integer(c_size_t) i
 
-        do i=1, count
-          rhs_and_result(i) = char_op(lhs(i), rhs_and_result(i))
-        end do
+          do i=1, count
+            rhs_and_result(i) = char_op(lhs(i), rhs_and_result(i))
+          end do
+        end block
       end block
 
     end subroutine

src/caffeine/program_termination_s.f90

@@ -24,7 +24,7 @@ subroutine prif_stop_integer(stop_code)
       !! synchronize, stop the executing image, and provide the stop_code, or 0 if not present, as the process exit status
       integer, intent(in), optional :: stop_code
 
-      sync all
+      call prif_sync_all()
 
       !write(output_unit, *) "caf_stop: stop code '", stop_code, "'"
       write(output_unit, *) stop_code
@@ -39,7 +39,7 @@ subroutine prif_stop_character(stop_code)
       !! synchronize, stop the executing image, and provide the stop_code as the process exit status
       character(len=*), intent(in) :: stop_code
 
-      sync all
+      call prif_sync_all()
 
       write(output_unit, *) "caf_stop: stop code '" // stop_code // "'"
       flush output_unit
@@ -145,7 +145,7 @@ pure function c_f_string(c_string, length) result(f_string)
     character(len=length) :: f_string
 
     integer :: i
-    do concurrent (i = 1:length)
+    do i = 1,length
       f_string(i:i) = c_string(i)
     end do
   end function

src/prif.f90

@@ -1,5 +1,10 @@
 ! Copyright (c), The Regents of the University of California
 ! Terms of use are as specified in LICENSE.txt
+
+#ifndef __GFORTRAN__
+  #define NO_SELECTED_LOGICAL_KIND
+#endif
+
 module prif
 
   use iso_c_binding, only: c_int, c_bool, c_intptr_t, c_intmax_t, c_ptr, c_funptr, c_size_t, c_ptrdiff_t, c_null_ptr
@@ -42,11 +47,12 @@ module prif
   integer(c_int), parameter, public :: PRIF_VERSION_MINOR = 4
 
   integer(c_int), parameter, public :: PRIF_ATOMIC_INT_KIND = selected_int_kind(18)
-  ! gfortran-14 doesn't currently support the intrinsic selected_logical_kind
-  ! The following commented-out definition is the desired definition and should replace
-  ! the temporary definition when possible
-  ! integer(c_int), parameter, public :: PRIF_ATOMIC_LOGICAL_KIND = selected_logical_kind(32)
+
+#ifndef NO_SELECTED_LOGICAL_KIND
+  integer(c_int), parameter, public :: PRIF_ATOMIC_LOGICAL_KIND = selected_logical_kind(32)
+#else
   integer(c_int), parameter, public :: PRIF_ATOMIC_LOGICAL_KIND = PRIF_ATOMIC_INT_KIND
+#endif
 
   integer(c_int), parameter, public :: &
     PRIF_CURRENT_TEAM               = 101, &