gpflow 2.9.2__tar.gz → 2.10.1__tar.gz

{gpflow-2.9.2/gpflow.egg-info → gpflow-2.10.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: gpflow
-Version: 2.9.2
+Version: 2.10.1
 Summary: Gaussian process methods in TensorFlow
 Home-page: https://www.gpflow.org
 Author: James Hensman, Alex Matthews
@@ -9,7 +9,6 @@ License: Apache License 2.0
 Project-URL: Source on GitHub, https://github.com/GPflow/GPflow
 Project-URL: Documentation, https://gpflow.github.io/GPflow/
 Keywords: machine-learning gaussian-processes kernels tensorflow
-Platform: UNKNOWN
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: GPU :: NVIDIA CUDA
 Classifier: Intended Audience :: Developers
@@ -217,4 +216,3 @@ which can be cited by users.
   url = {https://arxiv.org/abs/2003.01115}
 }
 ```
-

{gpflow-2.9.2 → gpflow-2.10.1}/RELEASE.md

@@ -33,7 +33,7 @@ This release contains contributions from:
 <INSERT>, <NAME>, <HERE>, <USING>, <GITHUB>, <HANDLE>
 
 
-# Release 2.10.0 (next release)
+# Release 2.11.0 (next release)
 
 <INSERT SMALL BLURB ABOUT RELEASE FOCUS AREA AND POTENTIAL TOOLCHAIN CHANGES>
 
@@ -66,6 +66,35 @@ This release contains contributions from:
 <INSERT>, <NAME>, <HERE>, <USING>, <GITHUB>, <HANDLE>
 
 
+# Release 2.10.1
+
+This release fixes GPflow to work with recent setuptools.
+
+## Bug Fixes and Other Changes
+
+* Migrate from pkg_resources, which is deprecated.
+
+## Thanks to our Contributors
+
+This release contains contributions from:
+
+uri-granta
+
+
+# Release 2.10.0
+
+This release adds a utility function for converting tf.Modules to float32.
+
+## Improvements
+
+* Add the `freeze_as_float32` utility function, which returns a frozen deepcopy of a module with all values converted to tf.float32.
+
+## Thanks to our Contributors
+
+This release contains contributions from:
+
+uri-granta
+
 # Release 2.9.2
 
 This patch release adds support for Tensorflow 2.16.

gpflow-2.10.1/VERSION

@@ -0,0 +1 @@
+2.10.1

{gpflow-2.9.2 → gpflow-2.10.1}/doc/sphinx/conf.py

@@ -24,7 +24,7 @@ copyright = "2023, The GPflow Contributors"
 author = "The GPflow Contributors"
 
 # The full version, including alpha/beta/rc tags
-release = "2.9.2"
+release = "2.10.1"
 
 # -- General configuration ---------------------------------------------------
 

{gpflow-2.9.2 → gpflow-2.10.1}/gpflow/keras.py

@@ -23,8 +23,11 @@
 # >> from tf_keras.optimizers import Adam
 
 try:
+    # check whether a (recent) tf_keras is present
     import tf_keras
-except ModuleNotFoundError:
+
+    tf_keras.optimizers
+except (ModuleNotFoundError, AttributeError):  # pragma: no cover
     import tensorflow.keras as tf_keras
 
 tf_keras = tf_keras

{gpflow-2.9.2 → gpflow-2.10.1}/gpflow/optimizers/mcmc.py

@@ -73,9 +73,7 @@ class SamplingHelper:
         return self._variables
 
     @property
-    def target_log_prob_fn(
-        self,
-    ) -> Callable[..., Tuple[tf.Tensor, Callable[..., Tuple[tf.Tensor, Sequence[None]]]]]:
+    def target_log_prob_fn(self) -> Callable[..., tf.Tensor]:
         """
         The target log probability, adjusted to allow for optimisation to occur on the tracked
         unconstrained underlying variables.

{gpflow-2.9.2 → gpflow-2.10.1}/gpflow/posteriors.py

@@ -967,10 +967,13 @@ class FullyCorrelatedPosterior(BasePosterior):
             cov = tf.linalg.adjoint(cov)
 
         mean = tf.reshape(mean, (N, K))
-        if full_cov == full_output_cov:
-            cov_shape = (N, K, N, K) if full_cov else (N, K)
-        else:
-            cov_shape = (K, N, N) if full_cov else (N, K, K)
+        # the nested if-then-else is to make both mypy and the tensorflow
+        # compiler happy across multiple different versions!
+        cov_shape: Tuple[int, ...] = (
+            ((N, K, N, K) if full_cov else (N, K))
+            if full_cov == full_output_cov
+            else ((K, N, N) if full_cov else (N, K, K))
+        )
         cov = tf.reshape(cov, cov_shape)
 
         return mean, cov

{gpflow-2.9.2 → gpflow-2.10.1}/gpflow/utilities/__init__.py

@@ -5,6 +5,7 @@ from .multipledispatch import Dispatcher
 from .traversal import (
     deepcopy,
     freeze,
+    freeze_as_float32,
     leaf_components,
     multiple_assign,
     parameter_dict,
@@ -24,6 +25,7 @@ __all__ = [
     "bijectors",
     "deepcopy",
     "freeze",
+    "freeze_as_float32",
     "is_variable",
     "leaf_components",
     "misc",

{gpflow-2.9.2 → gpflow-2.10.1}/gpflow/utilities/traversal.py

@@ -30,6 +30,7 @@ from ..config import default_summary_fmt
 __all__ = [
     "deepcopy",
     "freeze",
+    "freeze_as_float32",
     "leaf_components",
     "multiple_assign",
     "parameter_dict",
@@ -98,10 +99,10 @@ def print_summary(module: tf.Module, fmt: Optional[str] = None) -> None:
     """
     fmt = fmt if fmt is not None else default_summary_fmt()
     if fmt == "notebook":
-        from IPython.core.display import HTML, display
+        from IPython.core.display import HTML, display_html
 
         tab = tabulate_module_summary(module, "html")
-        display(HTML(tab))
+        display_html(HTML(tab))
     else:
         print(tabulate_module_summary(module, fmt))
 
@@ -277,6 +278,21 @@ def freeze(input_module: M) -> M:
     return module_copy
 
 
+def freeze_as_float32(input_module: M) -> M:
+    """
+    Returns a frozen deepcopy of the input tf.Module with all values converted to tf.float32.
+
+    :param input_module: tf.Module or gpflow.Module.
+    :return: Returns a float32 frozen deepcopy of an input object.
+    """
+    objects_to_freeze = _get_leaf_components(input_module)
+    memo_tensors = {
+        id(v): tf.cast(tf.convert_to_tensor(v), dtype=tf.float32)
+        for v in objects_to_freeze.values()
+    }
+    return deepcopy(input_module, memo_tensors)
+
+
 def traverse_module(
     m: TraverseInput,
     acc: Accumulator[State],

gpflow-2.10.1/gpflow/versions.py

@@ -0,0 +1,11 @@
+import sys
+
+if sys.version_info >= (3, 8):
+    from importlib.metadata import PackageNotFoundError, version
+else:
+    from importlib_metadata import PackageNotFoundError, version
+
+try:
+    __version__ = version("gpflow")
+except PackageNotFoundError:
+    __version__ = "develop"

{gpflow-2.9.2 → gpflow-2.10.1/gpflow.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: gpflow
-Version: 2.9.2
+Version: 2.10.1
 Summary: Gaussian process methods in TensorFlow
 Home-page: https://www.gpflow.org
 Author: James Hensman, Alex Matthews
@@ -9,7 +9,6 @@ License: Apache License 2.0
 Project-URL: Source on GitHub, https://github.com/GPflow/GPflow
 Project-URL: Documentation, https://gpflow.github.io/GPflow/
 Keywords: machine-learning gaussian-processes kernels tensorflow
-Platform: UNKNOWN
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: GPU :: NVIDIA CUDA
 Classifier: Intended Audience :: Developers
@@ -217,4 +216,3 @@ which can be cited by users.
   url = {https://arxiv.org/abs/2003.01115}
 }
 ```
-

{gpflow-2.9.2 → gpflow-2.10.1}/gpflow.egg-info/requires.txt

@@ -1,7 +1,7 @@
 check_shapes>=1.0.0
 deprecated
 multipledispatch>=0.6
-numpy
+numpy<2
 packaging
 scipy
 setuptools>=41.0.0
@@ -15,5 +15,8 @@ tensorflow>=2.4.0
 [:platform_system == "Darwin" and platform_machine == "arm64"]
 tensorflow-macos>=2.4.0
 
+[:python_version < "3.8"]
+importlib_metadata
+
 [ImageToTensorBoard]
 matplotlib

{gpflow-2.9.2 → gpflow-2.10.1}/setup.py

@@ -3,15 +3,18 @@
 
 # pylint: skip-file
 
+from typing import Any
+
 from setuptools import find_packages, setup
 
 ##### Dependencies of GPflow
 
 requirements = [
+    "importlib_metadata; python_version<'3.8'",
     "check_shapes>=1.0.0",
     "deprecated",
     "multipledispatch>=0.6",
-    "numpy",
+    "numpy<2",
     "packaging",
     "scipy",
     "setuptools>=41.0.0",  # to satisfy dependency constraints
@@ -35,6 +38,14 @@ readme_text = read_file("README.md")
 
 packages = find_packages(".", exclude=["tests"])
 
+# Mypy + types-setuptools on Python 3.10+ reject plain dicts for these kwargs.
+_project_urls: Any = {
+    "Source on GitHub": "https://github.com/GPflow/GPflow",
+    "Documentation": "https://gpflow.github.io/GPflow/",
+}
+_package_data: Any = {"": ["*.lark"]}
+_extras_require: Any = {"ImageToTensorBoard": ["matplotlib"]}
+
 setup(
     name="gpflow",
     version=version,
@@ -46,15 +57,12 @@ setup(
     license="Apache License 2.0",
     keywords="machine-learning gaussian-processes kernels tensorflow",
     url="https://www.gpflow.org",
-    project_urls={
-        "Source on GitHub": "https://github.com/GPflow/GPflow",
-        "Documentation": "https://gpflow.github.io/GPflow/",
-    },
+    project_urls=_project_urls,
     packages=packages,
-    package_data={"": ["*.lark"]},
+    package_data=_package_data,
     include_package_data=True,
     install_requires=requirements,
-    extras_require={"ImageToTensorBoard": ["matplotlib"]},
+    extras_require=_extras_require,
     python_requires=">=3.7",
     classifiers=[
         "Development Status :: 5 - Production/Stable",

{gpflow-2.9.2 → gpflow-2.10.1}/tests/gpflow/kernels/test_broadcasting.py

@@ -134,7 +134,7 @@ def test_broadcasting(
     rank2 = len(batch2_shape) - 1
 
     if isinstance(kernel, kernels.MultioutputKernel):
-        mo_kernel = cast(kernels.MultioutputKernel, kernel)
+        mo_kernel = cast(kernels.MultioutputKernel, kernel)  # type: ignore[redundant-cast]
 
         loop = cs(
             unroll_batches(

{gpflow-2.9.2 → gpflow-2.10.1}/tests/gpflow/test_initial_value.py

@@ -74,7 +74,7 @@ def test_assignment_value(path: Path) -> None:
             these problems.
             """
 
-            self.bad_assigns: List[ast.AST] = []
+            self.bad_assigns: List[Union[ast.Assign, ast.AugAssign, ast.AnnAssign]] = []
             """
             List of bad assignments, so that we can report multiple errors at the same time.
             """

{gpflow-2.9.2 → gpflow-2.10.1}/tests/gpflow/utilities/test_deepcopy.py

@@ -14,7 +14,7 @@ from gpflow.base import TensorType
 
 class A(tf.Module):
     def __init__(self) -> None:
-        self.var = tf.Variable([1.0])
+        self.var = tf.Variable([1.0], dtype=tf.float64)
         shift = tf.Variable(1e-6)
         self.bijector = tfp.bijectors.Chain([tfp.bijectors.Softplus(), tfp.bijectors.Shift(shift)])
 
@@ -87,6 +87,21 @@ def test_freeze() -> None:
     assert module_frozen.variables == ()
     assert isinstance(module.module.module.var, tf.Variable)
     assert isinstance(module_frozen.module.module.var, tf.Tensor)
+    assert module.module.module.var.dtype is tf.float64
+    assert module_frozen.module.module.var.dtype is tf.float64
+    assert module.module.module.var == module_frozen.module.module.var
+
+
+def test_freeze_as_float32() -> None:
+    module = NestedModule(NestedModule(A()))
+    module_frozen = gpflow.utilities.freeze_as_float32(module)
+    assert len(module.variables) == 2
+    assert module_frozen.variables == ()
+    assert isinstance(module.module.module.var, tf.Variable)
+    assert isinstance(module_frozen.module.module.var, tf.Tensor)
+    assert module.module.module.var.dtype is tf.float64
+    assert module_frozen.module.module.var.dtype is tf.float32
+    assert tf.cast(module.module.module.var, tf.float32) == module_frozen.module.module.var
 
 
 def test_pickle_frozen() -> None:

gpflow-2.9.2/VERSION

@@ -1 +0,0 @@
-2.9.2

gpflow-2.9.2/gpflow/versions.py

@@ -1,6 +0,0 @@
-import pkg_resources
-
-try:
-    __version__ = str(pkg_resources.get_distribution("gpflow").parsed_version)
-except pkg_resources.DistributionNotFound:
-    __version__ = "develop"