Skip to content

Commit 309285d

Browse files
dalcinldalcinl
committed
Add headers collecting compatibility for removals and deprecations
1 parent 7a13cd8 commit 309285d

File tree

2 files changed

+160
-0
lines changed

2 files changed

+160
-0
lines changed

‎mpi-api-deprecated.h‎

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
#pragma once
2+
3+
#if !defined(MPI_ABI_static_inline)
4+
# if (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || defined(__cplusplus)
5+
# define MPI_ABI_static_inline static inline
6+
# else
7+
# define MPI_ABI_static_inline static __inline
8+
# endif
9+
#endif
10+
11+
/* MPI deprecated types and constants */
12+
13+
#define MPI_Copy_function MPI_Comm_copy_attr_function
14+
#define MPI_Delete_function MPI_Comm_delete_attr_function
15+
#define MPI_DUP_FN MPI_COMM_DUP_FN
16+
#define MPI_NULL_COPY_FN MPI_COMM_NULL_COPY_FN
17+
#define MPI_NULL_DELETE_FN MPI_COMM_NULL_DELETE_FN
18+
19+
#define MPI_HOST MPI_KEYVAL_INVALID
20+
#define MPI_T_ERR_INVALID_ITEM MPI_T_ERR_INVALID_INDEX
21+
22+
/* MPI deprecated functions */
23+
24+
#define MPI_Attr_delete MPI_Comm_delete_attr
25+
#define MPI_Attr_get MPI_Comm_get_attr
26+
#define MPI_Attr_put MPI_Comm_set_attr
27+
28+
#define MPI_Keyval_create MPI_Comm_create_keyval
29+
#define MPI_Keyval_free MPI_Comm_free_keyval
30+
31+
#define MPI_Get_elements_x MPI_Get_elements_c
32+
#define MPI_Status_set_elements_x MPI_Status_set_elements_c
33+
34+
#define MPI_Type_get_extent_x MPI_Type_get_extent_c
35+
#define MPI_Type_get_true_extent_x MPI_Type_get_true_extent_c
36+
#define MPI_Type_size_x MPI_Type_size_c
37+
38+
MPI_ABI_static_inline int MPI_Info_get(MPI_Info MPI_info, const char *MPI_key, int MPI_valuelen, char *MPI_value, int *MPI_flag) {
39+
int MPI_buflen = MPI_valuelen + 1;
40+
return MPI_Info_get_string(MPI_info, MPI_key, &MPI_buflen, MPI_value, MPI_flag);
41+
}
42+
43+
MPI_ABI_static_inline int MPI_Info_get_valuelen(MPI_Info MPI_info, const char *MPI_key, int *MPI_valuelen, int *MPI_flag) {
44+
int MPI_ierr; int MPI_buflen = 0; char MPI_value[1] = {0};
45+
MPI_ierr = MPI_Info_get_string(MPI_info, MPI_key, MPI_valuelen ? &MPI_buflen : MPI_valuelen, MPI_value, MPI_flag);
46+
if (MPI_ierr == MPI_SUCCESS && MPI_valuelen) *MPI_valuelen = MPI_buflen - 1;
47+
return MPI_ierr;
48+
}
49+
50+
/* PMPI deprecated functions */
51+
52+
#define PMPI_Attr_delete PMPI_Comm_delete_attr
53+
#define PMPI_Attr_get PMPI_Comm_get_attr
54+
#define PMPI_Attr_put PMPI_Comm_set_attr
55+
56+
#define PMPI_Keyval_create PMPI_Comm_create_keyval
57+
#define PMPI_Keyval_free PMPI_Comm_free_keyval
58+
59+
#define PMPI_Get_elements_x PMPI_Get_elements_c
60+
#define PMPI_Status_set_elements_x PMPI_Status_set_elements_c
61+
62+
#define PMPI_Type_get_extent_x PMPI_Type_get_extent_c
63+
#define PMPI_Type_get_true_extent_x PMPI_Type_get_true_extent_c
64+
#define PMPI_Type_size_x PMPI_Type_size_c
65+
66+
MPI_ABI_static_inline int PMPI_Info_get(MPI_Info MPI_info, const char *MPI_key, int MPI_valuelen, char *MPI_value, int *MPI_flag) {
67+
int MPI_buflen = MPI_valuelen + 1;
68+
return PMPI_Info_get_string(MPI_info, MPI_key, &MPI_buflen, MPI_value, MPI_flag);
69+
}
70+
71+
MPI_ABI_static_inline int PMPI_Info_get_valuelen(MPI_Info MPI_info, const char *MPI_key, int *MPI_valuelen, int *MPI_flag) {
72+
int MPI_ierr; int MPI_buflen = 0; char MPI_value[1] = {0};
73+
MPI_ierr = PMPI_Info_get_string(MPI_info, MPI_key, MPI_valuelen ? &MPI_buflen : MPI_valuelen, MPI_value, MPI_flag);
74+
if (MPI_ierr == MPI_SUCCESS && MPI_valuelen) *MPI_valuelen = MPI_buflen - 1;
75+
return MPI_ierr;
76+
}

