tf-keras-nightly 2.19.0.dev2024121210__py3-none-any.whl → 2.21.0.dev2025123010__py3-none-any.whl

tf_keras/__init__.py

@@ -27,4 +27,4 @@ from tf_keras.src.engine.sequential import Sequential
 from tf_keras.src.engine.training import Model
 
 
-__version__ = "2.19.0.dev2024121210"
+__version__ = "2.21.0.dev2025123010"

tf_keras/protobuf/projector_config_pb2.py

@@ -1,11 +1,22 @@
 # -*- coding: utf-8 -*-
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
+# NO CHECKED-IN PROTOBUF GENCODE
 # source: tf_keras/protobuf/projector_config.proto
+# Protobuf Python Version: 6.31.1
 """Generated protocol buffer code."""
-from google.protobuf.internal import builder as _builder
 from google.protobuf import descriptor as _descriptor
 from google.protobuf import descriptor_pool as _descriptor_pool
+from google.protobuf import runtime_version as _runtime_version
 from google.protobuf import symbol_database as _symbol_database
+from google.protobuf.internal import builder as _builder
+_runtime_version.ValidateProtobufRuntimeVersion(
+    _runtime_version.Domain.PUBLIC,
+    6,
+    31,
+    1,
+    '',
+    'tf_keras/protobuf/projector_config.proto'
+)
 # @@protoc_insertion_point(imports)
 
 _sym_db = _symbol_database.Default()
@@ -15,15 +26,15 @@ _sym_db = _symbol_database.Default()
 
 DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n(tf_keras/protobuf/projector_config.proto\x12 third_party.py.tf_keras.protobuf\">\n\x0eSpriteMetadata\x12\x12\n\nimage_path\x18\x01 \x01(\t\x12\x18\n\x10single_image_dim\x18\x02 \x03(\r\"\xc0\x01\n\rEmbeddingInfo\x12\x13\n\x0btensor_name\x18\x01 \x01(\t\x12\x15\n\rmetadata_path\x18\x02 \x01(\t\x12\x16\n\x0e\x62ookmarks_path\x18\x03 \x01(\t\x12\x14\n\x0ctensor_shape\x18\x04 \x03(\r\x12@\n\x06sprite\x18\x05 \x01(\x0b\x32\x30.third_party.py.tf_keras.protobuf.SpriteMetadata\x12\x13\n\x0btensor_path\x18\x06 \x01(\t\"\x93\x01\n\x0fProjectorConfig\x12\x1d\n\x15model_checkpoint_path\x18\x01 \x01(\t\x12\x43\n\nembeddings\x18\x02 \x03(\x0b\x32/.third_party.py.tf_keras.protobuf.EmbeddingInfo\x12\x1c\n\x14model_checkpoint_dir\x18\x03 \x01(\tb\x06proto3')
 
-_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals())
-_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'tf_keras.protobuf.projector_config_pb2', globals())
-if _descriptor._USE_C_DESCRIPTORS == False:
-
-  DESCRIPTOR._options = None
-  _SPRITEMETADATA._serialized_start=78
-  _SPRITEMETADATA._serialized_end=140
-  _EMBEDDINGINFO._serialized_start=143
-  _EMBEDDINGINFO._serialized_end=335
-  _PROJECTORCONFIG._serialized_start=338
-  _PROJECTORCONFIG._serialized_end=485
+_globals = globals()
+_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
+_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'tf_keras.protobuf.projector_config_pb2', _globals)
+if not _descriptor._USE_C_DESCRIPTORS:
+  DESCRIPTOR._loaded_options = None
+  _globals['_SPRITEMETADATA']._serialized_start=78
+  _globals['_SPRITEMETADATA']._serialized_end=140
+  _globals['_EMBEDDINGINFO']._serialized_start=143
+  _globals['_EMBEDDINGINFO']._serialized_end=335
+  _globals['_PROJECTORCONFIG']._serialized_start=338
+  _globals['_PROJECTORCONFIG']._serialized_end=485
 # @@protoc_insertion_point(module_scope)

tf_keras/protobuf/saved_metadata_pb2.py

@@ -1,11 +1,22 @@
 # -*- coding: utf-8 -*-
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
+# NO CHECKED-IN PROTOBUF GENCODE
 # source: tf_keras/protobuf/saved_metadata.proto
+# Protobuf Python Version: 6.31.1
 """Generated protocol buffer code."""
