Skip to content

Commit f403f9a

Browse files
LukeWoodLukeWood
committed
Keras saveable
1 parent d61047f commit f403f9a

File tree

16 files changed

+28
-193
lines changed

16 files changed

+28
-193
lines changed

‎keras/api/__init__.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
since your modifications would be overwritten.
55
"""
66

7+
from keras.api import _tf_keras
78
from keras.api import activations
89
from keras.api import applications
910
from keras.api import backend

‎keras/api/_tf_keras/keras/__init__.py‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
from keras.api import activations
88
from keras.api import applications
9+
from keras.api import backend
910
from keras.api import callbacks
1011
from keras.api import config
1112
from keras.api import constraints
@@ -14,21 +15,21 @@
1415
from keras.api import dtype_policies
1516
from keras.api import export
1617
from keras.api import initializers
18+
from keras.api import layers
1719
from keras.api import legacy
20+
from keras.api import losses
21+
from keras.api import metrics
1822
from keras.api import mixed_precision
1923
from keras.api import models
2024
from keras.api import ops
2125
from keras.api import optimizers
26+
from keras.api import preprocessing
2227
from keras.api import quantizers
2328
from keras.api import random
2429
from keras.api import regularizers
30+
from keras.api import saving
2531
from keras.api import tree
2632
from keras.api import utils
27-
from keras.api._tf_keras.keras import backend
28-
from keras.api._tf_keras.keras import layers
29-
from keras.api._tf_keras.keras import losses
30-
from keras.api._tf_keras.keras import metrics
31-
from keras.api._tf_keras.keras import preprocessing
3233
from keras.src.backend.common.keras_tensor import KerasTensor
3334
from keras.src.backend.common.stateless_scope import StatelessScope
3435
from keras.src.backend.exports import Variable

‎keras/api/_tf_keras/keras/backend/__init__.py‎

Lines changed: 0 additions & 123 deletions
Original file line numberDiff line numberDiff line change
@@ -17,127 +17,4 @@
1717
from keras.src.backend.config import set_epsilon
1818
from keras.src.backend.config import set_floatx
1919
from keras.src.backend.config import set_image_data_format
20-
from keras.src.legacy.backend import abs
21-
from keras.src.legacy.backend import all
22-
from keras.src.legacy.backend import any
23-
from keras.src.legacy.backend import arange
24-
from keras.src.legacy.backend import argmax
25-
from keras.src.legacy.backend import argmin
26-
from keras.src.legacy.backend import batch_dot
27-
from keras.src.legacy.backend import batch_flatten
28-
from keras.src.legacy.backend import batch_get_value
29-
from keras.src.legacy.backend import batch_normalization
30-
from keras.src.legacy.backend import batch_set_value
31-
from keras.src.legacy.backend import bias_add
32-
from keras.src.legacy.backend import binary_crossentropy
33-
from keras.src.legacy.backend import binary_focal_crossentropy
34-
from keras.src.legacy.backend import cast
35-
from keras.src.legacy.backend import cast_to_floatx
36-
from keras.src.legacy.backend import categorical_crossentropy
37-
from keras.src.legacy.backend import categorical_focal_crossentropy
38-
from keras.src.legacy.backend import clip
39-
from keras.src.legacy.backend import concatenate
40-
from keras.src.legacy.backend import constant
41-
from keras.src.legacy.backend import conv1d
42-
from keras.src.legacy.backend import conv2d
43-
from keras.src.legacy.backend import conv2d_transpose
44-
from keras.src.legacy.backend import conv3d
45-
from keras.src.legacy.backend import cos
46-
from keras.src.legacy.backend import count_params
47-
from keras.src.legacy.backend import ctc_batch_cost
48-
from keras.src.legacy.backend import ctc_decode
49-
from keras.src.legacy.backend import ctc_label_dense_to_sparse
50-
from keras.src.legacy.backend import cumprod
51-
from keras.src.legacy.backend import cumsum
52-
from keras.src.legacy.backend import depthwise_conv2d
53-
from keras.src.legacy.backend import dot
54-
from keras.src.legacy.backend import dropout
55-
from keras.src.legacy.backend import dtype
56-
from keras.src.legacy.backend import elu
57-
from keras.src.legacy.backend import equal
58-
from keras.src.legacy.backend import eval
59-
from keras.src.legacy.backend import exp
60-
from keras.src.legacy.backend import expand_dims
61-
from keras.src.legacy.backend import eye
62-
from keras.src.legacy.backend import flatten
63-
from keras.src.legacy.backend import foldl
64-
from keras.src.legacy.backend import foldr
65-
from keras.src.legacy.backend import gather
66-
from keras.src.legacy.backend import get_value
67-
from keras.src.legacy.backend import gradients
68-
from keras.src.legacy.backend import greater
69-
from keras.src.legacy.backend import greater_equal
70-
from keras.src.legacy.backend import hard_sigmoid
71-
from keras.src.legacy.backend import in_top_k
72-
from keras.src.legacy.backend import int_shape
73-
from keras.src.legacy.backend import is_sparse
74-
from keras.src.legacy.backend import l2_normalize
75-
from keras.src.legacy.backend import less
76-
from keras.src.legacy.backend import less_equal
77-
from keras.src.legacy.backend import log
78-
from keras.src.legacy.backend import map_fn
79-
from keras.src.legacy.backend import max
80-
from keras.src.legacy.backend import maximum
81-
from keras.src.legacy.backend import mean
82-
from keras.src.legacy.backend import min
83-
from keras.src.legacy.backend import minimum
84-
from keras.src.legacy.backend import moving_average_update
85-
from keras.src.legacy.backend import name_scope
86-
from keras.src.legacy.backend import ndim
87-
from keras.src.legacy.backend import not_equal
88-
from keras.src.legacy.backend import one_hot
89-
from keras.src.legacy.backend import ones
90-
from keras.src.legacy.backend import ones_like
91-
from keras.src.legacy.backend import permute_dimensions
92-
from keras.src.legacy.backend import pool2d
93-
from keras.src.legacy.backend import pool3d
94-
from keras.src.legacy.backend import pow
95-
from keras.src.legacy.backend import prod
96-
from keras.src.legacy.backend import random_bernoulli
97-
from keras.src.legacy.backend import random_normal
98-
from keras.src.legacy.backend import random_normal_variable
99-
from keras.src.legacy.backend import random_uniform
100-
from keras.src.legacy.backend import random_uniform_variable
101-
from keras.src.legacy.backend import relu
102-
from keras.src.legacy.backend import repeat
103-
from keras.src.legacy.backend import repeat_elements
104-
from keras.src.legacy.backend import reshape
105-
from keras.src.legacy.backend import resize_images
106-
from keras.src.legacy.backend import resize_volumes
107-
from keras.src.legacy.backend import reverse
108-
from keras.src.legacy.backend import rnn
109-
from keras.src.legacy.backend import round
110-
from keras.src.legacy.backend import separable_conv2d
111-
from keras.src.legacy.backend import set_value
112-
from keras.src.legacy.backend import shape
113-
from keras.src.legacy.backend import sigmoid
114-
from keras.src.legacy.backend import sign
115-
from keras.src.legacy.backend import sin
116-
from keras.src.legacy.backend import softmax
117-
from keras.src.legacy.backend import softplus
118-
from keras.src.legacy.backend import softsign
119-
from keras.src.legacy.backend import sparse_categorical_crossentropy
120-
from keras.src.legacy.backend import spatial_2d_padding
121-
from keras.src.legacy.backend import spatial_3d_padding
122-
from keras.src.legacy.backend import sqrt
123-
from keras.src.legacy.backend import square
124-
from keras.src.legacy.backend import squeeze
125-
from keras.src.legacy.backend import stack
126-
from keras.src.legacy.backend import std
127-
from keras.src.legacy.backend import stop_gradient
128-
from keras.src.legacy.backend import sum
129-
from keras.src.legacy.backend import switch
130-
from keras.src.legacy.backend import tanh
131-
from keras.src.legacy.backend import temporal_padding
132-
from keras.src.legacy.backend import tile
133-
from keras.src.legacy.backend import to_dense
134-
from keras.src.legacy.backend import transpose
135-
from keras.src.legacy.backend import truncated_normal
136-
from keras.src.legacy.backend import update
137-
from keras.src.legacy.backend import update_add
138-
from keras.src.legacy.backend import update_sub
139-
from keras.src.legacy.backend import var
140-
from keras.src.legacy.backend import variable
141-
from keras.src.legacy.backend import zeros
142-
from keras.src.legacy.backend import zeros_like
14320
from keras.src.utils.naming import get_uid

‎keras/api/_tf_keras/keras/layers/__init__.py‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,7 @@
157157
from keras.src.layers.regularization.activity_regularization import (
158158
ActivityRegularization,
159159
)
160+
from keras.src.layers.regularization.alpha_dropout import AlphaDropout
160161
from keras.src.layers.regularization.dropout import Dropout
161162
from keras.src.layers.regularization.gaussian_dropout import GaussianDropout
162163
from keras.src.layers.regularization.gaussian_noise import GaussianNoise
@@ -189,10 +190,6 @@
189190
from keras.src.layers.rnn.simple_rnn import SimpleRNNCell
190191
from keras.src.layers.rnn.stacked_rnn_cells import StackedRNNCells
191192
from keras.src.layers.rnn.time_distributed import TimeDistributed
192-
from keras.src.legacy.layers import AlphaDropout
193-
from keras.src.legacy.layers import RandomHeight
194-
from keras.src.legacy.layers import RandomWidth
195-
from keras.src.legacy.layers import ThresholdedReLU
196193
from keras.src.utils.jax_layer import FlaxLayer
197194
from keras.src.utils.jax_layer import JaxLayer
198195
from keras.src.utils.torch_utils import TorchModuleWrapper

‎keras/api/_tf_keras/keras/losses/__init__.py‎

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
since your modifications would be overwritten.
55
"""
66

