Skip to content

Commit f722edc

Browse files
hppritchahppritcha
committed
FORTRAN: add elemental attribute to comp ops
See discussion in issue open-mpi#10057 Added configury boiler plate in case someone is using an ancient fortran compiler. Note the elemental attribute has been supported for user defined methods since F95. Signed-off-by: Howard Pritchard <[email protected]>
1 parent 3990b3f commit f722edc

File tree

3 files changed

+79
-21
lines changed

3 files changed

+79
-21
lines changed

‎config/ompi_fortran_check_elemental.m4‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
dnl -*- shell-script -*-
2+
dnl
3+
dnl Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
4+
dnl University Research and Technology
5+
dnl Corporation. All rights reserved.
6+
dnl Copyright (c) 2004-2005 The University of Tennessee and The University
7+
dnl of Tennessee Research Foundation. All rights
8+
dnl reserved.
9+
dnl Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
10+
dnl University of Stuttgart. All rights reserved.
11+
dnl Copyright (c) 2004-2005 The Regents of the University of California.
12+
dnl All rights reserved.
13+
dnl Copyright (c) 2010-2014 Cisco Systems, Inc. All rights reserved.
14+
dnl Copyright (c) 2022 Triad National Security, LLC. All rights
15+
dnl reserved.
16+
dnl $COPYRIGHT$
17+
dnl
18+
dnl Additional copyrights may follow
19+
dnl
20+
dnl $HEADER$
21+
dnl
22+
23+
# Check whether or not the Fortran compiler supports the "elemental"
24+
# keyword in derived types or not.
25+
26+
# OMPI_FORTRAN_CHECK_ELEMENTAL([action if found],
27+
# [action if not found])
28+
# ----------------------------------------------------
29+
AC_DEFUN([OMPI_FORTRAN_CHECK_ELEMENTAL],[
30+
AS_VAR_PUSHDEF([elemental_var], [ompi_cv_fortran_elemental])
31+
32+
AC_CACHE_CHECK([if Fortran compiler supports ELEMENTAL], elemental_var,
33+
[AC_LANG_PUSH([Fortran])
34+
AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ELEMENTAL SUBROUTINE binky(buf)
35+
REAL,INTENT(INOUT) :: buf
36+
BUF = BUF + 1
37+
END SUBROUTINE binky]])],
38+
[AS_VAR_SET(elemental_var, yes)],
39+
[AS_VAR_SET(elemental_var, no)])
40+
touch conftest_foo.mod
41+
rm -rf *.mod 2>/dev/null
42+
AC_LANG_POP([Fortran])
43+
])
44+
45+
AS_VAR_IF(elemental_var, [yes], [$1], [$2])
46+
AS_VAR_POPDEF([elemental_var])dnl
47+
])

‎config/ompi_setup_mpi_fortran.m4‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ dnl Copyright (c) 2014-2021 Research Organization for Information Science
1919
dnl and Technology (RIST). All rights reserved.
2020
dnl Copyright (c) 2016 IBM Corporation. All rights reserved.
2121
dnl Copyright (c) 2018 FUJITSU LIMITED. All rights reserved.
22+
dnl Copyright (c) 2022 Triad National Security, LLC. All rights
23+
dnl reserved.
2224
dnl $COPYRIGHT$
2325
dnl
2426
dnl Additional copyrights may follow
@@ -587,6 +589,15 @@ end type test_mpi_handle],
587589
])
588590
])
589591

592+
OMPI_FORTRAN_HAVE_ELEMENTAL=0
593+
AS_IF([test $OMPI_TRY_FORTRAN_BINDINGS -ge $OMPI_FORTRAN_USEMPIF08_BINDINGS && \
594+
test $OMPI_BUILD_FORTRAN_BINDINGS -ge $OMPI_FORTRAN_USEMPIF08_BINDINGS],
595+
[ # Does the compiler support "elemental"
596+
OMPI_FORTRAN_CHECK_ELEMENTAL(
597+
[OMPI_FORTRAN_ELEMENTAL_TYPE="ELEMENTAL"],
598+
[OMPI_FORTRAN_ELEMENTAL_TYPE=])])
599+
AC_SUBST(OMPI_FORTRAN_ELEMENTAL_TYPE)
600+
590601
# Note: the current implementation *only* has wrappers;
591602
# there is no optimized implementation for a "good"
592603
# compiler. I'm leaving the above logic in place for