-from google.protobuf.internal import builder as _builder
 from google.protobuf import descriptor as _descriptor
 from google.protobuf import descriptor_pool as _descriptor_pool
+from google.protobuf import runtime_version as _runtime_version
 from google.protobuf import symbol_database as _symbol_database
+from google.protobuf.internal import builder as _builder
+_runtime_version.ValidateProtobufRuntimeVersion(
+    _runtime_version.Domain.PUBLIC,
+    6,
+    31,
+    1,
+    '',
+    'tf_keras/protobuf/saved_metadata.proto'
+)
 # @@protoc_insertion_point(imports)
 
 _sym_db = _symbol_database.Default()
@@ -16,13 +27,13 @@ from tf_keras.protobuf import versions_pb2 as tf__keras_dot_protobuf_dot_version
 
 DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n&tf_keras/protobuf/saved_metadata.proto\x12 third_party.py.tf_keras.protobuf\x1a tf_keras/protobuf/versions.proto\"M\n\rSavedMetadata\x12<\n\x05nodes\x18\x01 \x03(\x0b\x32-.third_party.py.tf_keras.protobuf.SavedObject\"\x9c\x01\n\x0bSavedObject\x12\x0f\n\x07node_id\x18\x02 \x01(\x05\x12\x11\n\tnode_path\x18\x03 \x01(\t\x12\x12\n\nidentifier\x18\x04 \x01(\t\x12\x10\n\x08metadata\x18\x05 \x01(\t\x12=\n\x07version\x18\x06 \x01(\x0b\x32,.third_party.py.tf_keras.protobuf.VersionDefJ\x04\x08\x01\x10\x02\x62\x06proto3')
 
-_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals())
-_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'tf_keras.protobuf.saved_metadata_pb2', globals())
-if _descriptor._USE_C_DESCRIPTORS == False:
-
-  DESCRIPTOR._options = None
-  _SAVEDMETADATA._serialized_start=110
-  _SAVEDMETADATA._serialized_end=187
-  _SAVEDOBJECT._serialized_start=190
-  _SAVEDOBJECT._serialized_end=346
+_globals = globals()
+_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
+_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'tf_keras.protobuf.saved_metadata_pb2', _globals)
+if not _descriptor._USE_C_DESCRIPTORS:
+  DESCRIPTOR._loaded_options = None
+  _globals['_SAVEDMETADATA']._serialized_start=110
+  _globals['_SAVEDMETADATA']._serialized_end=187
+  _globals['_SAVEDOBJECT']._serialized_start=190
+  _globals['_SAVEDOBJECT']._serialized_end=346
 # @@protoc_insertion_point(module_scope)

tf_keras/protobuf/versions_pb2.py

@@ -1,11 +1,22 @@
 # -*- coding: utf-8 -*-
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
+# NO CHECKED-IN PROTOBUF GENCODE
 # source: tf_keras/protobuf/versions.proto
+# Protobuf Python Version: 6.31.1
 """Generated protocol buffer code."""
-from google.protobuf.internal import builder as _builder
 from google.protobuf import descriptor as _descriptor
 from google.protobuf import descriptor_pool as _descriptor_pool
+from google.protobuf import runtime_version as _runtime_version
 from google.protobuf import symbol_database as _symbol_database
+from google.protobuf.internal import builder as _builder
+_runtime_version.ValidateProtobufRuntimeVersion(
+    _runtime_version.Domain.PUBLIC,
+    6,
+    31,
+    1,
+    '',
+    'tf_keras/protobuf/versions.proto'
+)
 # @@protoc_insertion_point(imports)
 
 _sym_db = _symbol_database.Default()
@@ -15,11 +26,11 @@ _sym_db = _symbol_database.Default()
 
 DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n tf_keras/protobuf/versions.proto\x12 third_party.py.tf_keras.protobuf\"K\n\nVersionDef\x12\x10\n\x08producer\x18\x01 \x01(\x05\x12\x14\n\x0cmin_consumer\x18\x02 \x01(\x05\x12\x15\n\rbad_consumers\x18\x03 \x03(\x05\x62\x06proto3')
 
-_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals())
-_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'tf_keras.protobuf.versions_pb2', globals())
-if _descriptor._USE_C_DESCRIPTORS == False:
-
-  DESCRIPTOR._options = None
-  _VERSIONDEF._serialized_start=70
-  _VERSIONDEF._serialized_end=145
+_globals = globals()
+_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
+_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'tf_keras.protobuf.versions_pb2', _globals)
+if not _descriptor._USE_C_DESCRIPTORS:
+  DESCRIPTOR._loaded_options = None
+  _globals['_VERSIONDEF']._serialized_start=70
+  _globals['_VERSIONDEF']._serialized_end=145
 # @@protoc_insertion_point(module_scope)

