pythonfmu3 0.1.18__py3-none-any.whl → 0.2.1__py3-none-any.whl

pythonfmu3/_version.py

@@ -1 +1 @@
-__version__ = "0.1.18"
+__version__ = "0.2.1"

pythonfmu3/pythonfmu-export/src/CMakeLists.txt

@@ -26,10 +26,11 @@ target_include_directories(pythonfmu-export
         "${CMAKE_CURRENT_SOURCE_DIR}"
         )
 
-target_link_libraries(pythonfmu-export
-        PRIVATE
-        ${Python3_LIBRARIES}
-        )
+if (WIN32)
+  target_link_libraries(pythonfmu-export PRIVATE ${Python3_LIBRARIES})
+elseif (APPLE)
+  set_target_properties(pythonfmu-export PROPERTIES LINK_FLAGS "-undefined dynamic_lookup")
+endif ()
 
 if (WIN32)
   set_target_properties(pythonfmu-export

pythonfmu3/pythonfmu-export/src/pythonfmu/PySlaveInstance.cpp

@@ -73,6 +73,7 @@ PySlaveInstance::PySlaveInstance(std::string instanceName, std::string resources
         std::string moduleName = getline(resources_ + "/slavemodule.txt");
         PyObject* pModule = PyImport_ImportModule(moduleName.c_str());
         if (pModule == nullptr) {
+            PyErr_Print();
             handle_py_exception("[ctor] PyImport_ImportModule", gilState);
         }
 
@@ -732,7 +733,7 @@ namespace
         }
         return TRUE;
 }
