Skip to content

Commit 76aeb9d

Browse files
committed
greq: remove MPII_Grequest_set_lang_f77 etc.
Remove the no longer needed fortran callback interface for grequest.
1 parent a9b532e commit 76aeb9d

File tree

5 files changed

+0
-87
lines changed

5 files changed

+0
-87
lines changed

src/include/Makefile.mk

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ noinst_HEADERS += \
3434
src/include/mpir_dbg.h \
3535
src/include/mpir_attr_generic.h \
3636
src/include/mpir_attr.h \
37-
src/include/mpii_f77interface.h \
3837
src/include/mpii_fortlogical.h \
3938
src/include/mpir_bsend.h \
4039
src/include/mpir_cvars.h \

src/include/mpii_f77interface.h

Lines changed: 0 additions & 14 deletions
This file was deleted.

src/include/mpiimpl.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -177,10 +177,6 @@ typedef struct MPIR_Stream MPIR_Stream;
177177
#include "mpir_pt2pt.h"
178178
#include "mpir_gpu.h"
179179

180-
#ifdef HAVE_FORTRAN_BINDING
181-
#include "mpii_f77interface.h"
182-
#endif
183-
184180
#include "coll_types.h"
185181
#include "coll_impl.h"
186182

src/include/mpir_misc.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,6 @@
4545
typedef enum MPIR_Lang_t {
4646
MPIR_LANG__C,
4747
MPIR_LANG__X
48-
#ifdef HAVE_FORTRAN_BINDING
49-
, MPIR_LANG__FORTRAN, MPIR_LANG__FORTRAN90
50-
#endif
5148
#ifdef HAVE_CXX_BINDING
5249
, MPIR_LANG__CXX
5350
#endif

src/mpi/request/mpir_request.c

Lines changed: 0 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -294,19 +294,6 @@ int MPIR_Request_get_error(MPIR_Request * request_ptr)
294294
return mpi_errno;
295295
}
296296

297-
#ifdef HAVE_FORTRAN_BINDING
298-
/* Set the language type to Fortran for this (generalized) request */
299-
void MPII_Grequest_set_lang_f77(MPI_Request greq)
300-
{
301-
MPIR_Request *greq_ptr;
302-
303-
MPIR_Request_get_ptr(greq, greq_ptr);
304-
305-
greq_ptr->u.ureq.greq_fns->greq_lang = MPIR_LANG__FORTRAN;
306-
}
307-
#endif
308-
309-
310297
int MPIR_Grequest_cancel(MPIR_Request * request_ptr, int complete)
311298
{
312299
int rc;
@@ -323,23 +310,6 @@ int MPIR_Grequest_cancel(MPIR_Request * request_ptr, int complete)
323310
MPIR_ERR_CHKANDSTMT1((rc != MPI_SUCCESS), mpi_errno, MPI_ERR_OTHER,;, "**user",
324311
"**usercancel %d", rc);
325312
break;
326-
#ifdef HAVE_FORTRAN_BINDING
327-
case MPIR_LANG__FORTRAN:
328-
case MPIR_LANG__FORTRAN90:
329-
{
330-
MPI_Fint ierr;
331-
MPI_Fint icomplete = complete;
332-
333-
(request_ptr->u.ureq.greq_fns->U.F.cancel_fn) (request_ptr->u.ureq.
334-
greq_fns->grequest_extra_state,
335-
&icomplete, &ierr);
336-
rc = (int) ierr;
337-
MPIR_ERR_CHKANDSTMT1((rc != MPI_SUCCESS), mpi_errno, MPI_ERR_OTHER, {;}, "**user",
338-
"**usercancel %d", rc);
339-
break;
340-
}
341-
#endif
342-
343313
default:
344314
{
345315
/* --BEGIN ERROR HANDLING-- */
@@ -374,26 +344,6 @@ int MPIR_Grequest_query(MPIR_Request * request_ptr)
374344
MPIR_ERR_CHKANDSTMT1((rc != MPI_SUCCESS), mpi_errno, MPI_ERR_OTHER, {;}
375345
, "**user", "**userquery %d", rc);
376346
break;
377-
#ifdef HAVE_FORTRAN_BINDING
378-
case MPIR_LANG__FORTRAN:
379-
case MPIR_LANG__FORTRAN90:
380-
{
381-
MPI_Fint ierr;
382-
MPI_Fint is[sizeof(MPI_Status) / sizeof(int)];
383-
/* Take off the global locks before calling user functions */
384-
MPID_THREAD_CS_EXIT(GLOBAL, MPIR_THREAD_GLOBAL_ALLFUNC_MUTEX);
385-
(request_ptr->u.ureq.greq_fns->U.F.query_fn) (request_ptr->u.ureq.
386-
greq_fns->grequest_extra_state, is,
387-
&ierr);
388-
rc = (int) ierr;
389-
if (rc == MPI_SUCCESS)
390-
PMPI_Status_f2c(is, &request_ptr->status);
391-
MPID_THREAD_CS_ENTER(GLOBAL, MPIR_THREAD_GLOBAL_ALLFUNC_MUTEX);
392-
MPIR_ERR_CHKANDSTMT1((rc != MPI_SUCCESS), mpi_errno, MPI_ERR_OTHER, {;}
393-
, "**user", "**userquery %d", rc);
394-
}
395-
break;
396-
#endif
397347
default:
398348
{
399349
/* --BEGIN ERROR HANDLING-- */
@@ -424,21 +374,6 @@ int MPIR_Grequest_free(MPIR_Request * request_ptr)
424374
MPIR_ERR_CHKANDSTMT1((rc != MPI_SUCCESS), mpi_errno, MPI_ERR_OTHER, {;}
425375
, "**user", "**userfree %d", rc);
426376
break;
427-
#ifdef HAVE_FORTRAN_BINDING
428-
case MPIR_LANG__FORTRAN:
429-
case MPIR_LANG__FORTRAN90:
430-
{
431-
MPI_Fint ierr;
432-
433-
(request_ptr->u.ureq.greq_fns->U.F.free_fn) (request_ptr->u.ureq.
434-
greq_fns->grequest_extra_state, &ierr);
435-
rc = (int) ierr;
436-
MPIR_ERR_CHKANDSTMT1((rc != MPI_SUCCESS), mpi_errno, MPI_ERR_OTHER, {;}, "**user",
437-
"**userfree %d", rc);
438-
break;
439-
}
440-
#endif
441-
442377
default:
443378
{
444379
/* --BEGIN ERROR HANDLING-- */

0 commit comments

Comments
 (0)