Skip to content

Commit 2fefab2

Browse files
hppritchahppritcha
committed
add support for combiner, typeclass, win lock assert
types Signed-off-by: Howard Pritchard <[email protected]>
1 parent bc62df6 commit 2fefab2

File tree

6 files changed

+93
-8
lines changed

6 files changed

+93
-8
lines changed

‎ompi/mpi/bindings/ompi_bindings/c.py‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -534,6 +534,18 @@ def generate_subarray_distrib_types_convert_fn(self):
534534
def generate_whence_convert_fn(self):
535535
self.generic_convert(ConvertFuncs.WHENCE, 'whence', 'int', consts.WHENCE_VALUES)
536536

537+
def generate_combiner_convert_fn_intern_to_abi(self):
538+
self.generic_convert_reverse(ConvertOMPIToStandard.COMBINER, 'combiner', 'int', consts.COMBINER_VALUES)
539+
540+
def generate_typeclass_convert_fn(self):
541+
self.generic_convert(ConvertFuncs.TYPECLASS, 'typeclass', 'int', consts.TYPECLASS_VALUES)
542+
543+
def generate_typeclass_convert_fn(self):
544+
self.generic_convert(ConvertFuncs.TYPECLASS, 'typeclass', 'int', consts.TYPECLASS_VALUES)
545+
546+
def generate_win_lock_convert_fn(self):
547+
self.generic_convert(ConvertFuncs.WIN_LOCK, 'lock_assert', 'int', consts.WIN_LOCK_VALUES)
548+
537549
def generate_mode_bits_convert_fn(self):
538550
self.dump(f'{consts.INLINE_ATTRS} int {ConvertFuncs.MODE_BITS}(int mode_bits)')
539551
self.dump('{')
@@ -706,6 +718,7 @@ def dump_code(self):
706718
self.generate_mode_bits_convert_fn()
707719
self.generate_mode_bits_convert_fn_intern_to_abi()
708720
self.generate_whence_convert_fn()
721+
self.generate_win_lock_convert_fn()
709722

710723
#
711724
# the following only need abi to intern converters
@@ -720,13 +733,14 @@ def dump_code(self):
720733
self.generate_weight_convert_fn()
721734
self.generate_subarray_order_convert_fn()
722735
self.generate_subarray_distrib_types_convert_fn()
736+
self.generate_root_convert_fn()
737+
self.generate_t_cb_safety_convert_fn()
723738

724739
#
725740
# the following only need intern to abi converters
726741
#
727742
self.generate_comm_cmp_convert_fn_intern_to_abi()
728-
self.generate_root_convert_fn()
729-
self.generate_t_cb_safety_convert_fn()
743+
self.generate_combiner_convert_fn_intern_to_abi()
730744

