From 953d2c738b6fffafdbaa81b962a1d97e4079b44f Mon Sep 17 00:00:00 2001 From: chemshift Date: Mon, 8 Aug 2022 11:45:43 -0600 Subject: [PATCH] Update __init__.py --- python/lammps/mliap/__init__.py | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/python/lammps/mliap/__init__.py b/python/lammps/mliap/__init__.py index bc7dd1d6a2..a9ff2c6a70 100644 --- a/python/lammps/mliap/__init__.py +++ b/python/lammps/mliap/__init__.py @@ -6,29 +6,24 @@ import sysconfig import ctypes import platform -library_dir = sysconfig.get_config_vars('LIBDIR')[0] -library_name = sysconfig.get_config_vars('LIBRARY')[0] -library = library_dir + "/" + library_name - +library_dir = sysconfig.get_config_vars('prefix')[0] +py_ver = sysconfig.get_config_vars('VERSION')[0] OS_name = platform.system() if OS_name == "Linux": SHLIB_SUFFIX = '.so' + library = library_dir + '/lib/' + 'libpython' + py_ver + SHLIB_SUFFIX elif OS_name == "Darwin": SHLIB_SUFFIX = '.dylib' + library = library_dir + '/lib/' + 'libpython' + py_ver + SHLIB_SUFFIX elif OS_name == "Windows": SHLIB_SUFFIX = '.dll' -else: - SHLIB_SUFFIX = sysconfig.get_config_vars('SHLIB_SUFFIX') + library = library_dir + '\\' + 'python' + py_ver + SHLIB_SUFFIX try: pylib = ctypes.CDLL(library) -except OSError as e: - if library.endswith(".a"): - library = library.strip(".a") + SHLIB_SUFFIX - pylib = ctypes.CDLL(library) - else: - raise e +except: + OSError if not pylib.Py_IsInitialized(): raise RuntimeError("This interpreter is not compatible with python-based mliap for LAMMPS.")