tf_keras/src/__init__.py

@@ -35,7 +35,7 @@ from tf_keras.src.testing_infra import test_utils
 from tensorflow.python import tf2
 from tensorflow.python.util.tf_export import keras_export
 
-__version__ = "2.19.0"
+__version__ = "2.21.0"
 
 keras_export("keras.__version__").export_constant(__name__, "__version__")
 

tf_keras/src/backend.py

@@ -2029,7 +2029,7 @@ class RandomGenerator(tf.__internal__.tracking.AutoTrackable):
         if user_specified_seed is not None:
             return user_specified_seed
         elif getattr(_SEED_GENERATOR, "generator", None):
-            return _SEED_GENERATOR.generator.randint(1, 1e9)
+            return _SEED_GENERATOR.generator.randint(1, int(1e9))
         else:
             return random.randint(1, int(1e9))
 

tf_keras/src/datasets/boston_housing.py

@@ -14,6 +14,8 @@
 # ==============================================================================
 """Boston housing price regression dataset."""
 
+import os
+
 import numpy as np
 
 from tf_keras.src.utils.data_utils import get_file
@@ -23,7 +25,9 @@ from tensorflow.python.util.tf_export import keras_export
 
 
 @keras_export("keras.datasets.boston_housing.load_data")
-def load_data(path="boston_housing.npz", test_split=0.2, seed=113):
+def load_data(
+    path="boston_housing.npz", test_split=0.2, seed=113, cache_dir=None
+):
     """Loads the Boston Housing dataset.
 
     This is a dataset taken from the StatLib library which is maintained at
@@ -43,11 +47,12 @@ def load_data(path="boston_housing.npz", test_split=0.2, seed=113):
     [StatLib website](http://lib.stat.cmu.edu/datasets/boston).
 
     Args:
-      path: path where to cache the dataset locally
-          (relative to `~/.keras/datasets`).
+      path: path where to cache the dataset locally (relative to
+        `~/.keras/datasets`).
       test_split: fraction of the data to reserve as test set.
-      seed: Random seed for shuffling the data
-          before computing the test split.
+      seed: Random seed for shuffling the data before computing the test split.
+      cache_dir: directory where to cache the dataset locally. When None,
+        defaults to `~/.keras/datasets`.
 
     Returns:
       Tuple of Numpy arrays: `(x_train, y_train), (x_test, y_test)`.
@@ -64,12 +69,16 @@ def load_data(path="boston_housing.npz", test_split=0.2, seed=113):
     origin_folder = (
         "https://storage.googleapis.com/tensorflow/tf-keras-datasets/"
     )
+    if cache_dir:
+        cache_dir = os.path.expanduser(cache_dir)
+        os.makedirs(cache_dir, exist_ok=True)
     path = get_file(
         path,
         origin=origin_folder + "boston_housing.npz",
         file_hash=(  # noqa: E501
             "f553886a1f8d56431e820c5b82552d9d95cfcb96d1e678153f8839538947dff5"
         ),
+        cache_dir=cache_dir,
     )
     with np.load(path, allow_pickle=True) as f:
         x = f["x"]

tf_keras/src/datasets/cifar10.py

@@ -27,7 +27,7 @@ from tensorflow.python.util.tf_export import keras_export
 
 
 @keras_export("keras.datasets.cifar10.load_data")
-def load_data():
+def load_data(cache_dir=None):
     """Loads the CIFAR10 dataset.
 
     This is a dataset of 50,000 32x32 color training images and 10,000 test
@@ -49,6 +49,10 @@ def load_data():
     |   8   | ship        |
     |   9   | truck       |
 
+    Args:
+      cache_dir: directory where to cache the dataset locally. When None,
+        defaults to `~/.keras/datasets`.
+
     Returns:
       Tuple of NumPy arrays: `(x_train, y_train), (x_test, y_test)`.
 
