Skip to content

Commit f104442

Browse files
ggouaillardetggouaillardet
committed
mpi: remove references to symbols removed in MPI 3.0
 - MPI_COMBINER_HVECTOR_INTEGER - MPI_COMBINER_HINDEXED_INTEGER - MPI_COMBINER_STRUCT_INTEGERo note this commit breaks ABI compatibility since a public enum is modified. Thanks Lisandro Dalcin for reporting this. Signed-off-by: Gilles Gouaillardet <gilles@rist.or.jp>
1 parent dff9a5c commit f104442

File tree

7 files changed

+22
-55
lines changed

7 files changed

+22
-55
lines changed

‎ompi/datatype/ompi_datatype_args.c‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,6 @@ int32_t ompi_datatype_set_args( ompi_datatype_t* pData,
138138
pArgs->i[2] = i[2][0];
139139
break;
140140

141-
case MPI_COMBINER_HVECTOR_INTEGER:
142141
case MPI_COMBINER_HVECTOR:
143142
pArgs->i[0] = i[0][0];
144143
pArgs->i[1] = i[1][0];
@@ -152,7 +151,6 @@ int32_t ompi_datatype_set_args( ompi_datatype_t* pData,
152151
memcpy( pArgs->i + pos, i[2], i[0][0] * sizeof(int) );
153152
break;
154153

155-
case MPI_COMBINER_HINDEXED_INTEGER:
156154
case MPI_COMBINER_HINDEXED:
157155
pArgs->i[0] = i[0][0];
158156
memcpy( pArgs->i + 1, i[1], i[0][0] * sizeof(int) );
@@ -164,7 +162,6 @@ int32_t ompi_datatype_set_args( ompi_datatype_t* pData,
164162
memcpy( pArgs->i + 2, i[2], i[0][0] * sizeof(int) );
165163
break;
166164

167-
case MPI_COMBINER_STRUCT_INTEGER:
168165
case MPI_COMBINER_STRUCT:
169166
pArgs->i[0] = i[0][0];
170167
memcpy( pArgs->i + 1, i[1], i[0][0] * sizeof(int) );
@@ -707,7 +704,6 @@ static ompi_datatype_t* __ompi_datatype_create_from_args( int32_t* i, MPI_Aint*
707704
}
708705
break;
709706
/******************************************************************/
710-
case MPI_COMBINER_HVECTOR_INTEGER:
711707
case MPI_COMBINER_HVECTOR:
712708
ompi_datatype_create_hvector( i[0], i[1], a[0], d[0], &datatype );
713709
{
@@ -724,7 +720,6 @@ static ompi_datatype_t* __ompi_datatype_create_from_args( int32_t* i, MPI_Aint*
724720
}
725721
break;
726722
/******************************************************************/
727-
case MPI_COMBINER_HINDEXED_INTEGER:
728723
case MPI_COMBINER_HINDEXED:
729724
ompi_datatype_create_hindexed( i[0], &(i[1]), a, d[0], &datatype );
730725
{
@@ -741,7 +736,6 @@ static ompi_datatype_t* __ompi_datatype_create_from_args( int32_t* i, MPI_Aint*
741736
}
742737
break;
743738
/******************************************************************/
744-
case MPI_COMBINER_STRUCT_INTEGER:
745739
case MPI_COMBINER_STRUCT:
746740
ompi_datatype_create_struct( i[0], &(i[1]), a, d, &datatype );
747741
{

‎ompi/include/mpi.h.in‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
* reserved.
1818
* Copyright (c) 2011-2013 INRIA. All rights reserved.
1919
* Copyright (c) 2015 University of Houston. All rights reserved.
20-
* Copyright (c) 2015-2018 Research Organization for Information Science
21-
* and Technology (RIST). All rights reserved.
20+
* Copyright (c) 2015-2019 Research Organization for Information Science
21+
* and Technology (RIST). All rights reserved.
2222
* Copyright (c) 2017-2019 IBM Corporation. All rights reserved.
2323
* Copyright (c) 2018 FUJITSU LIMITED. All rights reserved.
2424
* $COPYRIGHT$
@@ -630,13 +630,10 @@ enum {
630630
MPI_COMBINER_DUP,
631631
MPI_COMBINER_CONTIGUOUS,
632632
MPI_COMBINER_VECTOR,
633-
MPI_COMBINER_HVECTOR_INTEGER,
634633
MPI_COMBINER_HVECTOR,
635634
MPI_COMBINER_INDEXED,
636-
MPI_COMBINER_HINDEXED_INTEGER,
637635
MPI_COMBINER_HINDEXED,
638636
MPI_COMBINER_INDEXED_BLOCK,
639-
MPI_COMBINER_STRUCT_INTEGER,
640637
MPI_COMBINER_STRUCT,
641638
MPI_COMBINER_SUBARRAY,
642639
MPI_COMBINER_DARRAY,

‎ompi/include/mpif-values.pl‎

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#!/usr/bin/env perl
22
#
33
# Copyright (c) 2011-2014 Cisco Systems, Inc. All rights reserved.
4-
# Copyright (c) 2016-2017 Research Organization for Information Science
5-
# and Technology (RIST). All rights reserved.
4+
# Copyright (c) 2016-2019 Research Organization for Information Science
5+
# and Technology (RIST). All rights reserved.
66
# Copyright (c) 2016-2018 FUJITSU LIMITED. All rights reserved.
77
# $COPYRIGHT$
88
#
@@ -354,21 +354,18 @@ sub write_file {
354354
$constants->{MPI_COMBINER_DUP} = 1;
355355
$constants->{MPI_COMBINER_CONTIGUOUS} = 2;
356356
$constants->{MPI_COMBINER_VECTOR} = 3;
357-
$constants->{MPI_COMBINER_HVECTOR_INTEGER} = 4;
358-
$constants->{MPI_COMBINER_HVECTOR} = 5;
359-
$constants->{MPI_COMBINER_INDEXED} = 6;
360-
$constants->{MPI_COMBINER_HINDEXED_INTEGER} = 7;
361-
$constants->{MPI_COMBINER_HINDEXED} = 8;
362-
$constants->{MPI_COMBINER_INDEXED_BLOCK} = 9;
363-
$constants->{MPI_COMBINER_STRUCT_INTEGER} = 10;
364-
$constants->{MPI_COMBINER_STRUCT} = 11;
365-
$constants->{MPI_COMBINER_SUBARRAY} = 12;
366-
$constants->{MPI_COMBINER_DARRAY} = 13;
367-
$constants->{MPI_COMBINER_F90_REAL} = 14;
368-
$constants->{MPI_COMBINER_F90_COMPLEX} = 15;
369-
$constants->{MPI_COMBINER_F90_INTEGER} = 16;
370-
$constants->{MPI_COMBINER_RESIZED} = 17;
371-
$constants->{MPI_COMBINER_HINDEXED_BLOCK} = 18;
357+
$constants->{MPI_COMBINER_HVECTOR} = 4;
358+
$constants->{MPI_COMBINER_INDEXED} = 5;
359+
$constants->{MPI_COMBINER_HINDEXED} = 6;
360+
$constants->{MPI_COMBINER_INDEXED_BLOCK} = 7;
361+
$constants->{MPI_COMBINER_STRUCT} = 8;
362+
$constants->{MPI_COMBINER_SUBARRAY} = 9;
363+
$constants->{MPI_COMBINER_DARRAY} = 10;
364+
$constants->{MPI_COMBINER_F90_REAL} = 11;
365+
$constants->{MPI_COMBINER_F90_COMPLEX} = 12;
366+
$constants->{MPI_COMBINER_F90_INTEGER} = 13;
367+
$constants->{MPI_COMBINER_RESIZED} = 14;
368+
$constants->{MPI_COMBINER_HINDEXED_BLOCK} = 15;
372369

373370
$constants->{MPI_COMM_TYPE_SHARED} = 0;
374371
$constants->{OMPI_COMM_TYPE_HWTHREAD} = 1;

‎ompi/mca/coll/hcoll/coll_hcoll_rte.c‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
* reserved.
88
* Copyright (c) 2015 Los Alamos National Security, LLC. All rights
99
* reserved.
10-
* Copyright (c) 2015 Research Organization for Information Science
11-
* and Technology (RIST). All rights reserved.
10+
* Copyright (c) 2015-2019 Research Organization for Information Science
11+
* and Technology (RIST). All rights reserved.
1212
* $COPYRIGHT$
1313
*
1414
* Additional copyrights may follow
@@ -402,7 +402,6 @@ hcoll_mpi_type_combiner_t ompi_combiner_2_hcoll_combiner(int ompi_combiner) {
402402
return HCOLL_MPI_COMBINER_HVECTOR;
403403
case MPI_COMBINER_INDEXED:
404404
return HCOLL_MPI_COMBINER_INDEXED;
405-
case MPI_COMBINER_HINDEXED_INTEGER:
406405
case MPI_COMBINER_HINDEXED:
407406
return HCOLL_MPI_COMBINER_HINDEXED;
408407
case MPI_COMBINER_DUP:
@@ -424,7 +423,6 @@ hcoll_mpi_type_combiner_t ompi_combiner_2_hcoll_combiner(int ompi_combiner) {
424423
case MPI_COMBINER_RESIZED:
425424
return HCOLL_MPI_COMBINER_RESIZED;
426425
case MPI_COMBINER_STRUCT:
427-
case MPI_COMBINER_STRUCT_INTEGER:
428426
return HCOLL_MPI_COMBINER_STRUCT;
429427
default:
430428
break;

‎ompi/mca/io/romio321/romio/adio/ad_pvfs2/ad_pvfs2_io_dtype.c‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -351,16 +351,6 @@ int convert_mpi_pvfs2_dtype(MPI_Datatype *mpi_dtype,
351351
fprintf(stderr, "convert_mpi_pvfs2_dtype: "
352352
"HINDEXED_BLOCK is unsupported\n");
353353
break;
354-
case MPI_COMBINER_HINDEXED_INTEGER:
355-
ADIOI_Free(old_pvfs_dtype);
356-
fprintf(stderr, "convert_mpi_pvfs2_dtype: "
357-
"HINDEXED_INTEGER is unsupported\n");
358-
break;
359-
case MPI_COMBINER_STRUCT_INTEGER:
360-
ADIOI_Free(old_pvfs_dtype);
361-
fprintf(stderr, "convert_mpi_pvfs2_dtype: "
362-
"STRUCT_INTEGER is unsupported\n");
363-
break;
364354
case MPI_COMBINER_SUBARRAY:
365355
ADIOI_Free(old_pvfs_dtype);
366356
fprintf(stderr, "convert_mpi_pvfs2_dtype: "

‎ompi/mca/io/romio321/romio/adio/common/flatten.c‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -410,9 +410,8 @@ void ADIOI_Flatten(MPI_Datatype datatype, ADIOI_Flatlist_node *flat,
410410
break;
411411

412412
case MPI_COMBINER_HVECTOR:
413-
case MPI_COMBINER_HVECTOR_INTEGER:
414413
#ifdef FLATTEN_DEBUG
415-
DBG_FPRINTF(stderr,"ADIOI_Flatten:: MPI_COMBINER_HVECTOR_INTEGER\n");
414+
DBG_FPRINTF(stderr,"ADIOI_Flatten:: MPI_COMBINER_HVECTOR\n");
416415
#endif
417416
top_count = ints[0];
418417
ADIOI_Type_get_envelope(types[0], &old_nints, &old_nadds,
@@ -667,9 +666,8 @@ void ADIOI_Flatten(MPI_Datatype datatype, ADIOI_Flatlist_node *flat,
667666
break;
668667

669668
case MPI_COMBINER_HINDEXED:
670-
case MPI_COMBINER_HINDEXED_INTEGER:
671669
#ifdef FLATTEN_DEBUG
672-
DBG_FPRINTF(stderr,"ADIOI_Flatten:: MPI_COMBINER_HINDEXED_INTEGER\n");
670+
DBG_FPRINTF(stderr,"ADIOI_Flatten:: MPI_COMBINER_HINDEXED\n");
673671
#endif
674672
top_count = ints[0];
675673
ADIOI_Type_get_envelope(types[0], &old_nints, &old_nadds,
@@ -758,9 +756,8 @@ void ADIOI_Flatten(MPI_Datatype datatype, ADIOI_Flatlist_node *flat,
758756
break;
759757

760758
case MPI_COMBINER_STRUCT:
761-
case MPI_COMBINER_STRUCT_INTEGER:
762759
#ifdef FLATTEN_DEBUG
763-
DBG_FPRINTF(stderr,"ADIOI_Flatten:: MPI_COMBINER_STRUCT_INTEGER\n");
760+
DBG_FPRINTF(stderr,"ADIOI_Flatten:: MPI_COMBINER_STRUCT\n");
764761
#endif
765762
top_count = ints[0];
766763
for (n=0; n<top_count; n++) {
@@ -1033,7 +1030,6 @@ MPI_Count ADIOI_Count_contiguous_blocks(MPI_Datatype datatype, MPI_Count *curr_i
10331030

10341031
case MPI_COMBINER_VECTOR:
10351032
case MPI_COMBINER_HVECTOR:
1036-
case MPI_COMBINER_HVECTOR_INTEGER:
10371033
top_count = ints[0];
10381034
ADIOI_Type_get_envelope(types[0], &old_nints, &old_nadds,
10391035
&old_ntypes, &old_combiner);
@@ -1068,7 +1064,6 @@ MPI_Count ADIOI_Count_contiguous_blocks(MPI_Datatype datatype, MPI_Count *curr_i
10681064

10691065
case MPI_COMBINER_INDEXED:
10701066
case MPI_COMBINER_HINDEXED:
1071-
case MPI_COMBINER_HINDEXED_INTEGER:
10721067
top_count = ints[0];
10731068
ADIOI_Type_get_envelope(types[0], &old_nints, &old_nadds,
10741069
&old_ntypes, &old_combiner);
@@ -1136,7 +1131,6 @@ MPI_Count ADIOI_Count_contiguous_blocks(MPI_Datatype datatype, MPI_Count *curr_i
11361131
break;
11371132

11381133
case MPI_COMBINER_STRUCT:
1139-
case MPI_COMBINER_STRUCT_INTEGER:
11401134
top_count = ints[0];
11411135
count = 0;
11421136
for (n=0; n<top_count; n++) {

‎ompi/mpi/cxx/constants.h‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// All rights reserved.
1313
// Copyright (c) 2008-2009 Cisco Systems, Inc. All rights reserved.
1414
// Copyright (c) 2011 FUJITSU LIMITED. All rights reserved.
15-
// Copyright (c) 2017 Research Organization for Information Science
15+
// Copyright (c) 2017-2019 Research Organization for Information Science
1616
// and Technology (RIST). All rights reserved.
1717
// $COPYRIGHT$
1818
//
@@ -180,13 +180,10 @@ static const int COMBINER_NAMED = MPI_COMBINER_NAMED;
180180
static const int COMBINER_DUP = MPI_COMBINER_DUP;
181181
static const int COMBINER_CONTIGUOUS = MPI_COMBINER_CONTIGUOUS;
182182
static const int COMBINER_VECTOR = MPI_COMBINER_VECTOR;
183-
static const int COMBINER_HVECTOR_INTEGER = MPI_COMBINER_HVECTOR_INTEGER;
184183
static const int COMBINER_HVECTOR = MPI_COMBINER_HVECTOR;
185184
static const int COMBINER_INDEXED = MPI_COMBINER_INDEXED;
186-
static const int COMBINER_HINDEXED_INTEGER = MPI_COMBINER_HINDEXED_INTEGER;
187185
static const int COMBINER_HINDEXED = MPI_COMBINER_HINDEXED;
188186
static const int COMBINER_INDEXED_BLOCK = MPI_COMBINER_INDEXED_BLOCK;
189-
static const int COMBINER_STRUCT_INTEGER = MPI_COMBINER_STRUCT_INTEGER;
190187
static const int COMBINER_STRUCT = MPI_COMBINER_STRUCT;
191188
static const int COMBINER_SUBARRAY = MPI_COMBINER_SUBARRAY;
192189
static const int COMBINER_DARRAY = MPI_COMBINER_DARRAY;

0 commit comments

Comments
 (0)