‎mpi-api-removed.h‎

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
#pragma once
2+
3+
#if !defined(MPI_ABI_static_inline)
4+
# if (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || defined(__cplusplus)
5+
# define MPI_ABI_static_inline static inline
6+
# else
7+
# define MPI_ABI_static_inline static __inline
8+
# endif
9+
#endif
10+
11+
/* MPI removed types and constants */
12+
13+
#define MPI_Handler_function MPI_Comm_errhandler_function
14+
15+
#define MPI_LB MPI_DATATYPE_NULL
16+
#define MPI_UB MPI_DATATYPE_NULL
17+
18+
#define MPI_COMBINER_HVECTOR_INTEGER MPI_UNDEFINED
19+
#define MPI_COMBINER_HINDEXED_INTEGER MPI_UNDEFINED
20+
#define MPI_COMBINER_STRUCT_INTEGER MPI_UNDEFINED
21+
22+
/* MPI removed functions */
23+
24+
#define MPI_Address MPI_Get_address
25+
26+
#define MPI_Errhandler_create MPI_Comm_create_errhandler
27+
#define MPI_Errhandler_get MPI_Comm_get_errhandler
28+
#define MPI_Errhandler_set MPI_Comm_set_errhandler
29+
30+
#define MPI_Type_hindexed MPI_Type_create_hindexed
31+
#define MPI_Type_hvector MPI_Type_create_hvector
32+
#define MPI_Type_struct MPI_Type_create_struct
33+
34+
MPI_ABI_static_inline int MPI_Type_extent(MPI_Datatype MPI_datatype, MPI_Aint *MPI_extent)
35+
{
36+
MPI_Aint MPI_lb;
37+
return MPI_Type_get_extent(MPI_datatype, &MPI_lb, MPI_extent);
38+
}
39+
40+
MPI_ABI_static_inline int MPI_Type_lb(MPI_Datatype MPI_datatype, MPI_Aint *MPI_lb)
41+
{
42+
MPI_Aint MPI_extent;
43+
return MPI_Type_get_extent(MPI_datatype, MPI_lb, &MPI_extent);
44+
}
45+
46+
MPI_ABI_static_inline int MPI_Type_ub(MPI_Datatype MPI_datatype, MPI_Aint *MPI_ub)
47+
{
48+
MPI_Aint MPI_lb; int MPI_ierr;
49+
MPI_ierr = MPI_Type_get_extent(MPI_datatype, &MPI_lb, MPI_ub);
50+
if (MPI_ierr == MPI_SUCCESS && MPI_ub) *MPI_ub += MPI_lb;
51+
return MPI_ierr;
52+
}
53+
54+
/* PMPI removed functions */
55+
56+
#define PMPI_Address PMPI_Get_Address
57+
58+
#define PMPI_Errhandler_create PMPI_Comm_create_Errhandler
59+
#define PMPI_Errhandler_get PMPI_Comm_get_errhandler
60+
#define PMPI_Errhandler_set PMPI_Comm_set_errhandler
61+
62+
#define PMPI_Type_hindexed PMPI_Type_create_hindexed
63+
#define PMPI_Type_hvector PMPI_Type_create_hvector
64+
#define PMPI_Type_struct PMPI_Type_create_struct
65+
66+
MPI_ABI_static_inline int PMPI_Type_extent(MPI_Datatype MPI_datatype, MPI_Aint *MPI_extent)
67+
{
68+
MPI_Aint MPI_lb;
69+
return PMPI_Type_get_extent(MPI_datatype, &MPI_lb, MPI_extent);
70+
}
71+
72+
MPI_ABI_static_inline int PMPI_Type_lb(MPI_Datatype MPI_datatype, MPI_Aint *MPI_lb)
73+
{
74+
MPI_Aint MPI_extent;
75+
return PMPI_Type_get_extent(MPI_datatype, MPI_lb, &MPI_extent);
76+
}
77+
78+
MPI_ABI_static_inline int PMPI_Type_ub(MPI_Datatype MPI_datatype, MPI_Aint *MPI_ub)
79+
{
80+
MPI_Aint MPI_lb; int MPI_ierr;
81+
MPI_ierr = PMPI_Type_get_extent(MPI_datatype, &MPI_lb, MPI_ub);
82+
if (MPI_ierr == MPI_SUCCESS && MPI_ub) *MPI_ub += MPI_lb;
83+
return MPI_ierr;
84+
}

0 commit comments

Comments
 (0)