7-
from keras.src.legacy.losses import Reduction
87
from keras.src.losses import deserialize
98
from keras.src.losses import get
109
from keras.src.losses import serialize
@@ -39,18 +38,12 @@
3938
from keras.src.losses.losses import dice
4039
from keras.src.losses.losses import hinge
4140
from keras.src.losses.losses import huber
42-
from keras.src.losses.losses import kl_divergence as KLD
43-
from keras.src.losses.losses import kl_divergence as kld
44-
from keras.src.losses.losses import kl_divergence as kullback_leibler_divergence
45-
from keras.src.losses.losses import log_cosh as logcosh
46-
from keras.src.losses.losses import mean_absolute_error as MAE
47-
from keras.src.losses.losses import mean_absolute_error as mae
48-
from keras.src.losses.losses import mean_absolute_percentage_error as MAPE
49-
from keras.src.losses.losses import mean_absolute_percentage_error as mape
50-
from keras.src.losses.losses import mean_squared_error as MSE
51-
from keras.src.losses.losses import mean_squared_error as mse
52-
from keras.src.losses.losses import mean_squared_logarithmic_error as MSLE
53-
from keras.src.losses.losses import mean_squared_logarithmic_error as msle
41+
from keras.src.losses.losses import kl_divergence
42+
from keras.src.losses.losses import log_cosh
43+
from keras.src.losses.losses import mean_absolute_error
44+
from keras.src.losses.losses import mean_absolute_percentage_error
45+
from keras.src.losses.losses import mean_squared_error
46+
from keras.src.losses.losses import mean_squared_logarithmic_error
5447
from keras.src.losses.losses import poisson
5548
from keras.src.losses.losses import sparse_categorical_crossentropy
5649
from keras.src.losses.losses import squared_hinge