731745
self.dump("""
732746
#if defined(c_plusplus) || defined(__cplusplus)

‎ompi/mpi/bindings/ompi_bindings/c_type.py‎

Lines changed: 40 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2714,7 +2714,7 @@ def type_text(self, enable_count=False):
27142714
return 'int *'
27152715

27162716
@Type.add_type('MODE_BITS', abi_type=['standard'])
2717-
class TyperModeBitsStandard(StandardABIType):
2717+
class TypeModeBitsStandard(StandardABIType):
27182718

27192719
@property
27202720
def init_code(self):
@@ -2724,7 +2724,7 @@ def type_text(self, enable_count=False):
27242724
return 'int'
27252725

27262726
@Type.add_type('MODE_BITS_OUT', abi_type=['standard'])
2727-
class TyperModeBitsOutStandard(StandardABIType):
2727+
class TypeModeBitsOutStandard(StandardABIType):
27282728

27292729
@property
27302730
def final_code(self):
@@ -2744,11 +2744,48 @@ def type_text(self, enable_count=False):
27442744
return 'int'
27452745

27462746
@Type.add_type('WHENCE', abi_type=['standard'])
2747-
class TyperWhenceStandard(StandardABIType):
2747+
class TypeWhenceStandard(StandardABIType):
27482748

27492749
@property
27502750
def init_code(self):
27512751
return [f'int {self.tmpname} = {ConvertFuncs.WHENCE}({self.name});']
27522752

27532753
def type_text(self, enable_count=False):
27542754
return 'int'
2755+
2756+
@Type.add_type('COMBINER_OUT', abi_type=['ompi'])
2757+
class TypeCombinerOut(Type):
2758+
2759+
def type_text(self, enable_count=False):
2760+
return 'int *'
2761+
2762+
@Type.add_type('COMBINER_OUT', abi_type=['standard'])
2763+
class TyperCombinerOutStandard(StandardABIType):
2764+
2765+
@property
2766+
def final_code(self):
2767+
return [f'*{self.name} = {ConvertOMPIToStandard.COMBINER}(*{self.name});']
2768+
2769+
def type_text(self, enable_count=False):
2770+
return 'int *'
2771+
2772+
@property
2773+
def argument(self):
2774+
return f'{self.name}'
2775+
2776+
@Type.add_type('WIN_LOCK', abi_type=['ompi'])
2777+
class TypeWhence(Type):
2778+
2779+
def type_text(self, enable_count=False):
2780+
return 'int'
2781+
2782+
@Type.add_type('WIN_LOCK', abi_type=['standard'])
2783+
class TypeWhenceStandard(StandardABIType):
2784+
2785+
@property
2786+
def init_code(self):
2787+
return [f'int {self.tmpname} = {ConvertFuncs.WIN_LOCK}({self.name});']
2788+
2789+
def type_text(self, enable_count=False):
2790+
return 'int'
2791+

‎ompi/mpi/bindings/ompi_bindings/consts.py‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -461,6 +461,37 @@
461461
'MPI_SEEK_SET',
462462
]
463463

464+
COMBINER_VALUES = [
465+
'MPI_COMBINER_NAMED',
466+
'MPI_COMBINER_DUP',
467+
'MPI_COMBINER_CONTIGUOUS',
468+
'MPI_COMBINER_VECTOR',
469+
'MPI_COMBINER_HVECTOR',
470+
'MPI_COMBINER_INDEXED',
471+
'MPI_COMBINER_HINDEXED',
472+
'MPI_COMBINER_INDEXED_BLOCK',
473+
'MPI_COMBINER_HINDEXED_BLOCK',
474+
'MPI_COMBINER_STRUCT',
475+
'MPI_COMBINER_SUBARRAY',
476+
'MPI_COMBINER_DARRAY',
477+
'MPI_COMBINER_F90_REAL',
478+
'MPI_COMBINER_F90_COMPLEX',
479+
'MPI_COMBINER_F90_INTEGER',
480+
'MPI_COMBINER_RESIZED',
481+
'MPI_COMBINER_VALUE_INDEX',
482+
]
483+
484+
TYPECLASS_VALUES = [
485+
'MPI_TYPECLASS_INTEGER',
486+
'MPI_TYPECLASS_REAL',
487+
'MPI_TYPECLASS_COMPLEX',
488+
]
489+
490+
WIN_LOCK_VALUES = [
491+
'MPI_LOCK_EXCLUSIVE',
492+
'MPI_LOCK_SHARED',
493+
]
494+
464495
# Types
465496

466497
C_OPAQUE_TYPES = {
@@ -536,6 +567,8 @@ class ConvertFuncs:
536567
SUBARRAY_DISTRIB_TYPES = 'ompi_convert_subarray_distrib_type_intern_distrib_type'
537568
MODE_BITS = 'ompi_convert_mode_bits_intern_mode_bits'
538569
WHENCE = 'ompi_convert_whence_intern_whence'
570+
TYPECLASS = 'ompi_convert_typeclass_intern_typeclass'
571+
WIN_LOCK = 'ompi_convert_lock_assert_intern_lock_assert'
539572

540573
class ConvertOMPIToStandard:
541574
"""Generated function for converting from OMPI to standard ABI."""
@@ -568,6 +601,7 @@ class ConvertOMPIToStandard:
568601
SOURCE = 'ompi_convert_source_ompi_to_standard'
569602
SUBARRAY_ORDER = 'ompi_convert_subarray_order_ompi_to_standard'
570603
MODE_BITS = 'ompi_convert_mode_bits_to_standard'
604+
COMBINER = 'ompi_convert_combiner_to_standard'
571605

572606

573607
# Inline function attributes

‎ompi/mpi/c/type_get_envelope.c.in_nbc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ PROTOTYPE ERROR_CLASS type_get_envelope(DATATYPE type,
3333
INT_OUT num_integers,
3434
INT_OUT num_addresses,
3535
INT_OUT num_datatypes,
36-
INT_OUT combiner)
36+
COMBINER_OUT combiner)
3737
{
3838
int rc;
3939

‎ompi/mpi/c/type_get_envelope_c.c.in_obc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ PROTOTYPE ERROR_CLASS type_get_envelope_c(DATATYPE type,
3232
COUNT_OUT num_addresses,
3333
COUNT_OUT num_large_counts,
3434
COUNT_OUT num_datatypes,
35-
INT_OUT combiner)
35+
COMBINER_OUT combiner)
3636
{
3737
int rc;
3838

‎ompi/mpi/c/win_lock.c.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
#include "ompi/win/win.h"
3333
#include "ompi/mca/osc/osc.h"
3434

35-
PROTOTYPE ERROR_CLASS win_lock(INT lock_type, INT rank, MODE_BITS mpi_assert, WIN win)
35+
PROTOTYPE ERROR_CLASS win_lock(WIN_LOCK lock_type, INT rank, MODE_BITS mpi_assert, WIN win)
3636
{
3737
int rc;
3838

0 commit comments

Comments
 (0)