Merge pull request #746 from sourceryinstitute/issue-745-rename-co_reduce-operator-for-F2018

Fix using co_reduce(...operator=...) for F2018.

Author: rouson

src/tests/regression/reported/CMakeLists.txt

@@ -1,6 +1,6 @@
-caf_compile_executable(co_reduce-factorial issue-172-wrong-co_reduce.f90)
-caf_compile_executable(co_reduce-factorial-int8 issue-172-wrong-co_reduce-int8.f90)
-caf_compile_executable(co_reduce-factorial-int64 issue-172-wrong-co_reduce-int64.f90)
+caf_compile_executable(co_reduce-factorial issue-172-wrong-co_reduce.F90)
+caf_compile_executable(co_reduce-factorial-int8 issue-172-wrong-co_reduce-int8.F90)
+caf_compile_executable(co_reduce-factorial-int64 issue-172-wrong-co_reduce-int64.F90)
 caf_compile_executable(source-alloc-sync issue-243-source-allocation-no-sync.f90)
 caf_compile_executable(convert-before-put issue-292-convert-type-before-put.f90)
 caf_compile_executable(issue-422-send issue-422-send.F90)

src/tests/regression/reported/issue-172-wrong-co_reduce-int64.f90 renamed to src/tests/regression/reported/issue-172-wrong-co_reduce-int64.F90

@@ -13,7 +13,11 @@ program co_reduce_factorial_int64
   integer(kind=8) :: np
   value = this_image ( )
   np = num_images ( )
+#if defined(__GNUC__) && __GNUC__ < 12
   call co_reduce ( value, result_image = 1, operator = myProd )
+#else
+  call co_reduce ( value, result_image = 1, operation = myProd )
+#endif
   !! value[k /= 1] undefined, value[ k == 1 ] should equal $n!$ where $n$ is `num_images()`
   if ( this_image ( ) == 1 ) then
      write ( * , '( "Number of images = ", g0 )' ) num_images ( )

src/tests/regression/reported/issue-172-wrong-co_reduce-int8.f90 renamed to src/tests/regression/reported/issue-172-wrong-co_reduce-int8.F90

@@ -13,7 +13,11 @@ program co_reduce_factorial_int8
   integer(kind=1) :: np
   np = num_images ( )
   value = this_image ( )
+#if defined(__GNUC__) && __GNUC__ < 12
   call co_reduce ( value, result_image = 1, operator = myProd )
+#else
+  call co_reduce ( value, result_image = 1, operation = myProd )
+#endif
   !! value[k /= 1] undefined, value[ k == 1 ] should equal $n!$ where $n$ is `num_images()`
   if ( this_image ( ) == 1 ) then
      write ( * , '( "Number of images = ", g0 )' ) num_images ( )

src/tests/regression/reported/issue-172-wrong-co_reduce.f90 renamed to src/tests/regression/reported/issue-172-wrong-co_reduce.F90

@@ -11,7 +11,11 @@ program co_reduce_factorial
   integer :: value[ * ] !! Each image stores their image number here
   integer :: k
   value = this_image ( )
+#if defined(__GNUC__) && __GNUC__ < 12
   call co_reduce ( value, result_image = 1, operator = myProd )
+#else
+  call co_reduce ( value, result_image = 1, operation = myProd )
+#endif
   !! value[k /= 1] undefined, value[ k == 1 ] should equal $n!$ where $n$ is `num_images()`
   if ( this_image ( ) == 1 ) then
      write ( * , '( "Number of images = ", g0 )' ) num_images ( )

src/tests/unit/collectives/CMakeLists.txt

@@ -7,5 +7,5 @@ endif()
 caf_compile_executable(co_min_test co_min.F90)
 caf_compile_executable(co_max_test co_max.F90)
 caf_compile_executable(co_reduce_test co_reduce.F90)
-caf_compile_executable(co_reduce_res_im co_reduce_res_im.f90)
+caf_compile_executable(co_reduce_res_im co_reduce_res_im.F90)
 caf_compile_executable(co_reduce_string co_reduce_string.f90)

src/tests/unit/collectives/co_reduce_res_im.f90 renamed to src/tests/unit/collectives/co_reduce_res_im.F90

@@ -11,7 +11,11 @@ program co_reduce_res_im
   integer :: value[ * ] !! Each image stores their image number here
   integer :: k
   value = this_image ( )
+#if defined(__GNUC__) && __GNUC__ < 12
   call co_reduce ( value, result_image = 1, operator = myProd )
+#else
+  call co_reduce ( value, result_image = 1, operation = myProd )
+#endif
   !! value[k /= 1] undefined, value[ k == 1 ] should equal $n!$ where $n$ is `num_images()`
   if ( this_image ( ) == 1 ) then
      write ( * , '( "Number of images = ", g0 )' ) num_images ( )