@@ -67,25 +67,9 @@ typedef void (ompi_op_c_handler_fn_t)(void *, void *, int *,
67
67
typedef void (ompi_op_fortran_handler_fn_t )(void * , void * ,
68
68
MPI_Fint * , MPI_Fint * );
69
69
70
- /**
71
- * Typedef for C++ op functions intercept (used for user-defined
72
- * MPI::Ops).
73
- *
74
- * See the lengthy explanation for why this is different than the C
75
- * intercept in ompi/mpi/cxx/intercepts.cc in the
76
- * ompi_mpi_cxx_op_intercept() function.
77
- */
78
- typedef void (ompi_op_cxx_handler_fn_t )(void * , void * , int * ,
79
- struct ompi_datatype_t * * ,
80
- MPI_User_function * op );
81
-
82
70
/**
83
71
* Typedef for Java op functions intercept (used for user-defined
84
72
* MPI.Ops).
85
- *
86
- * See the lengthy explanation for why this is different than the C
87
- * intercept in ompi/mpi/cxx/intercepts.cc in the
88
- * ompi_mpi_cxx_op_intercept() function.
89
73
*/
90
74
typedef void (ompi_op_java_handler_fn_t )(void * , void * , int * ,
91
75
struct ompi_datatype_t * * ,
@@ -99,8 +83,6 @@ typedef void (ompi_op_java_handler_fn_t)(void *, void *, int *,
99
83
#define OMPI_OP_FLAGS_INTRINSIC 0x0001
100
84
/** Set if the callback function is in Fortran */
101
85
#define OMPI_OP_FLAGS_FORTRAN_FUNC 0x0002
102
- /** Set if the callback function is in C++ */
103
- #define OMPI_OP_FLAGS_CXX_FUNC 0x0004
104
86
/** Set if the callback function is in Java */
105
87
#define OMPI_OP_FLAGS_JAVA_FUNC 0x0008
106
88
/** Set if the callback function is associative (MAX and SUM will both
@@ -171,15 +153,7 @@ struct ompi_op_t {
171
153
ompi_op_c_handler_fn_t * c_fn ;
172
154
/** Fortran handler function pointer */
173
155
ompi_op_fortran_handler_fn_t * fort_fn ;
174
- /** C++ intercept function data -- see lengthy comment in
175
- ompi/mpi/cxx/intercepts.cc::ompi_mpi_cxx_op_intercept() for
176
- an explanation */
177
- struct {
178
- /* The user's function (it's the wrong type, but that's ok) */
179
- ompi_op_c_handler_fn_t * user_fn ;
180
- /* The OMPI C++ callback/intercept function */
181
- ompi_op_cxx_handler_fn_t * intercept_fn ;
182
- } cxx_data ;
156
+ /** Java intercept function data */
183
157
struct {
184
158
/* The OMPI C++ callback/intercept function */
185
159
ompi_op_java_handler_fn_t * intercept_fn ;
@@ -393,17 +367,8 @@ ompi_op_t *ompi_op_create_user(bool commute,
393
367
ompi_op_fortran_handler_fn_t func );
394
368
395
369
/**
396
- * Mark an MPI_Op as holding a C++ callback function, and cache
397
- * that function in the MPI_Op. See a lenghty comment in
398
- * ompi/mpi/cxx/op.c::ompi_mpi_cxx_op_intercept() for a full
399
- * expalantion.
400
- */
401
- OMPI_DECLSPEC void ompi_op_set_cxx_callback (ompi_op_t * op ,
402
- MPI_User_function * fn );
403
-
404
- /**
405
- * Similar to ompi_op_set_cxx_callback(), mark an MPI_Op as holding a
406
- * Java calback function, and cache that function in the MPI_Op.
370
+ * Mark an MPI_Op as holding a Java calback function, and cache that
371
+ * function in the MPI_Op.
407
372
*/
408
373
OMPI_DECLSPEC void ompi_op_set_java_callback (ompi_op_t * op , void * jnienv ,
409
374
void * object , int baseType );
@@ -594,10 +559,6 @@ static inline void ompi_op_reduce(ompi_op_t * op, void *source,
594
559
f_count = OMPI_INT_2_FINT (count );
595
560
op -> o_func .fort_fn (source , target , & f_count , & f_dtype );
596
561
return ;
597
- } else if (0 != (op -> o_flags & OMPI_OP_FLAGS_CXX_FUNC )) {
598
- op -> o_func .cxx_data .intercept_fn (source , target , & count , & dtype ,
599
- op -> o_func .cxx_data .user_fn );
600
- return ;
601
562
} else if (0 != (op -> o_flags & OMPI_OP_FLAGS_JAVA_FUNC )) {
602
563
op -> o_func .java_data .intercept_fn (source , target , & count , & dtype ,
603
564
op -> o_func .java_data .baseType ,
0 commit comments