surrogates_interface 4.2.0__tar.gz → 4.3.1__tar.gz

{surrogates_interface-4.2.0 → surrogates_interface-4.3.1}/PKG-INFO

@@ -1,8 +1,7 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: surrogates_interface
-Version: 4.2.0
+Version: 4.3.1
 Summary: Interface for surrogate models.
-Home-page: https://gitlab.windenergy.dtu.dk/surrogate-models/surrogate-models-interface
 License: MIT
 Author: DTU Wind and Energy Systems
 Maintainer: Riccardo Riva
@@ -16,35 +15,38 @@ Classifier: Programming Language :: Python :: 3.12
 Provides-Extra: code-style
 Provides-Extra: docs
 Provides-Extra: om
+Provides-Extra: sklearn
 Provides-Extra: smt
+Provides-Extra: spyder
 Provides-Extra: test
 Provides-Extra: tf
 Provides-Extra: torch
-Requires-Dist: black (>=24.0.0,<25.0.0) ; extra == "code-style"
-Requires-Dist: codespell (>=2.0.0,<3.0.0) ; extra == "code-style"
+Requires-Dist: PyQt6 (>=6.8.1,<7.0.0) ; extra == "spyder"
+Requires-Dist: black (>=25.1.0,<26.0.0) ; extra == "code-style"
+Requires-Dist: codespell (>=2.4.0,<3.0.0) ; extra == "code-style"
 Requires-Dist: flake8 (>=7.0.0,<8.0.0) ; extra == "code-style"
 Requires-Dist: h5py (>=3.10.0,<4.0.0)
-Requires-Dist: isort (>=5.0.0,<6.0.0) ; extra == "code-style"
-Requires-Dist: keras (>=3.0.0,<4.0.0) ; extra == "tf" or extra == "torch"
-Requires-Dist: matplotlib (>=3.8.0,<4.0.0) ; extra == "test" or extra == "smt"
-Requires-Dist: numpy (>=1.10.0)
+Requires-Dist: isort (>=6.0.0,<7.0.0) ; extra == "code-style"
+Requires-Dist: keras (>=3.0.0,<4.0.0) ; extra == "torch"
+Requires-Dist: matplotlib (>=3.0.0,<4.0.0) ; extra == "smt"
+Requires-Dist: numpy (>=1.10.0,<3.0.0)
 Requires-Dist: numpydoc (>=1.8.0,<2.0.0) ; extra == "docs"
-Requires-Dist: openmdao (>=3.25,<4.0) ; extra == "docs" or extra == "test" or extra == "om"
-Requires-Dist: pydata-sphinx-theme ; extra == "docs"
-Requires-Dist: pytest (>=8.0.0,<9.0.0) ; extra == "test"
+Requires-Dist: openmdao (>=3.0.0,<4.0.0) ; extra == "om"
+Requires-Dist: pydata-sphinx-theme (>=0.16.1,<1.0.0) ; extra == "docs"
+Requires-Dist: pytest (>=8.3.0,<9.0.0) ; extra == "test"
 Requires-Dist: pytest-cov (>=6.0.0,<7.0.0) ; extra == "test"
-Requires-Dist: scikit-learn (>=1.4.0,<2.0.0) ; extra == "test" or extra == "smt" or extra == "tf" or extra == "torch"
-Requires-Dist: smt (>=2.0.1,<3.0.0) ; extra == "test" or extra == "smt"
+Requires-Dist: scikit-learn (>=1.4.0,<2.0.0) ; extra == "sklearn"
+Requires-Dist: smt (>=2.0.0,<3.0.0) ; extra == "smt"
 Requires-Dist: sphinx (>=8.0.0,<9.0.0) ; extra == "docs"
