Modified the CMake files and src/extensions/opencoarrays.F90 to build with the Cray compilers. The build now completes. No tests pass. Next steps: adjust the caf and cafrun scripts to switch from mpif90 to ftn an dfrom mpirun to aprun.

Author: Damian Rouson

CMakeLists.txt

@@ -26,11 +26,17 @@ endif()
 #Report untested Fortran compiler unless explicitly directed to build all examples.
 if ("${CMAKE_Fortran_COMPILER_ID}" MATCHES "GNU" )
   set(gfortran_compiler true)
-# add_definitions(-DPREFIX_NAME=_gfortran_caf_)
+elseif ("${CMAKE_Fortran_COMPILER_ID}" MATCHES "Cray" )
+  set(cray_compiler true)
+  message(WARNING
+   "Support for the detected compiler (${CMAKE_Fortran_COMPILER_ID}) is experimental. "
+   "Please report any failures to opencoarrays@googlegroups.com"
+  )
+  option(COMPILER_LACKS_C_PTRDIFF_T "iso_c_binding bug filed against CCE 8.4 beta" TRUE)
 else()
   message(WARNING 
-    "*** Attempting to build with untested Fortran compiler: ${CMAKE_Fortran_COMPILER_ID}."
-    "*** Please report any failures to opencoarrays@googlegroups.com"
+    "Attempting to build with untested Fortran compiler: ${CMAKE_Fortran_COMPILER_ID}. "
+    "Please report any failures to opencoarrays@googlegroups.com\n\n"
   )
 endif()
 

src/extensions/opencoarrays.F90

@@ -29,7 +29,15 @@ module opencoarrays
 #ifdef COMPILER_SUPPORTS_ATOMICS
   use iso_fortran_env, only : atomic_int_kind
 #endif
-  use iso_c_binding, only : c_int,c_char,c_ptr,c_loc,c_double,c_int32_t,c_ptrdiff_t,c_sizeof,c_bool,c_funloc
+#if defined(COMPILER_LACKS_C_PTRDIFF_T) || defined(COMPILER_LACKS_C_SIZEOF_ASSUMED_RANK)
+  use iso_c_binding, only : c_int,c_char,c_ptr,c_loc,c_double,c_int32_t,c_bool,c_funloc,c_long
+#elif defined(COMPILER_LACKS_C_PTRDIFF_T) 
+  use iso_c_binding, only : c_int,c_char,c_ptr,c_loc,c_double,c_int32_t,c_bool,c_funloc,c_long     ,c_sizeof
+#elif defined(COMPILER_LACKS_C_SIZEOF_ASSUMED_RANK)
+  use iso_c_binding, only : c_int,c_char,c_ptr,c_loc,c_double,c_int32_t,c_bool,c_funloc,c_ptrdiff_t
+#else
+  use iso_c_binding, only : c_int,c_char,c_ptr,c_loc,c_double,c_int32_t,c_bool,c_funloc,c_ptrdiff_t,c_sizeof
+#endif
   implicit none
 
   private
@@ -52,6 +60,10 @@ module opencoarrays
   end type
 #endif
 
+#ifdef COMPILER_LACKS_C_PTRDIFF_T
+  integer(c_int), parameter :: c_ptrdiff_t=c_long
+#endif
+
   ! Generic interface to co_broadcast with implementations for various types, kinds, and ranks
   interface co_reduce
      module procedure co_reduce_c_int,co_reduce_c_double,co_reduce_logical
@@ -376,7 +388,6 @@ function gfc_descriptor_c_int(a) result(a_descriptor)
     type(gfc_descriptor_t) :: a_descriptor
     integer(c_int), parameter :: unit_stride=1,scalar_offset=-1
     integer(c_int) :: i
-
     a_descriptor%dtype = my_dtype(type_=BT_INTEGER,kind_=int(c_sizeof(a)/bytes_per_word,c_int32_t),rank_=rank(a))
     a_descriptor%offset = scalar_offset 
     a_descriptor%base_addr = c_loc(a) ! data
@@ -385,7 +396,14 @@ function gfc_descriptor_c_int(a) result(a_descriptor)
       a_descriptor%dim_(i)%lower_bound = lbound(a,i)
       a_descriptor%dim_(i)%ubound_ = ubound(a,i)
     end do
-
+#if defined(COMPILER_LACKS_C_SIZEOF_ASSUMED_RANK)
+  contains
+    function c_sizeof(mold) result(c_size_of_mold)
+      integer(c_int), intent(in), target :: mold(..)
+      integer(c_int) :: c_size_of_mold
+      c_size_of_mold=4
+    end function
+#endif
   end function
 
   function gfc_descriptor_logical(a) result(a_descriptor)
@@ -420,6 +438,15 @@ function gfc_descriptor_c_double(a) result(a_descriptor)
       a_descriptor%dim_(i)%ubound_ = ubound(a,i)
     end do
 
+#if defined(COMPILER_LACKS_C_SIZEOF_ASSUMED_RANK)
+  contains
+    function c_sizeof(mold) result(c_size_of_mold)
+      real(c_double), intent(in), target :: mold(..)
+      integer(c_int) :: c_size_of_mold
+      c_size_of_mold=4
+    end function
+#endif
+
   end function
 
  ! This version should work for any rank but causes an ICE with gfortran 4.9.2

src/mpi/CMakeLists.txt

@@ -4,6 +4,8 @@ find_package(MPI REQUIRED)
 
 if("${CMAKE_Fortran_COMPILER_ID}" STREQUAL "GNU")
   set(gfortran_compiler true)
+elseif("${CMAKE_Fortran_COMPILER_ID}" STREQUAL "Cray")
+  set(cray_compiler true)
 endif()
 
 if (CMAKE_VERSION VERSION_GREATER 3.2.3) 
@@ -27,6 +29,10 @@ else()
   if(gfortran_compiler)
     # This applied to gfortran 4.9 and some earlier versions (FIX ME: find out which)
     add_definitions(-DCOMPILER_SUPPORTS_CAF_INTRINSICS)
+  elseif (cray_compiler)
+    # This applies to CCE 8.4 beta or earlier
+    add_definitions(-DCOMPILER_LACKS_C_PTRDIFF_T)
+    add_definitions(-DCOMPILER_LACKS_C_SIZEOF_ASSUMED_RANK)
   endif()
 endif()
 add_library(caf_mpi mpi_caf.c ../common/caf_auxiliary.c ../extensions/opencoarrays.F90)