surrogates_interface 4.3.0__tar.gz → 4.3.2__tar.gz

{surrogates_interface-4.3.0 → surrogates_interface-4.3.2}/PKG-INFO

@@ -1,17 +1,18 @@
 Metadata-Version: 2.3
 Name: surrogates_interface
-Version: 4.3.0
+Version: 4.3.2
 Summary: Interface for surrogate models.
 License: MIT
 Author: DTU Wind and Energy Systems
 Maintainer: Riccardo Riva
 Maintainer-email: ricriv@dtu.dk
-Requires-Python: >=3.10,<3.13
+Requires-Python: >=3.10,<3.14
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Provides-Extra: code-style
 Provides-Extra: docs
 Provides-Extra: om
@@ -42,7 +43,7 @@ Requires-Dist: sphinx-copybutton (>=0.5.2,<1.0.0) ; extra == "docs"
 Requires-Dist: sphinx-sitemap (>=2.6.0,<3.0.0) ; extra == "docs"
 Requires-Dist: sphinx_design (>=0.6.1,<1.0.0) ; extra == "docs"
 Requires-Dist: spyder-kernels (>=3.0.0,<3.1.0) ; extra == "spyder"
-Requires-Dist: tensorflow (>=2.10.0,<2.20.0) ; extra == "tf"
+Requires-Dist: tensorflow (>=2.10.0,<3.0.0) ; extra == "tf"
 Requires-Dist: tensorflow-io-gcs-filesystem (==0.31.0) ; (python_version < "3.12") and (extra == "tf")
 Requires-Dist: tomli (>=2.0.0,<3.0.0) ; python_version < "3.11"
 Requires-Dist: torch (>=2.0.0,<3.0.0) ; extra == "torch"

{surrogates_interface-4.3.0 → surrogates_interface-4.3.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "surrogates_interface"
-version = "4.3.0"
+version = "4.3.2"
 description = "Interface for surrogate models."
 authors = [
     {name = "DTU Wind and Energy Systems"}
@@ -11,7 +11,7 @@ maintainers = [
 ]
 license = { text = "MIT" }
 readme = "README.md"
-requires-python = ">=3.10,<3.13"
+requires-python = ">=3.10,<3.14"
 
 dependencies = [
     "tomli >=2.0.0, <3.0.0; python_version<'3.11'",
@@ -52,7 +52,7 @@ spyder = [
 ]
 
 tf = [
-    "tensorflow >=2.10.0, <2.20.0",
+    "tensorflow >=2.10.0, <3.0.0",
 	"tensorflow-io-gcs-filesystem == 0.31.0 ; python_version<'3.12'",
 ]
 
@@ -62,8 +62,8 @@ test = [
     # "pytest-xdist >=3.6.1, <4.0.0",
 ]
 
-torch = ["torch >=2.0.0,<3.0.0",
-         "keras >=3.0.0,<4.0.0",
+torch = ["torch >=2.0.0, <3.0.0",
+         "keras >=3.0.0, <4.0.0",
 		 ]
 
 [project.urls]

{surrogates_interface-4.3.0 → surrogates_interface-4.3.2}/surrogates_interface/surrogates.py

@@ -427,13 +427,12 @@ class SurrogateModel:
         Predict the complete model output and Jacobian, including all input and output transformations.
 
         Let's recall that the predicted output is given by
-        
+
         .. math::
             \hat{y} =  g_1^{-1}(g_2^{-1}(g_m^{-1}(s(f_n(f_2(f_1(x)))))))
-        
         By indicating with :math:`J_h(z)` the Jacobian of :math:`h` evaluated at :math:`z`, we obtain
         the Jacobian of the predicted output by applying the chain rule
-        
+
         .. math::
             J = &J_{g_1^{-1}}(g_2^{-1}(g_m^{-1}(s(f_n(f_2(f_1(x)))))))   \\
                 &J_{g_2^{-1}}(g_m^{-1}(s(f_n(f_2(f_1(x))))))   \\
@@ -803,7 +802,7 @@ class TensorFlowModel(SurrogateModel):
             Output data.
         """
         # TODO: Add support also for other arguments of predict, like use_multiprocessing.
-        y = self.model.predict(x, batch_size=x.shape[0], verbose=0)
+        y = self.model(x, training=False).numpy()
         return y
 
     def _predict_model_output_and_jacobian_rev(self, x):