-Requires-Dist: sphinx-copybutton ; extra == "docs"
-Requires-Dist: sphinx-sitemap (>=2.0.0,<3.0.0) ; extra == "docs"
-Requires-Dist: sphinx_design ; extra == "docs"
-Requires-Dist: tensorflow (>=2.10.0,<3.0.0) ; extra == "test" or extra == "tf"
-Requires-Dist: tensorflow-intel (>=2.10.0,<3.0.0) ; (sys_platform == "win32") and (extra == "test" or extra == "tf")
-Requires-Dist: tensorflow-io-gcs-filesystem (<0.32.0) ; (python_version >= "3.10" and python_version < "3.12" and platform_system == "Windows") and (extra == "test" or extra == "tf")
-Requires-Dist: tensorflow-io-gcs-filesystem (>=0.23.1) ; (platform_machine != "arm64" and python_version >= "3.10" and python_version < "3.12" or platform_system != "Darwin" and python_version >= "3.10" and python_version < "3.12") and (extra == "test" or extra == "tf")
-Requires-Dist: tomli (>=2.0.1,<3.0.0) ; (python_version < "3.11") and (extra == "test")
-Requires-Dist: torch (>=2.0.0,<3.0.0) ; extra == "test" or extra == "torch"
+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-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"
+Project-URL: Documentation, https://surrogate-models.pages.windenergy.dtu.dk/surrogate-models-interface
 Project-URL: Repository, https://gitlab.windenergy.dtu.dk/surrogate-models/surrogate-models-interface
 Description-Content-Type: text/markdown
 

surrogates_interface-4.3.1/pyproject.toml

@@ -0,0 +1,87 @@
+[project]
+name = "surrogates_interface"
+version = "4.3.1"
+description = "Interface for surrogate models."
+authors = [
+    {name = "DTU Wind and Energy Systems"}
+]
+maintainers = [
+  {name = "Riccardo Riva", email = "ricriv@dtu.dk"},
+  {name = "Mads Mølgaard Pedersen", email = "mmpe@dtu.dk"}
+]
+license = { text = "MIT" }
+readme = "README.md"
+requires-python = ">=3.10,<3.13"
+
+dependencies = [
+    "tomli >=2.0.0, <3.0.0; python_version<'3.11'",
+	"numpy >=1.10.0, <3.0.0",
+	"h5py >=3.10.0, <4.0.0",
+]
+
+[project.optional-dependencies]
+
+code_style = [
+    "black >=25.1.0, <26.0.0",
+    "isort >=6.0.0, <7.0.0",
+    "flake8 >=7.0.0, <8.0.0",
+	"codespell >=2.4.0, <3.0.0",
+]
+
+docs = [
+    "sphinx >=8.0.0, <9.0.0",
+    "pydata-sphinx-theme >=0.16.1, <1.0.0",
+    "numpydoc >=1.8.0, <2.0.0",
+	"sphinx-copybutton >=0.5.2, <1.0.0",
+	"sphinx-sitemap >=2.6.0, <3.0.0",
+	"sphinx_design >=0.6.1, <1.0.0",
+]
+
+om = ["openmdao >=3.0.0, <4.0.0"]
+
+smt = [
+	"smt >=2.0.0, <3.0.0",
+	"matplotlib >=3.0.0, <4.0.0",  # Needed by SMT.
+]
+
+sklearn = ["scikit-learn >=1.4.0, <2.0.0"]
+
+spyder = [
+    "spyder-kernels >=3.0.0, <3.1.0",
+    "PyQt6 >=6.8.1, <7.0.0",
+]
+
+tf = [
+    "tensorflow >=2.10.0, <2.20.0",
+	"tensorflow-io-gcs-filesystem == 0.31.0 ; python_version<'3.12'",
+]
+
+test = [
+    "pytest >=8.3.0, <9.0.0",
+    "pytest-cov >=6.0.0, <7.0.0",
+    # "pytest-xdist >=3.6.1, <4.0.0",
+]
+
+torch = ["torch >=2.0.0,<3.0.0",
+         "keras >=3.0.0,<4.0.0",
+		 ]
+
+[project.urls]
+repository = "https://gitlab.windenergy.dtu.dk/surrogate-models/surrogate-models-interface"
+documentation = "https://surrogate-models.pages.windenergy.dtu.dk/surrogate-models-interface"
+
+[build-system]
+requires = ["poetry-core>=2.0.0,<3.0.0"]
+build-backend = "poetry.core.masonry.api"
+
+[tool.coverage.run]
+omit = ["surrogates_interface/test/*", ]
+
+[tool.coverage.report]
+fail_under = 100
+
+[tool.isort]
+profile = "black"
+
+[tool.codespell]
+ignore-words-list = "coo"