@@ -78,6 +82,9 @@ def load_data():
     """
     dirname = "cifar-10-batches-py"
     origin = "https://www.cs.toronto.edu/~kriz/cifar-10-python.tar.gz"
+    if cache_dir:
+        cache_dir = os.path.expanduser(cache_dir)
+        os.makedirs(cache_dir, exist_ok=True)
     path = get_file(
         dirname,
         origin=origin,
@@ -85,6 +92,7 @@ def load_data():
         file_hash=(  # noqa: E501
             "6d958be074577803d12ecdefd02955f39262c83c16fe9348329d7fe0b5c001ce"
         ),
+        cache_dir=cache_dir,
     )
 
     num_train_samples = 50000

tf_keras/src/datasets/cifar100.py

@@ -27,7 +27,7 @@ from tensorflow.python.util.tf_export import keras_export
 
 
 @keras_export("keras.datasets.cifar100.load_data")
-def load_data(label_mode="fine"):
+def load_data(label_mode="fine", cache_dir=None):
     """Loads the CIFAR100 dataset.
 
     This is a dataset of 50,000 32x32 color training images and
@@ -39,6 +39,8 @@ def load_data(label_mode="fine"):
       label_mode: one of "fine", "coarse". If it is "fine" the category labels
         are the fine-grained labels, if it is "coarse" the output labels are the
         coarse-grained superclasses.
+      cache_dir: directory where to cache the dataset locally. When None,
+        defaults to `~/.keras/datasets`.
 
     Returns:
       Tuple of NumPy arrays: `(x_train, y_train), (x_test, y_test)`.
@@ -75,6 +77,9 @@ def load_data(label_mode="fine"):
 
     dirname = "cifar-100-python"
     origin = "https://www.cs.toronto.edu/~kriz/cifar-100-python.tar.gz"
+    if cache_dir:
+        cache_dir = os.path.expanduser(cache_dir)
+        os.makedirs(cache_dir, exist_ok=True)
     path = get_file(
         dirname,
         origin=origin,
@@ -82,6 +87,7 @@ def load_data(label_mode="fine"):
         file_hash=(  # noqa: E501
             "85cd44d02ba6437773c5bbd22e183051d648de2e7d6b014e1ef29b855ba677a7"
         ),
+        cache_dir=cache_dir,
     )
 
     fpath = os.path.join(path, "train")

tf_keras/src/datasets/fashion_mnist.py

@@ -26,7 +26,7 @@ from tensorflow.python.util.tf_export import keras_export
 
 
 @keras_export("keras.datasets.fashion_mnist.load_data")
-def load_data():
+def load_data(cache_dir=None):
     """Loads the Fashion-MNIST dataset.
 
     This is a dataset of 60,000 28x28 grayscale images of 10 fashion categories,
@@ -48,6 +48,10 @@ def load_data():
     |   8   | Bag         |
     |   9   | Ankle boot  |
 
+    Args:
+      cache_dir: directory where to cache the dataset locally. When None,
+        defaults to `~/.keras/datasets`.
+
     Returns:
       Tuple of NumPy arrays: `(x_train, y_train), (x_test, y_test)`.
 
@@ -77,7 +81,6 @@ def load_data():
       The copyright for Fashion-MNIST is held by Zalando SE.
       Fashion-MNIST is licensed under the [MIT license](
       https://github.com/zalandoresearch/fashion-mnist/blob/master/LICENSE).
-
     """
     dirname = os.path.join("datasets", "fashion-mnist")
     base = "https://storage.googleapis.com/tensorflow/tf-keras-datasets/"
@@ -87,10 +90,19 @@ def load_data():
         "t10k-labels-idx1-ubyte.gz",
         "t10k-images-idx3-ubyte.gz",
     ]
-
+    if cache_dir:
+        cache_dir = os.path.expanduser(cache_dir)
+        os.makedirs(cache_dir, exist_ok=True)
     paths = []
     for fname in files:
-        paths.append(get_file(fname, origin=base + fname, cache_subdir=dirname))
+        paths.append(
+            get_file(
+                fname,
+                origin=base + fname,
+                cache_dir=cache_dir,
+                cache_subdir=dirname,
+            )
+        )
 
     with gzip.open(paths[0], "rb") as lbpath:
         y_train = np.frombuffer(lbpath.read(), np.uint8, offset=8)

tf_keras/src/datasets/imdb.py

@@ -15,6 +15,7 @@
 """IMDB sentiment classification dataset."""
 
 import json
+import os
 
 import numpy as np
 