‎keras/api/_tf_keras/keras/metrics/__init__.py‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,12 @@
1111
from keras.src.losses.losses import categorical_hinge
1212
from keras.src.losses.losses import hinge
1313
from keras.src.losses.losses import huber
14-
from keras.src.losses.losses import kl_divergence as KLD
15-
from keras.src.losses.losses import kl_divergence as kld
16-
from keras.src.losses.losses import kl_divergence as kullback_leibler_divergence
17-
from keras.src.losses.losses import log_cosh as logcosh
18-
from keras.src.losses.losses import mean_absolute_error as MAE
19-
from keras.src.losses.losses import mean_absolute_error as mae
20-
from keras.src.losses.losses import mean_absolute_percentage_error as MAPE
21-
from keras.src.losses.losses import mean_absolute_percentage_error as mape
22-
from keras.src.losses.losses import mean_squared_error as MSE
23-
from keras.src.losses.losses import mean_squared_error as mse
24-
from keras.src.losses.losses import mean_squared_logarithmic_error as MSLE
25-
from keras.src.losses.losses import mean_squared_logarithmic_error as msle
14+
from keras.src.losses.losses import kl_divergence
15+
from keras.src.losses.losses import log_cosh
16+
from keras.src.losses.losses import mean_absolute_error
17+
from keras.src.losses.losses import mean_absolute_percentage_error
18+
from keras.src.losses.losses import mean_squared_error
19+
from keras.src.losses.losses import mean_squared_logarithmic_error
2620
from keras.src.losses.losses import poisson
2721
from keras.src.losses.losses import sparse_categorical_crossentropy
2822
from keras.src.losses.losses import squared_hinge

