ICODE-ADC/lammps
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

allow for mpi4py version 2 or 3 in Python wrapper

Browse Source
This commit is contained in:
Steven J. Plimpton
2018-03-07 08:52:46 -07:00
parent 8d6fbd9829
commit fd1edaf04f
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
python/lammps.py
View File

@ -46,17 +46,15 @@ class MPIAbortException(Exception):
def __str__(self): def __str__(self):
return repr(self.message) return repr(self.message)
class lammps(object): class lammps(object):
# detect if Python is using version of mpi4py that can pass a communicator # detect if Python is using version of mpi4py that can pass a communicator
has_mpi4py_v2 = False has_mpi4py = False
try: try:
from mpi4py import MPI from mpi4py import MPI
from mpi4py import __version__ as mpi4py_version from mpi4py import __version__ as mpi4py_version
if mpi4py_version.split('.')[0] == '2': if mpi4py_version.split('.')[0] in ['2','3']: has_mpi4py = True
has_mpi4py_v2 = True
except: except:
pass pass
@ -111,7 +109,9 @@ class lammps(object):
# need to adjust for type of MPI communicator object # need to adjust for type of MPI communicator object
# allow for int (like MPICH) or void* (like OpenMPI) # allow for int (like MPICH) or void* (like OpenMPI)
if lammps.has_mpi4py_v2 and comm != None: if comm:
if not lammps.has_mpi4py:
raise Exception('Python mpi4py version is not 2 or 3')
if lammps.MPI._sizeof(lammps.MPI.Comm) == sizeof(c_int): if lammps.MPI._sizeof(lammps.MPI.Comm) == sizeof(c_int):
MPI_Comm = c_int MPI_Comm = c_int
else: else: