File tree Expand file tree Collapse file tree 3 files changed +22
-9
lines changed Expand file tree Collapse file tree 3 files changed +22
-9
lines changed Original file line number Diff line number Diff line change @@ -190,6 +190,12 @@ AC_MSG_CHECKING([for bootstrap Libtool version])
190
190
ltversion=` grep VERSION= $srcdir /config/ltmain.sh | head -n 1 | cut -d= -f2`
191
191
AC_MSG_RESULT([$ltversion ])
192
192
193
+ # Ensure mpi.h.in and mca_base_event.h have consistent callback safety values
194
+ AC_DEFINE_UNQUOTED([OPAL_MCA_BASE_CB_REQUIRE_NONE], [0], [Keeping OPAL and OMPI values in sync])
195
+ AC_DEFINE_UNQUOTED([OPAL_MCA_BASE_CB_REQUIRE_MPI_RESTRICTED], [1], [Keeping OPAL and OMPI values in sync])
196
+ AC_DEFINE_UNQUOTED([OPAL_MCA_BASE_CB_REQUIRE_THREAD_SAFE], [2], [Keeping OPAL and OMPI values in sync])
197
+ AC_DEFINE_UNQUOTED([OPAL_MCA_BASE_CB_REQUIRE_ASYNC_SIGNAL_SAFE], [3], [Keeping OPAL and OMPI values in sync])
198
+
193
199
# List header files to generate
194
200
195
201
AC_CONFIG_HEADERS([opal/include/opal_config.h])
@@ -1399,6 +1405,7 @@ if test $ac_cv_header_sys_synch_h = yes ; then
1399
1405
[Do not use outside of mpi.h. Define to 1 if you have the <sys/synch.h> header file.])
1400
1406
fi
1401
1407
1408
+
1402
1409
# If there is a local hook for each project, call it. This allows 3rd
1403
1410
# parties to add configuration steps to OPAL and/or OMPI simply
1404
1411
# by placing a file in [opal|ompi]/config/whatever.m4 that
Original file line number Diff line number Diff line change @@ -923,12 +923,18 @@ enum {
923
923
924
924
/*
925
925
* MPIT callback safety levels
926
+ *
927
+ * Values are set in configure.ac for consistency with mca_base_event.h
926
928
*/
929
+ #undef OPAL_MCA_BASE_CB_REQUIRE_NONE
930
+ #undef OPAL_MCA_BASE_CB_REQUIRE_MPI_RESTRICTED
931
+ #undef OPAL_MCA_BASE_CB_REQUIRE_THREAD_SAFE
932
+ #undef OPAL_MCA_BASE_CB_REQUIRE_ASYNC_SIGNAL_SAFE
927
933
typedef enum {
928
- MPI_T_CB_REQUIRE_NONE ,
929
- MPI_T_CB_REQUIRE_MPI_RESTRICTED ,
930
- MPI_T_CB_REQUIRE_THREAD_SAFE ,
931
- MPI_T_CB_REQUIRE_ASYNC_SIGNAL_SAFE
934
+ MPI_T_CB_REQUIRE_NONE = OPAL_MCA_BASE_CB_REQUIRE_NONE ,
935
+ MPI_T_CB_REQUIRE_MPI_RESTRICTED = OPAL_MCA_BASE_CB_REQUIRE_MPI_RESTRICTED ,
936
+ MPI_T_CB_REQUIRE_THREAD_SAFE = OPAL_MCA_BASE_CB_REQUIRE_THREAD_SAFE ,
937
+ MPI_T_CB_REQUIRE_ASYNC_SIGNAL_SAFE = OPAL_MCA_BASE_CB_REQUIRE_ASYNC_SIGNAL_SAFE
932
938
} MPI_T_cb_safety ;
933
939
934
940
/*
Original file line number Diff line number Diff line change @@ -42,13 +42,13 @@ typedef enum {
42
42
/**
43
43
* @basic Callback safety levels
44
44
*
45
- * If these are modified then similar modifications will be needed in mpi.h.in.
45
+ * Values are set in configure.ac for consistency with mpi.h
46
46
*/
47
47
typedef enum {
48
- MCA_BASE_CB_REQUIRE_NONE ,
49
- MCA_BASE_CB_REQUIRE_MPI_RESTRICTED ,
50
- MCA_BASE_CB_REQUIRE_THREAD_SAFE ,
51
- MCA_BASE_CB_REQUIRE_ASYNC_SIGNAL_SAFE ,
48
+ MCA_BASE_CB_REQUIRE_NONE = OPAL_MCA_BASE_CB_REQUIRE_NONE ,
49
+ MCA_BASE_CB_REQUIRE_MPI_RESTRICTED = OPAL_MCA_BASE_CB_REQUIRE_MPI_RESTRICTED ,
50
+ MCA_BASE_CB_REQUIRE_THREAD_SAFE = OPAL_MCA_BASE_CB_REQUIRE_THREAD_SAFE ,
51
+ MCA_BASE_CB_REQUIRE_ASYNC_SIGNAL_SAFE = OPAL_MCA_BASE_CB_REQUIRE_ASYNC_SIGNAL_SAFE ,
52
52
MCA_BASE_CB_SAFETY_MAX ,
53
53
} mca_base_cb_safety_t ;
54
54
You can’t perform that action at this time.
0 commit comments