‎keras/api/_tf_keras/keras/preprocessing/__init__.py‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,8 @@
44
since your modifications would be overwritten.
55
"""
66

7-
from keras.api._tf_keras.keras.preprocessing import image
8-
from keras.api._tf_keras.keras.preprocessing import sequence
9-
from keras.api._tf_keras.keras.preprocessing import text
7+
from keras.api.preprocessing import image
8+
from keras.api.preprocessing import sequence
109
from keras.src.utils.image_dataset_utils import image_dataset_from_directory
1110
from keras.src.utils.text_dataset_utils import text_dataset_from_directory
1211
from keras.src.utils.timeseries_dataset_utils import (

‎keras/api/_tf_keras/keras/preprocessing/image/__init__.py‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,6 @@
44
since your modifications would be overwritten.
55
"""
66

7-
from keras.src.legacy.preprocessing.image import DirectoryIterator
8-
from keras.src.legacy.preprocessing.image import ImageDataGenerator
9-
from keras.src.legacy.preprocessing.image import Iterator
10-
from keras.src.legacy.preprocessing.image import NumpyArrayIterator
11-
from keras.src.legacy.preprocessing.image import apply_affine_transform
12-
from keras.src.legacy.preprocessing.image import apply_brightness_shift
13-
from keras.src.legacy.preprocessing.image import apply_channel_shift
14-
from keras.src.legacy.preprocessing.image import random_brightness
15-
from keras.src.legacy.preprocessing.image import random_channel_shift
16-
from keras.src.legacy.preprocessing.image import random_rotation
17-
from keras.src.legacy.preprocessing.image import random_shear
18-
from keras.src.legacy.preprocessing.image import random_shift
19-
from keras.src.legacy.preprocessing.image import random_zoom
207
from keras.src.utils.image_utils import array_to_img
218
from keras.src.utils.image_utils import img_to_array
229
from keras.src.utils.image_utils import load_img

‎keras/api/_tf_keras/keras/preprocessing/sequence/__init__.py‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,4 @@
44
since your modifications would be overwritten.
55
"""
66

7-
from keras.src.legacy.preprocessing.sequence import TimeseriesGenerator
8-
from keras.src.legacy.preprocessing.sequence import make_sampling_table
9-
from keras.src.legacy.preprocessing.sequence import skipgrams
107
from keras.src.utils.sequence_utils import pad_sequences

‎keras/api/_tf_keras/keras/preprocessing/text/__init__.py‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

0 commit comments

Comments
 (0)