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

safer detection and load of lammps shared library

Browse Source
This commit is contained in:
Axel Kohlmeyer
2021-02-27 15:50:58 -05:00
parent 9efc83195a
commit 76ef7a9081
1 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
python/lammps/core.py
View File

@ -121,18 +121,16 @@ class lammps(object):
lib_ext = ".so"
if not self.lib:
try:
if not name:
self.lib = CDLL(join(modpath,"liblammps" + lib_ext),RTLD_GLOBAL)
if name:
libpath = join(modpath,"liblammps_%s" % name + lib_ext)
else:
self.lib = CDLL(join(modpath,"liblammps_%s" % name + lib_ext),
RTLD_GLOBAL)
except:
if not name:
self.lib = CDLL("liblammps" + lib_ext,RTLD_GLOBAL)
libpath = join(modpath,"liblammps" + lib_ext)
if not os.path.isfile(libpath):
if name:
libpath = "liblammps_%s" % name + lib_ext
else:
self.lib = CDLL("liblammps_%s" % name + lib_ext,RTLD_GLOBAL)
libpath = "liblammps" + lib_ext
self.lib = CDLL(libpath,RTLD_GLOBAL)
# declare all argument and return types for all library methods here.
# exceptions are where the arguments depend on certain conditions and