Merge pull request #51 from SINTEF/pyctp_error

Moved map_platform_specifics.py to pycThermopack folder to avoid import error before platform_specifics.py are generated
thermotools · Jun 8, 2022 · 63c0dc8 · 63c0dc8
2 parents d4bed55 + caa092d
commit 63c0dc8
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 8 deletions.
diff --git a/addon/pycThermopack/README.md b/addon/pycThermopack/README.md
@@ -74,7 +74,7 @@ pyctp folder.
 
 Make sure the symbol mapping is correct for the python interface
 ```bash
-cd addon/pycThermopack/pyctp
+cd addon/pycThermopack
 python map_platform_specifics.py
 ```
 
@@ -88,7 +88,7 @@ pacman -S mingw-w64-x86_64-python
 pacman -S mingw-w64-x86_64-python-numpy
 pacman -S mingw-w64-x86_64-python-matplotlib
 cp bin/dynamic/libthermopack_optim_gfortran_MSYS.so addon/pycThermopack/pyctp/thermopack.dll
-cd addon/pycThermopack/pyctp
+cd addon/pycThermopack
 python map_platform_specifics.py
 cd ../../pyExamples
 python cpa.py

diff --git a/addon/pycThermopack/makescript.py b/addon/pycThermopack/makescript.py
@@ -6,7 +6,7 @@
 import shutil
 import sys
 from pathlib import Path
-from pyctp import map_platform_specifics
+import map_platform_specifics
 
 if __name__ == "__main__":
     parser = argparse.ArgumentParser()

diff --git a/...hermopack/pyctp/map_platform_specifics.py → ...n/pycThermopack/map_platform_specifics.py b/...hermopack/pyctp/map_platform_specifics.py → ...n/pycThermopack/map_platform_specifics.py
@@ -75,7 +75,7 @@ def get_platform_specifics_by_trial_and_error():
 
     dynlibs = ["libthermopack.so", "thermopack.dll", "libthermopack.dynlib"]
     for lib in dynlibs:
-        dyn_lib_path = path.join(path.dirname(__file__), lib)
+        dyn_lib_path = path.join(path.dirname(__file__), "pyctp", lib)
         try:
             tp = cdll.LoadLibrary(dyn_lib_path)
         except OSError:
@@ -152,6 +152,6 @@ def write_platform_specifics_file(pf_specifics, filename):
 
 if __name__ == "__main__":
     pf_specifics_path = os.path.join(os.path.dirname(
-        __file__), "platform_specifics.py")
+        __file__), "pyctp", "platform_specifics.py")
     pf_specifics = get_platform_specifics_by_trial_and_error()
     write_platform_specifics_file(pf_specifics, pf_specifics_path)
diff --git a/addon/pycThermopack/pyctp/__init__.py b/addon/pycThermopack/pyctp/__init__.py
@@ -1,5 +1,4 @@
 """Initialization code for the pyctp package"""
-from . import map_platform_specifics
 from . import platform_specifics
 from . import thermo
 from . import cubic
@@ -16,8 +15,7 @@
 from . import pets
 from . import lee_kesler
 
-__all__ = ["map_platform_specifics",
-           "platform_specifics",
+__all__ = ["platform_specifics",
            "thermo",
            "cubic",
            "tcPR",