Skip to content

Commit 111f48b

Browse files
committed
some fixes for attributes and more
to start using the ompi-tests/ibm had to complete adding MPI_T_ to the abi. Also some other fixes. Attributes still need more work. Signed-off-by: Howard Pritchard <[email protected]>
1 parent d259308 commit 111f48b

30 files changed

+1052
-49
lines changed

ompi/Makefile.am

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,8 @@ lib@OMPI_LIBMPI_NAME@_la_LDFLAGS = \
183183
libmpi_abi_la_SOURCES =
184184
libmpi_abi_la_LIBADD = \
185185
libopen_mpi.la \
186-
mpi/c/libmpi_c_abi.la
186+
mpi/c/libmpi_c_abi.la \
187+
mpi/tool/libmpi_mpit_abi.la
187188

188189
# included subdirectory Makefile.am's and appended-to variables
189190
headers =

ompi/include/mpi.h.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -955,8 +955,8 @@ typedef enum {
955955
* MPIT source ordering
956956
*/
957957
enum ompi_mpi_t_source_order_t {
958-
MPI_T_ORDERED,
959-
MPI_T_UNORDERED,
958+
MPI_T_SOURCE_ORDERED,
959+
MPI_T_SOURCE_UNORDERED,
960960
};
961961

962962
typedef enum ompi_mpi_t_source_order_t MPI_T_source_order;

ompi/mpi/bindings/c_header.py

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@
5151
"MPI_T_event_instance",
5252
"MPI_T_event_registration",
5353
"MPI_T_cb_safety",
54+
"MPI_T_source_order",
5455
# TODO: these two are deprecated, get rid of them
5556
"MPI_Copy_function",
5657
"MPI_Delete_function",
@@ -246,6 +247,16 @@ def output_constant(const, use_enum: bool, mangle_name: bool):
246247
binding = proc.express.embiggen.iso_c.__str__().split()
247248
output.append(f"{binding[0]} P{' '.join(binding[1:])};\n")
248249

250+
# ================================ Odds and ends for mangle case ===============
251+
if MANGLE_NAMES:
252+
output.append("\n")
253+
output.append("/*\n")
254+
output.append(" * define externs to help with attributes\n")
255+
output.append(" */\n")
256+
output.append("extern int ompi_abi_mpi_proc_null_val;\n")
257+
output.append("extern int ompi_abi_mpi_any_source_val;\n")
258+
output.append("\n")
259+
249260
# ================================ Final Output ================================
250261
output.append("#if defined(__cplusplus)\n")
251262
output.append("}\n")

0 commit comments

Comments
 (0)