-#elif defined(__linux__)
+#elif defined(__linux__) || defined(__APPLE__)
     __attribute__((destructor)) void onLibraryUnload()
     {
         finalizePythonInterpreter();

pythonfmu3/tests/test_variables.py

@@ -8,7 +8,7 @@ from xml.etree import ElementTree
 
 from pythonfmu3 import Fmi3Slave
 from pythonfmu3.enums import Fmi3Causality, Fmi3Initial, Fmi3Variability
-from pythonfmu3.variables import Boolean, Int32, UInt64, Float64, ModelVariable, String, Dimension
+from pythonfmu3.variables import flatten, Boolean, Int32, UInt64, Float64, ModelVariable, String, Dimension
 
 from .utils import PY2FMI, UInt64ValType
 
@@ -303,14 +303,33 @@ def test_String_to_xml(name, start):
 @pytest.mark.requirements("numpy")  
 @pytest.mark.parametrize("name,start,dims", [
     ("array1", [1.,2.,3.,4.], [4]),
-    ("array2", [1.,2.,3.,4.], [2, 2]),
+    ("array2", [1.,2.,3.,4.], [2, 2])
 ])
 def test_array_to_xml(name, start, dims):
     r = Float64(name, start, dimensions=[Dimension(start=val) for val in dims])
     xml = r.to_xml()
     if start is not None:
-        assert xml.attrib['start'] == " ".join([f"{val:.16g}" for val in start])
+        assert xml.attrib['start'] == " ".join([f"{val:.16g}" for val in flatten(start)])
     if dims is not None:
         xml_dims = xml.findall('.//Dimension')
         assert len(xml_dims) == len(dims)
         assert [xml_dim.attrib['start'] for xml_dim in xml_dims] == dims
+
+
+@pytest.mark.requirements("numpy")  
+@pytest.mark.parametrize("name,start,dims", [
+    ("array1", [1.,2.,3.,4.], [4]),
+    ("array2", [1.,2.,3.,4.], [2, 2])
+])
+def test_array_output_to_xml(name, start, dims):
+    import numpy as np
+    start = np.reshape(start, newshape=dims) 
+    r = Float64(name, start, dimensions=[Dimension(start=val) for val in dims], causality=Fmi3Causality.output)
+    xml = r.to_xml()
+    print(xml, start)
+    if start is not None:
+        assert xml.attrib['start'] == " ".join([f"{val:.16g}" for val in flatten(start)])
+    if dims is not None:
+        xml_dims = xml.findall('.//Dimension')
+        assert len(xml_dims) == len(dims)
+        assert [xml_dim.attrib['start'] for xml_dim in xml_dims] == dims

pythonfmu3/variables.py

@@ -4,11 +4,19 @@ from enum import Enum
 import importlib
 from typing import Any, Optional, List
 from xml.etree.ElementTree import Element, SubElement
+from collections.abc import Iterable
 from collections import ChainMap
 from functools import reduce  
 
 from .enums import Fmi3Causality, Fmi3Initial, Fmi3Variability
 
+def flatten(lst):
+    for item in lst:
+        if isinstance(item, Iterable) and not isinstance(item, (str, bytes)):
+            yield from flatten(item)
+        else:
+            yield item
+
 def check_numpy():
     try:
         importlib.import_module('numpy')
@@ -210,7 +218,7 @@ class Float64(ModelVariable):
                 # stored on an XML file with at least 16 significant digits
                 output = ""
                 if len(self.dimensions) > 0:
-                    output = " ".join([f"{val:.16g}" for val in value])
+                    output = " ".join([f"{val:.16g}" for val in flatten(value)])
                 else:
                     output = f"{value:.16g}"
                 attrib[key] = output

{pythonfmu3-0.1.18.dist-info → pythonfmu3-0.2.1.dist-info}/LICENSE

@@ -2,6 +2,7 @@ MIT License
 
 Copyright (c) 2019-2020 NTNU - Department of Ocean Operations and Civil Engineering
 Copyright (c) 2019-2020 Safran SA
+Copyright (c) 2023 Stephen Smith
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

{pythonfmu3-0.1.18.dist-info → pythonfmu3-0.2.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: pythonfmu3
-Version: 0.1.18
+Version: 0.2.1
 Summary: A lightweight framework that enables the packaging of Python3.x code as co-simulation FMUs.
 Home-page: https://github.com/stephensmith25/PythonFMU3
 Author: Stephen Smith

{pythonfmu3-0.1.18.dist-info → pythonfmu3-0.2.1.dist-info}/RECORD

@@ -1,6 +1,6 @@
 pythonfmu3/__init__.py,sha256=oN-2oXyCFwq0gvL2IEf5QvwIXBXZgsSBwAJw7LZ9vzc,424
 pythonfmu3/__main__.py,sha256=gC1T8x2d02hhqshyNQGSS70SyCk-3I3t8zPqoRo2Xd8,1543
-pythonfmu3/_version.py,sha256=6BiuMUkhwQp6bzUZSF8np8F1NwCltEtK0sPBF__tepU,23
+pythonfmu3/_version.py,sha256=HfjVOrpTnmZ-xVFCYSVmX50EXaBQeJteUHG-PD6iQs8,22
 pythonfmu3/builder.py,sha256=d_nTRWKohZrZsMbTmxiYJzszzVBp-CRisV_y_OVyW6U,9779
 pythonfmu3/default_experiment.py,sha256=FJ0l0FpU7pT4Pox2RiA2y-Cb_e7DE2XlbWKySRYQaVk,293
 pythonfmu3/deploy.py,sha256=eqFWVxZUkJCLvmq1-GuMNjn2j0VCGoaXPhRWrCk2Vxg,3741
@@ -10,12 +10,12 @@ pythonfmu3/logmsg.py,sha256=0wn11GLwq0LLWqyC2ktLRjQFWlpj07wWliZ8rUHx1gg,359
 pythonfmu3/osutil.py,sha256=1qN6qudN4zCupZwc15pzp52WObkqi6jGy9a-MehNt9Q,656
 pythonfmu3/unit.py,sha256=SjOaywb5lVQbAO_iLjc_7Ly3nYrmAvIW2_hAGt12UFU,1475
 pythonfmu3/variable_types.py,sha256=Q0D4wlGi3i3zE5UsmGJEpNh7SV_W8mn_8p_WIkwrLQA,2881
-pythonfmu3/variables.py,sha256=hwYT6AfaSQIa1egVJrOxnDi5NEj1bk_VkQd9-hsoDII,11905
+pythonfmu3/variables.py,sha256=6el55sAn8miVqPeUY-Q3GEw_pt6c46p7obg6G2UjyeA,12143
 pythonfmu3/pythonfmu-export/.clang-format,sha256=ApbsHWYwilCXJ1iBux4nqOjLkaqgbGLsVrc_U3hX7WI,944
 pythonfmu3/pythonfmu-export/CMakeLists.txt,sha256=p0-4Xh_sAaOI9AVb8lsUsMxJPc6bg9b_6CF6NJt5FHE,1847
 pythonfmu3/pythonfmu-export/build_unix.sh,sha256=I5RrF2O6y0hRG_SN4ExKN_CCFYaa2l-ngKzqmBXnHmA,73
 pythonfmu3/pythonfmu-export/build_win.sh,sha256=UzmAcWqFmwBu6mvYne2Dx3UK8iPwTtP4HpjICsjUaJA,97
-pythonfmu3/pythonfmu-export/src/CMakeLists.txt,sha256=RyjGhUUDhG_HEieCdt5WMfTR1snofOqigEKc83_zvfE,1104
+pythonfmu3/pythonfmu-export/src/CMakeLists.txt,sha256=fOVlV7hy9c0wx_Qp4K51tQaQ5xy9lL4qtyGl15ZXfGs,1208
 pythonfmu3/pythonfmu-export/src/cppfmu/cppfmu_common.hpp,sha256=cgrlZa5L-bbjZeVi0pmy4JKE5UJ2GszzuyOqTdRcBRQ,4353
 pythonfmu3/pythonfmu-export/src/cppfmu/cppfmu_cs.cpp,sha256=EsUIevwmCzX9hsui3i8x1crSnSOG8dEK15Zm1ZIavYQ,3843
 pythonfmu3/pythonfmu-export/src/cppfmu/cppfmu_cs.hpp,sha256=UmqAVAVE1KHNHMC8mIh8gIHRJ_aQk0Ma139TU6Kvv4o,6264
@@ -24,11 +24,11 @@ pythonfmu3/pythonfmu-export/src/fmi/fmi3FunctionTypes.h,sha256=Tk1WY0nAYBGiOAQ8z
 pythonfmu3/pythonfmu-export/src/fmi/fmi3Functions.h,sha256=NsHuclp20wcuUInYf-91UXZbljTeu2cPXENqNEORdgU,16262
 pythonfmu3/pythonfmu-export/src/fmi/fmi3PlatformTypes.h,sha256=ZCQLJgSbRGrMsBiQ4auaYCY4J3Hck6g3t1iZp5NEguw,4251
 pythonfmu3/pythonfmu-export/src/pythonfmu/IPyState.hpp,sha256=GLiOjhKLDVEICersnqVwezwEshbxfdh_cyMxBJGFbu8,456
-pythonfmu3/pythonfmu-export/src/pythonfmu/PySlaveInstance.cpp,sha256=MpEUUcxPwoJlM_mW-9qxj4ezgKQd-CkDc2ud0mM7HbQ,25362
+pythonfmu3/pythonfmu-export/src/pythonfmu/PySlaveInstance.cpp,sha256=WShZMdZExWWG86kFPh89mATYK4tVn38JdHV6c-fZ0_A,25411
 pythonfmu3/pythonfmu-export/src/pythonfmu/PySlaveInstance.hpp,sha256=T-epGp68SjhDv-JupxUe2ZgnV8unU4htc-PUBokjWm4,4239
 pythonfmu3/pythonfmu-export/src/pythonfmu/PyState.hpp,sha256=CjFEIrZu8b1jxQAIgfI_o36hyItW_SdQ5VSkImf7JNs,2977
-pythonfmu3/resources/binaries/x86_64-linux/libpythonfmu-export.so,sha256=LLTlb6TDjJ24xuy7zhO5Sbj39nVzQSODkkXMXGl8Y7s,365224
-pythonfmu3/resources/binaries/x86_64-windows/pythonfmu-export.dll,sha256=wi2jjGlTgRz5Gi8YNZsi4xoEzrxKO4UE7xVT0nBZViY,430592
+pythonfmu3/resources/binaries/x86_64-linux/libpythonfmu-export.so,sha256=H-9BRLDmS-TfSGi6lOYvMIYEI3_tTcsBBuMMUYWt-IA,365288
+pythonfmu3/resources/binaries/x86_64-windows/pythonfmu-export.dll,sha256=IFUevR81xjzf5silpT0Qbz4ybMCtktIOu9Z3jBGTpoE,431104
 pythonfmu3/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pythonfmu3/tests/conftest.py,sha256=B6XxTnBdeF_tEJ3w2DlfPKUfvlk-oULgIhQtXkgOJIc,171
 pythonfmu3/tests/test_builder.py,sha256=GrD4ziin3RLOe_36rBQCMnKrSkhc3IqnxE1a6kCFPok,6842
@@ -37,7 +37,7 @@ pythonfmu3/tests/test_fmi3slave.py,sha256=1uwTdfiFZNmU0yzIdC30kAuu95xsZSTMA9CGk_
 pythonfmu3/tests/test_integration.py,sha256=zA3iJ4rI2cKEE8mDsAmcVuwNWlJzhonV8Wxz92hzEac,10387
 pythonfmu3/tests/test_logger.py,sha256=OcHQhxUtNBPH-0zdmheC4I9OWz1yu48W8MYDshNVkf8,5765
 pythonfmu3/tests/test_multiple_fmus.py,sha256=-sthCm2YUZiRkdfvpLQNgquPBForUKQ7HGqfFBdrRas,3942
-pythonfmu3/tests/test_variables.py,sha256=t4r2TBruf58uYwjkp3r-RcZS5TrsOaVT_mDuoiUTQtg,9598
+pythonfmu3/tests/test_variables.py,sha256=avy1mzVOBmoVPrxLOLZy5stgKy415CPtTxrLdbSkyHU,10352
 pythonfmu3/tests/utils.py,sha256=WusWSUGoBPenZL-FAKQlzaHN2aYXiznZM2fwCjoldwY,301
 pythonfmu3/tests/data/csvdemo.csv,sha256=TiTUyzHyjQNXM4eXI33oJipc7w9_PJ8aMejRmwc52Xw,256
 pythonfmu3/tests/data/hello.txt,sha256=wFNeS-K3n_2TKRMFQ2v4iTFOSj-uwF7P_Lt98xrZ5Ro,12
@@ -46,9 +46,9 @@ pythonfmu3/tests/slaves/localmodule.py,sha256=-q5Lmh2I88MG7nLTscms0n5xhHLkUDed1I
 pythonfmu3/tests/slaves/pythonslave.py,sha256=uzrTQmfk0QBalxNTviGMZNph_YgVmcbxPqKgX5rSvXg,2172
 pythonfmu3/tests/slaves/pythonslave_read_file.py,sha256=t2sDaZSr2veD91gdqCO9W9CN-AN3TyXABXXfV9Rt0Xs,791
 pythonfmu3/tests/slaves/slavewithdep.py,sha256=hHDFB0dw8wkHiGzxeAVbz9O5LR6ghsFeONgRFdiK_t0,812
-pythonfmu3-0.1.18.dist-info/LICENSE,sha256=24Cw_MPouLK-G_t8Hgjm59IS9BnPoL6SKkyuZ0xesXY,1155
-pythonfmu3-0.1.18.dist-info/METADATA,sha256=FKgLxqU6YXlmXZaZSKkQVd7zxxMP-Dz86QJND8BehKA,7586
-pythonfmu3-0.1.18.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-pythonfmu3-0.1.18.dist-info/entry_points.txt,sha256=GgkWYs0DKGHLcijMEYZGkhkHOK2RVUpjGwvl1fwyDwQ,60
-pythonfmu3-0.1.18.dist-info/top_level.txt,sha256=6ne7bh_cME1hepxCx1BG8N5QVhVAufrp7LLok6vq7nE,11
-pythonfmu3-0.1.18.dist-info/RECORD,,
+pythonfmu3-0.2.1.dist-info/LICENSE,sha256=RL2018BU2DKcTi8Eb4ODF-XF3wnr7SDKvMP5S49x4rQ,1188
+pythonfmu3-0.2.1.dist-info/METADATA,sha256=zH3gg6qM81thMX4mmzFqVxCoAnRuDLtj1-wZwoFTuqA,7585
+pythonfmu3-0.2.1.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+pythonfmu3-0.2.1.dist-info/entry_points.txt,sha256=GgkWYs0DKGHLcijMEYZGkhkHOK2RVUpjGwvl1fwyDwQ,60
+pythonfmu3-0.2.1.dist-info/top_level.txt,sha256=6ne7bh_cME1hepxCx1BG8N5QVhVAufrp7LLok6vq7nE,11
+pythonfmu3-0.2.1.dist-info/RECORD,,