‎ompi/mpi/fortran/use-mpi/mpi-types.F90.in‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -120,104 +120,104 @@ contains
120120

121121
! .EQ. operator
122122
!-----------------
123-
logical function ompi_comm_op_eq(a, b)
123+
@OMPI_FORTRAN_ELEMENTAL_TYPE@ logical function ompi_comm_op_eq(a, b)
124124
type(MPI_Comm), intent(in) :: a, b
125125
ompi_comm_op_eq = (a%MPI_VAL .EQ. b%MPI_VAL)
126126
end function ompi_comm_op_eq
127127

128-
logical function ompi_datatype_op_eq(a, b)
128+
@OMPI_FORTRAN_ELEMENTAL_TYPE@ logical function ompi_datatype_op_eq(a, b)
129129
type(MPI_Datatype), intent(in) :: a, b
130130
ompi_datatype_op_eq = (a%MPI_VAL .EQ. b%MPI_VAL)
131131
end function ompi_datatype_op_eq
132132

133-
logical function ompi_errhandler_op_eq(a, b)
133+
@OMPI_FORTRAN_ELEMENTAL_TYPE@ logical function ompi_errhandler_op_eq(a, b)
134134
type(MPI_Errhandler), intent(in) :: a, b
135135
ompi_errhandler_op_eq = (a%MPI_VAL .EQ. b%MPI_VAL)
136136
end function ompi_errhandler_op_eq
137137

138-
logical function ompi_file_op_eq(a, b)
138+
@OMPI_FORTRAN_ELEMENTAL_TYPE@ logical function ompi_file_op_eq(a, b)
139139
type(MPI_File), intent(in) :: a, b
140140
ompi_file_op_eq = (a%MPI_VAL .EQ. b%MPI_VAL)
141141
end function ompi_file_op_eq
142142

143-
logical function ompi_group_op_eq(a, b)
143+
@OMPI_FORTRAN_ELEMENTAL_TYPE@ logical function ompi_group_op_eq(a, b)
144144
type(MPI_Group), intent(in) :: a, b
145145
ompi_group_op_eq = (a%MPI_VAL .EQ. b%MPI_VAL)
146146
end function ompi_group_op_eq
147147

148-
logical function ompi_info_op_eq(a, b)
148+
@OMPI_FORTRAN_ELEMENTAL_TYPE@ logical function ompi_info_op_eq(a, b)
149149
type(MPI_Info), intent(in) :: a, b
150150
ompi_info_op_eq = (a%MPI_VAL .EQ. b%MPI_VAL)
151151
end function ompi_info_op_eq
152152

153-
logical function ompi_message_op_eq(a, b)
153+
@OMPI_FORTRAN_ELEMENTAL_TYPE@ logical function ompi_message_op_eq(a, b)
154154
type(MPI_Message), intent(in) :: a, b
155155
ompi_message_op_eq = (a%MPI_VAL .EQ. b%MPI_VAL)
156156
end function ompi_message_op_eq
157157

158-
logical function ompi_op_op_eq(a, b)
158+
@OMPI_FORTRAN_ELEMENTAL_TYPE@ logical function ompi_op_op_eq(a, b)
159159
type(MPI_Op), intent(in) :: a, b
160160
ompi_op_op_eq = (a%MPI_VAL .EQ. b%MPI_VAL)
161161
end function ompi_op_op_eq
162162

163-
logical function ompi_request_op_eq(a, b)
163+
@OMPI_FORTRAN_ELEMENTAL_TYPE@ logical function ompi_request_op_eq(a, b)
164164
type(MPI_Request), intent(in) :: a, b
165165
ompi_request_op_eq = (a%MPI_VAL .EQ. b%MPI_VAL)
166166
end function ompi_request_op_eq
167167

168-
logical function ompi_win_op_eq(a, b)
168+
@OMPI_FORTRAN_ELEMENTAL_TYPE@ logical function ompi_win_op_eq(a, b)
169169
type(MPI_Win), intent(in) :: a, b
170170
ompi_win_op_eq = (a%MPI_VAL .EQ. b%MPI_VAL)
171171
end function ompi_win_op_eq
172172