{surrogates_interface-4.2.0 → surrogates_interface-4.3.1}/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):

surrogates_interface-4.2.0/pyproject.toml

@@ -1,115 +0,0 @@
-[tool.poetry]
-name = "surrogates_interface"
-version = "4.2.0"
-description = "Interface for surrogate models."
-authors = ["DTU Wind and Energy Systems"]
-maintainers = [
-    "Riccardo Riva <ricriv@dtu.dk>",
-	"Mads Mølgaard Pedersen <mmpe@dtu.dk>",
-]
-license = "MIT"
-readme = "README.md"
-repository = "https://gitlab.windenergy.dtu.dk/surrogate-models/surrogate-models-interface"
-
-[tool.poetry.build]
-generate-setup-file = false
-
-[tool.poetry.dependencies]
-
-python = ">=3.10,<3.13"
-numpy = {version=">=1.10.0"}
-h5py = {version="^3.10.0"}
-black = {version="^24.0.0", optional=true}
-flake8 = {version="^7.0.0", optional=true}
-isort = {version="^5.0.0", optional=true}
-codespell = {version="^2.0.0", optional=true}
-pytest = {version="^8.0.0", optional=true}
-pytest-cov = {version="^6.0.0", optional=true}
-tomli = {version="^2.0.1", python="<3.11", optional=true}
-sphinx = {version="^8.0.0", optional=true}
-pydata-sphinx-theme = {version="*", optional=true}
-sphinx-copybutton = {version="*", optional=true}
-sphinx-sitemap = {version="^2.0.0", optional=true}
-sphinx_design = {version="*", optional=true}
-numpydoc = {version="^1.8.0", optional=true}
-matplotlib = {version="^3.8.0", optional=true}
-scikit-learn = {version="^1.4.0", optional=true}
-# The following configuration for TensorFlow seems to work on Windows and linux, as tested at
-# https://gitlab.windenergy.dtu.dk/surrogate-models/test-poetry-and-tensorflow
-tensorflow = {version = "^2.10.0", optional=true }
-tensorflow-io-gcs-filesystem = [
-    {version = ">= 0.23.1", markers = "platform_machine!='arm64' or platform_system!='Darwin'", python=">=3.10,<3.12", optional=true},
-    {version = "< 0.32.0", markers = "platform_system == 'Windows'", python=">=3.10,<3.12", optional=true}
-]
-tensorflow-intel = {version="^2.10.0", platform = "win32", optional=true}
-keras = {version="^3.0.0", optional=true}
-smt = {version="^2.0.1", optional=true}
-openmdao = {version="^3.25", optional=true}
-torch = { version = "^2.0.0", optional=true }
-
-[tool.poetry.extras]
-
-docs = ["sphinx",
-	    "pydata-sphinx-theme",
-		"sphinx-copybutton",
-	    "sphinx-sitemap",
-		"sphinx_design",
-	    "numpydoc",
-		"openmdao",
-	    ]
-
-code_style = ["black",
-              "flake8",
-	          "isort",
-	          "codespell",
-			  ]
-
-test = ["matplotlib",  # Needed by SMT.
-	    "pytest",
-	    "pytest-cov",
-	    "tomli",
-	    "scikit-learn",
-	    "smt",
-	    "tensorflow",
-	    "tensorflow-io-gcs-filesystem",
-	    "tensorflow-intel",
-	    "openmdao",
-		"torch",
-	    ]
-
-smt = ["matplotlib",  # Needed by SMT.
-       "scikit-learn",
-       "smt",
-	   ]
-
-tf = ["scikit-learn",
-	  "tensorflow",
-	  "tensorflow-io-gcs-filesystem",
-	  "tensorflow-intel",
-	  "keras",
-	  ]
-
-om = ["openmdao"]
-
-torch = ["torch",
-         "scikit-learn",
-         "keras",
-		 ]
-
-
-
-[build-system]
-build-backend = "poetry.core.masonry.api"
-requires = ["poetry-core", "numpy"]
-
-[tool.coverage.run]
-omit = ["surrogates_interface/test/*", ]
-
-[tool.coverage.report]
-fail_under = 100
-
-[tool.isort]
-profile = "black"
-
-[tool.codespell]
-ignore-words-list = "coo"