Merge pull request #275 from bonachea/julienne-parallel-callbacks

Enable testing with Julienne multi-image mode

Author: bonachea

install.sh

@@ -451,7 +451,10 @@ else # unknown compiler
   compiler_flag="-g -O2"
   echo "WARNING: Failed to detect a recognized Fortran compiler"
 fi
+# enable Assert's multi-image support with PRIF callbacks provided by libcaffeine
 compiler_flag+=" -DASSERT_MULTI_IMAGE -DASSERT_PARALLEL_CALLBACKS"
+# enable Julienne's multi-image support with PRIF callbacks provided by julienne-driver
+compiler_flag+=" -DHAVE_MULTI_IMAGE_SUPPORT -DJULIENNE_PARALLEL_CALLBACKS"
 
 if ! [[ "$user_compiler_flags " =~ -[DU]ASSERTIONS[=\ ] ]] ; then 
   # default to enabling assertions, unless the command line sets a relevant flag

manifest/fpm.toml.template

@@ -7,7 +7,7 @@ copyright = "2021-2025 The Regents of the University of California, through Lawr
 
 [dev-dependencies]
 assert = {git = "https://github.com/berkeleylab/assert.git", tag = "3.0.0"}
-julienne = {git = "https://github.com/berkeleylab/julienne.git", tag = "3.5.0"}
+julienne = {git = "https://github.com/berkeleylab/julienne.git", tag = "3.6.0"}
 
 [install]
 library = true

test/julienne-driver.F90

@@ -2,7 +2,9 @@
 ! Terms of use are as specified in LICENSE.txt
 
 program test_suite_driver
-  use julienne_m, only : test_fixture_t, test_harness_t, test_diagnosis_t
+  use julienne_m
+  use prif, only: prif_this_image_no_coarray, prif_num_images, prif_sync_all, prif_co_sum, prif_error_stop
+  use iso_c_binding, only: c_int, c_bool
   use prif_init_test_m, only : prif_init_test_t, check_caffeination
   use prif_num_images_test_m, only : prif_num_images_test_t
   use prif_this_image_no_coarray_test_m, only : prif_this_image_no_coarray_test_t
@@ -30,6 +32,14 @@ program test_suite_driver
   type(test_diagnosis_t) :: dummy
   dummy = check_caffeination() ! ensure an early call to prif_init
 
+# if JULIENNE_PARALLEL_CALLBACKS
+    julienne_this_image => julienne_callback_this_image
+    julienne_num_images => julienne_callback_num_images
+    julienne_sync_all => julienne_callback_sync_all
+    julienne_co_sum_integer => julienne_callback_co_sum_integer
+    julienne_error_stop => julienne_callback_error_stop
+# endif
+
   associate(test_harness => test_harness_t([ &
     ! tests for basic functionality that are mostly self-contained
      test_fixture_t( prif_init_test_t() ) &
@@ -66,4 +76,48 @@ program test_suite_driver
   ]))
     call test_harness%report_results
   end associate
+
+contains
+
+  function julienne_callback_this_image() result(this_image_id)
+    implicit none
+    integer :: this_image_id
+    integer(c_int) :: me
+
+    call prif_this_image_no_coarray(this_image=me)
+
+    this_image_id = int(me)
+  end function
+
+  function julienne_callback_num_images() result(image_count)
+    implicit none
+    integer :: image_count
+    integer(c_int) :: ni
+
+    call prif_num_images(ni)
+
+    image_count = int(ni)
+  end function
+
+  subroutine julienne_callback_sync_all()
+    implicit none
+    
+    call prif_sync_all()
+  end subroutine
+
+  subroutine julienne_callback_co_sum_integer(a, result_image)
+    implicit none
+    integer, intent(inout), target :: a(:)
+    integer, intent(in), optional :: result_image
+    
+    call prif_co_sum(a, result_image)
+  end subroutine
+
+  subroutine julienne_callback_error_stop(stop_code_char)
+    implicit none
+    character(len=*), intent(in) :: stop_code_char
+    
+    call prif_error_stop(quiet=.false._c_bool, stop_code_char=stop_code_char)    
+  end subroutine
+
 end program test_suite_driver