@@ -36,6 +37,7 @@ def load_data(
     start_char=1,
     oov_char=2,
     index_from=3,
+    cache_dir=None,
     **kwargs,
 ):
     """Loads the [IMDB dataset](https://ai.stanford.edu/~amaas/data/sentiment/).
@@ -73,6 +75,8 @@ def load_data(
           Words that were cut out because of the `num_words` or
           `skip_top` limits will be replaced with this character.
       index_from: int. Index actual words with this index and higher.
+      cache_dir: directory where to cache the dataset locally. When None,
+          defaults to `~/.keras/datasets`.
       **kwargs: Used for backwards compatibility.
 
     Returns:
@@ -108,12 +112,16 @@ def load_data(
     origin_folder = (
         "https://storage.googleapis.com/tensorflow/tf-keras-datasets/"
     )
+    if cache_dir:
+        cache_dir = os.path.expanduser(cache_dir)
+        os.makedirs(cache_dir, exist_ok=True)
     path = get_file(
         path,
         origin=origin_folder + "imdb.npz",
         file_hash=(  # noqa: E501
             "69664113be75683a8fe16e3ed0ab59fda8886cb3cd7ada244f7d9544e4676b9f"
         ),
+        cache_dir=cache_dir,
     )
     with np.load(path, allow_pickle=True) as f:
         x_train, labels_train = f["x_train"], f["y_train"]

tf_keras/src/datasets/mnist.py

@@ -13,6 +13,7 @@
 # limitations under the License.
 # ==============================================================================
 """MNIST handwritten digits dataset."""
+import os
 
 import numpy as np
 
@@ -23,7 +24,7 @@ from tensorflow.python.util.tf_export import keras_export
 
 
 @keras_export("keras.datasets.mnist.load_data")
-def load_data(path="mnist.npz"):
+def load_data(path="mnist.npz", cache_dir=None):
     """Loads the MNIST dataset.
 
     This is a dataset of 60,000 28x28 grayscale images of the 10 digits,
@@ -32,8 +33,9 @@ def load_data(path="mnist.npz"):
     [MNIST homepage](http://yann.lecun.com/exdb/mnist/).
 
     Args:
-      path: path where to cache the dataset locally
-        (relative to `~/.keras/datasets`).
+      path: path where to cache the dataset locally relative to cache_dir.
+      cache_dir: dir location where to cache the dataset locally. When None,
+        defaults to `~/.keras/datasets`.
 
     Returns:
       Tuple of NumPy arrays: `(x_train, y_train), (x_test, y_test)`.
@@ -72,12 +74,16 @@ def load_data(path="mnist.npz"):
     origin_folder = (
         "https://storage.googleapis.com/tensorflow/tf-keras-datasets/"
     )
+    if cache_dir:
+        cache_dir = os.path.expanduser(cache_dir)
+        os.makedirs(cache_dir, exist_ok=True)
     path = get_file(
         path,
         origin=origin_folder + "mnist.npz",
         file_hash=(  # noqa: E501
             "731c5ac602752760c8e48fbffcf8c3b850d9dc2a2aedcf2cc48468fc17b673d1"
         ),
+        cache_dir=cache_dir,
     )
     with np.load(path, allow_pickle=True) as f:
         x_train, y_train = f["x_train"], f["y_train"]

tf_keras/src/datasets/reuters.py

@@ -15,6 +15,7 @@
 """Reuters topic classification dataset."""
 
 import json
+import os
 
 import numpy as np
 
@@ -37,6 +38,7 @@ def load_data(
     start_char=1,
     oov_char=2,
     index_from=3,
+    cache_dir=None,
     **kwargs,
 ):
     """Loads the Reuters newswire classification dataset.
@@ -83,6 +85,8 @@ def load_data(
           Words that were cut out because of the `num_words` or
           `skip_top` limits will be replaced with this character.
       index_from: int. Index actual words with this index and higher.
+      cache_dir: directory where to cache the dataset locally. When None,
+          defaults to `~/.keras/datasets`.
       **kwargs: Used for backwards compatibility.
 
     Returns:
@@ -114,12 +118,16 @@ def load_data(
     origin_folder = (
         "https://storage.googleapis.com/tensorflow/tf-keras-datasets/"
     )
+    if cache_dir:
+        cache_dir = os.path.expanduser(cache_dir)
+        os.makedirs(cache_dir, exist_ok=True)
     path = get_file(
         path,
         origin=origin_folder + "reuters.npz",
         file_hash=(  # noqa: E501
             "d6586e694ee56d7a4e65172e12b3e987c03096cb01eab99753921ef915959916"
         ),
+        cache_dir=cache_dir,
     )
     with np.load(path, allow_pickle=True) as f:
         xs, labels = f["x"], f["y"]