173173
! .NE. operator
174174
!-----------------
175-
logical function ompi_comm_op_ne(a, b)
175+
@OMPI_FORTRAN_ELEMENTAL_TYPE@ logical function ompi_comm_op_ne(a, b)
176176
type(MPI_Comm), intent(in) :: a, b
177177
ompi_comm_op_ne = (a%MPI_VAL .NE. b%MPI_VAL)
178178
end function ompi_comm_op_ne
179179

180-
logical function ompi_datatype_op_ne(a, b)
180+
@OMPI_FORTRAN_ELEMENTAL_TYPE@ logical function ompi_datatype_op_ne(a, b)
181181
type(MPI_Datatype), intent(in) :: a, b
182182
ompi_datatype_op_ne = (a%MPI_VAL .NE. b%MPI_VAL)
183183
end function ompi_datatype_op_ne
184184

185-
logical function ompi_errhandler_op_ne(a, b)
185+
@OMPI_FORTRAN_ELEMENTAL_TYPE@ logical function ompi_errhandler_op_ne(a, b)
186186
type(MPI_Errhandler), intent(in) :: a, b
187187
ompi_errhandler_op_ne = (a%MPI_VAL .NE. b%MPI_VAL)
188188
end function ompi_errhandler_op_ne
189189

190-
logical function ompi_file_op_ne(a, b)
190+
@OMPI_FORTRAN_ELEMENTAL_TYPE@ logical function ompi_file_op_ne(a, b)
191191
type(MPI_File), intent(in) :: a, b
192192
ompi_file_op_ne = (a%MPI_VAL .NE. b%MPI_VAL)
193193
end function ompi_file_op_ne
194194

195-
logical function ompi_group_op_ne(a, b)
195+
@OMPI_FORTRAN_ELEMENTAL_TYPE@ logical function ompi_group_op_ne(a, b)
196196
type(MPI_Group), intent(in) :: a, b
197197
ompi_group_op_ne = (a%MPI_VAL .NE. b%MPI_VAL)
198198
end function ompi_group_op_ne
199199

200-
logical function ompi_info_op_ne(a, b)
200+
@OMPI_FORTRAN_ELEMENTAL_TYPE@ logical function ompi_info_op_ne(a, b)
201201
type(MPI_Info), intent(in) :: a, b
202202
ompi_info_op_ne = (a%MPI_VAL .NE. b%MPI_VAL)
203203
end function ompi_info_op_ne
204204

205-
logical function ompi_message_op_ne(a, b)
205+
@OMPI_FORTRAN_ELEMENTAL_TYPE@ logical function ompi_message_op_ne(a, b)
206206
type(MPI_Message), intent(in) :: a, b
207207
ompi_message_op_ne = (a%MPI_VAL .NE. b%MPI_VAL)
208208
end function ompi_message_op_ne
209209

210-
logical function ompi_op_op_ne(a, b)
210+
@OMPI_FORTRAN_ELEMENTAL_TYPE@ logical function ompi_op_op_ne(a, b)
211211
type(MPI_Op), intent(in) :: a, b
212212
ompi_op_op_ne = (a%MPI_VAL .NE. b%MPI_VAL)
213213
end function ompi_op_op_ne
214214

215-
logical function ompi_request_op_ne(a, b)
215+
@OMPI_FORTRAN_ELEMENTAL_TYPE@ logical function ompi_request_op_ne(a, b)
216216
type(MPI_Request), intent(in) :: a, b
217-
ompi_request_op_ne = (a%MPI_VAL .NE. b%MPI_VAL)
217+
ompi_request_op_ne = (a%MPI_VAL .NE. b%MPI_VAL)
218218
end function ompi_request_op_ne
219219

220-
logical function ompi_win_op_ne(a, b)
220+
@OMPI_FORTRAN_ELEMENTAL_TYPE@ logical function ompi_win_op_ne(a, b)
221221
type(MPI_Win), intent(in) :: a, b
222222
ompi_win_op_ne = (a%MPI_VAL .NE. b%MPI_VAL)
223223
end function ompi_win_op_ne

0 commit comments

Comments
 (0)