Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion keras/api/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -63,5 +63,5 @@
from keras.src.optimizers.optimizer import Optimizer as Optimizer
from keras.src.quantizers.quantizers import Quantizer as Quantizer
from keras.src.regularizers.regularizers import Regularizer as Regularizer
from keras.src.version import __version__ as __version__
from keras.src.version import version as version
from keras.src.version import __version__ as __version__
14 changes: 8 additions & 6 deletions keras/api/_tf_keras/keras/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,6 @@
from keras import utils as utils
from keras import visualization as visualization
from keras import wrappers as wrappers
from keras._tf_keras.keras import backend as backend
from keras._tf_keras.keras import layers as layers
from keras._tf_keras.keras import losses as losses
from keras._tf_keras.keras import metrics as metrics
from keras._tf_keras.keras import preprocessing as preprocessing
from keras.src.backend import Variable as Variable
from keras.src.backend import device as device
from keras.src.backend import name_scope as name_scope
Expand Down Expand Up @@ -61,5 +56,12 @@
from keras.src.optimizers.optimizer import Optimizer as Optimizer
from keras.src.quantizers.quantizers import Quantizer as Quantizer
from keras.src.regularizers.regularizers import Regularizer as Regularizer
from keras.src.version import __version__ as __version__
from keras.src.version import version as version
from keras.src.version import __version__ as __version__


from keras._tf_keras.keras import backend as backend
from keras._tf_keras.keras import layers as layers
from keras._tf_keras.keras import losses as losses
from keras._tf_keras.keras import metrics as metrics
from keras._tf_keras.keras import preprocessing as preprocessing
4 changes: 2 additions & 2 deletions keras/api/_tf_keras/keras/applications/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -72,12 +72,12 @@
)
from keras.src.applications.nasnet import NASNetLarge as NASNetLarge
from keras.src.applications.nasnet import NASNetMobile as NASNetMobile
from keras.src.applications.resnet import ResNet50 as ResNet50
from keras.src.applications.resnet import ResNet101 as ResNet101
from keras.src.applications.resnet import ResNet152 as ResNet152
from keras.src.applications.resnet_v2 import ResNet50V2 as ResNet50V2
from keras.src.applications.resnet import ResNet50 as ResNet50
from keras.src.applications.resnet_v2 import ResNet101V2 as ResNet101V2
from keras.src.applications.resnet_v2 import ResNet152V2 as ResNet152V2
from keras.src.applications.resnet_v2 import ResNet50V2 as ResNet50V2
from keras.src.applications.vgg16 import VGG16 as VGG16
from keras.src.applications.vgg19 import VGG19 as VGG19
from keras.src.applications.xception import Xception as Xception
2 changes: 1 addition & 1 deletion keras/api/_tf_keras/keras/applications/resnet/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
since your modifications would be overwritten.
"""

from keras.src.applications.resnet import ResNet50 as ResNet50
from keras.src.applications.resnet import ResNet101 as ResNet101
from keras.src.applications.resnet import ResNet152 as ResNet152
from keras.src.applications.resnet import ResNet50 as ResNet50
from keras.src.applications.resnet import (
decode_predictions as decode_predictions,
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
since your modifications would be overwritten.
"""

from keras.src.applications.resnet_v2 import ResNet50V2 as ResNet50V2
from keras.src.applications.resnet_v2 import ResNet101V2 as ResNet101V2
from keras.src.applications.resnet_v2 import ResNet152V2 as ResNet152V2
from keras.src.applications.resnet_v2 import ResNet50V2 as ResNet50V2
from keras.src.applications.resnet_v2 import (
decode_predictions as decode_predictions,
)
Expand Down
4 changes: 3 additions & 1 deletion keras/api/_tf_keras/keras/backend/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@
from keras.src.backend.config import (
set_image_data_format as set_image_data_format,
)
from keras.src.utils.naming import get_uid as get_uid


from keras.src.legacy.backend import abs as abs
from keras.src.legacy.backend import all as all
from keras.src.legacy.backend import any as any
Expand Down Expand Up @@ -162,4 +165,3 @@
from keras.src.legacy.backend import variable as variable
from keras.src.legacy.backend import zeros as zeros
from keras.src.legacy.backend import zeros_like as zeros_like
from keras.src.utils.naming import get_uid as get_uid
6 changes: 3 additions & 3 deletions keras/api/_tf_keras/keras/initializers/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,6 @@
from keras.src.initializers import deserialize as deserialize
from keras.src.initializers import get as get
from keras.src.initializers import serialize as serialize
from keras.src.initializers.constant_initializers import STFT as STFT
from keras.src.initializers.constant_initializers import STFT as STFTInitializer
from keras.src.initializers.constant_initializers import STFT as stft
from keras.src.initializers.constant_initializers import Constant as Constant
from keras.src.initializers.constant_initializers import Constant as constant
from keras.src.initializers.constant_initializers import Identity as Identity
Expand All @@ -19,6 +16,9 @@
from keras.src.initializers.constant_initializers import Identity as identity
from keras.src.initializers.constant_initializers import Ones as Ones
from keras.src.initializers.constant_initializers import Ones as ones
from keras.src.initializers.constant_initializers import STFT as STFT
from keras.src.initializers.constant_initializers import STFT as STFTInitializer
from keras.src.initializers.constant_initializers import STFT as stft
from keras.src.initializers.constant_initializers import Zeros as Zeros
from keras.src.initializers.constant_initializers import Zeros as zeros
from keras.src.initializers.initializer import Initializer as Initializer
Expand Down
8 changes: 5 additions & 3 deletions keras/api/_tf_keras/keras/layers/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -356,10 +356,12 @@
from keras.src.layers.rnn.time_distributed import (
TimeDistributed as TimeDistributed,
)
from keras.src.utils.jax_layer import FlaxLayer as FlaxLayer
from keras.src.utils.jax_layer import JaxLayer as JaxLayer
from keras.src.utils.torch_utils import TorchModuleWrapper as TorchModuleWrapper


from keras.src.legacy.layers import AlphaDropout as AlphaDropout
from keras.src.legacy.layers import RandomHeight as RandomHeight
from keras.src.legacy.layers import RandomWidth as RandomWidth
from keras.src.legacy.layers import ThresholdedReLU as ThresholdedReLU
from keras.src.utils.jax_layer import FlaxLayer as FlaxLayer
from keras.src.utils.jax_layer import JaxLayer as JaxLayer
from keras.src.utils.torch_utils import TorchModuleWrapper as TorchModuleWrapper
18 changes: 10 additions & 8 deletions keras/api/_tf_keras/keras/losses/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,15 @@
since your modifications would be overwritten.
"""

from keras.src.legacy.losses import Reduction as Reduction
from keras.src.losses import deserialize as deserialize
from keras.src.losses import get as get
from keras.src.losses import serialize as serialize
from keras.src.losses.loss import Loss as Loss
from keras.src.losses.losses import CTC as CTC
from keras.src.losses.losses import BinaryCrossentropy as BinaryCrossentropy
from keras.src.losses.losses import (
BinaryFocalCrossentropy as BinaryFocalCrossentropy,
)
from keras.src.losses.losses import CTC as CTC
from keras.src.losses.losses import (
CategoricalCrossentropy as CategoricalCrossentropy,
)
Expand Down Expand Up @@ -65,6 +64,15 @@
from keras.src.losses.losses import dice as dice
from keras.src.losses.losses import hinge as hinge
from keras.src.losses.losses import huber as huber
from keras.src.losses.losses import poisson as poisson
from keras.src.losses.losses import (
sparse_categorical_crossentropy as sparse_categorical_crossentropy,
)
from keras.src.losses.losses import squared_hinge as squared_hinge
from keras.src.losses.losses import tversky as tversky


from keras.src.legacy.losses import Reduction as Reduction
from keras.src.losses.losses import kl_divergence as KLD
from keras.src.losses.losses import kl_divergence as kld
from keras.src.losses.losses import kl_divergence as kullback_leibler_divergence
Expand All @@ -77,9 +85,3 @@
from keras.src.losses.losses import mean_squared_error as mse
from keras.src.losses.losses import mean_squared_logarithmic_error as MSLE
from keras.src.losses.losses import mean_squared_logarithmic_error as msle
from keras.src.losses.losses import poisson as poisson
from keras.src.losses.losses import (
sparse_categorical_crossentropy as sparse_categorical_crossentropy,
)
from keras.src.losses.losses import squared_hinge as squared_hinge
from keras.src.losses.losses import tversky as tversky
26 changes: 14 additions & 12 deletions keras/api/_tf_keras/keras/metrics/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,6 @@
from keras.src.losses.losses import categorical_hinge as categorical_hinge
from keras.src.losses.losses import hinge as hinge
from keras.src.losses.losses import huber as huber
from keras.src.losses.losses import kl_divergence as KLD
from keras.src.losses.losses import kl_divergence as kld
from keras.src.losses.losses import kl_divergence as kullback_leibler_divergence
from keras.src.losses.losses import log_cosh as logcosh
from keras.src.losses.losses import mean_absolute_error as MAE
from keras.src.losses.losses import mean_absolute_error as mae
from keras.src.losses.losses import mean_absolute_percentage_error as MAPE
from keras.src.losses.losses import mean_absolute_percentage_error as mape
from keras.src.losses.losses import mean_squared_error as MSE
from keras.src.losses.losses import mean_squared_error as mse
from keras.src.losses.losses import mean_squared_logarithmic_error as MSLE
from keras.src.losses.losses import mean_squared_logarithmic_error as msle
from keras.src.losses.losses import poisson as poisson
from keras.src.losses.losses import (
sparse_categorical_crossentropy as sparse_categorical_crossentropy,
Expand Down Expand Up @@ -144,3 +132,17 @@
from keras.src.metrics.regression_metrics import (
RootMeanSquaredError as RootMeanSquaredError,
)


from keras.src.losses.losses import kl_divergence as KLD
from keras.src.losses.losses import kl_divergence as kld
from keras.src.losses.losses import kl_divergence as kullback_leibler_divergence
from keras.src.losses.losses import log_cosh as logcosh
from keras.src.losses.losses import mean_absolute_error as MAE
from keras.src.losses.losses import mean_absolute_error as mae
from keras.src.losses.losses import mean_absolute_percentage_error as MAPE
from keras.src.losses.losses import mean_absolute_percentage_error as mape
from keras.src.losses.losses import mean_squared_error as MSE
from keras.src.losses.losses import mean_squared_error as mse
from keras.src.losses.losses import mean_squared_logarithmic_error as MSLE
from keras.src.losses.losses import mean_squared_logarithmic_error as msle
2 changes: 1 addition & 1 deletion keras/api/_tf_keras/keras/ops/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -220,9 +220,9 @@
from keras.src.ops.numpy import less_equal as less_equal
from keras.src.ops.numpy import linspace as linspace
from keras.src.ops.numpy import log as log
from keras.src.ops.numpy import log10 as log10
from keras.src.ops.numpy import log1p as log1p
from keras.src.ops.numpy import log2 as log2
from keras.src.ops.numpy import log10 as log10
from keras.src.ops.numpy import logaddexp as logaddexp
from keras.src.ops.numpy import logaddexp2 as logaddexp2
from keras.src.ops.numpy import logical_and as logical_and
Expand Down
2 changes: 1 addition & 1 deletion keras/api/_tf_keras/keras/ops/numpy/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -106,9 +106,9 @@
from keras.src.ops.numpy import less_equal as less_equal
from keras.src.ops.numpy import linspace as linspace
from keras.src.ops.numpy import log as log
from keras.src.ops.numpy import log10 as log10
from keras.src.ops.numpy import log1p as log1p
from keras.src.ops.numpy import log2 as log2
from keras.src.ops.numpy import log10 as log10
from keras.src.ops.numpy import logaddexp as logaddexp
from keras.src.ops.numpy import logaddexp2 as logaddexp2
from keras.src.ops.numpy import logical_and as logical_and
Expand Down
8 changes: 5 additions & 3 deletions keras/api/_tf_keras/keras/preprocessing/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@
since your modifications would be overwritten.
"""

from keras._tf_keras.keras.preprocessing import image as image
from keras._tf_keras.keras.preprocessing import sequence as sequence
from keras._tf_keras.keras.preprocessing import text as text
from keras.src.utils.image_dataset_utils import (
image_dataset_from_directory as image_dataset_from_directory,
)
Expand All @@ -16,3 +13,8 @@
from keras.src.utils.timeseries_dataset_utils import (
timeseries_dataset_from_array as timeseries_dataset_from_array,
)


from keras._tf_keras.keras.preprocessing import image as image
from keras._tf_keras.keras.preprocessing import sequence as sequence
from keras._tf_keras.keras.preprocessing import text as text
12 changes: 7 additions & 5 deletions keras/api/_tf_keras/keras/preprocessing/image/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,13 @@
since your modifications would be overwritten.
"""

from keras.src.utils.image_utils import array_to_img as array_to_img
from keras.src.utils.image_utils import img_to_array as img_to_array
from keras.src.utils.image_utils import load_img as load_img
from keras.src.utils.image_utils import save_img as save_img
from keras.src.utils.image_utils import smart_resize as smart_resize


from keras.src.legacy.preprocessing.image import (
DirectoryIterator as DirectoryIterator,
)
Expand Down Expand Up @@ -35,8 +42,3 @@
from keras.src.legacy.preprocessing.image import random_shear as random_shear
from keras.src.legacy.preprocessing.image import random_shift as random_shift
from keras.src.legacy.preprocessing.image import random_zoom as random_zoom
from keras.src.utils.image_utils import array_to_img as array_to_img
from keras.src.utils.image_utils import img_to_array as img_to_array
from keras.src.utils.image_utils import load_img as load_img
from keras.src.utils.image_utils import save_img as save_img
from keras.src.utils.image_utils import smart_resize as smart_resize
4 changes: 3 additions & 1 deletion keras/api/_tf_keras/keras/preprocessing/sequence/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,13 @@
since your modifications would be overwritten.
"""

from keras.src.utils.sequence_utils import pad_sequences as pad_sequences


from keras.src.legacy.preprocessing.sequence import (
TimeseriesGenerator as TimeseriesGenerator,
)
from keras.src.legacy.preprocessing.sequence import (
make_sampling_table as make_sampling_table,
)
from keras.src.legacy.preprocessing.sequence import skipgrams as skipgrams
from keras.src.utils.sequence_utils import pad_sequences as pad_sequences
4 changes: 2 additions & 2 deletions keras/api/applications/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -72,12 +72,12 @@
)
from keras.src.applications.nasnet import NASNetLarge as NASNetLarge
from keras.src.applications.nasnet import NASNetMobile as NASNetMobile
from keras.src.applications.resnet import ResNet50 as ResNet50
from keras.src.applications.resnet import ResNet101 as ResNet101
from keras.src.applications.resnet import ResNet152 as ResNet152
from keras.src.applications.resnet_v2 import ResNet50V2 as ResNet50V2
from keras.src.applications.resnet import ResNet50 as ResNet50
from keras.src.applications.resnet_v2 import ResNet101V2 as ResNet101V2
from keras.src.applications.resnet_v2 import ResNet152V2 as ResNet152V2
from keras.src.applications.resnet_v2 import ResNet50V2 as ResNet50V2
from keras.src.applications.vgg16 import VGG16 as VGG16
from keras.src.applications.vgg19 import VGG19 as VGG19
from keras.src.applications.xception import Xception as Xception
2 changes: 1 addition & 1 deletion keras/api/applications/resnet/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
since your modifications would be overwritten.
"""

from keras.src.applications.resnet import ResNet50 as ResNet50
from keras.src.applications.resnet import ResNet101 as ResNet101
from keras.src.applications.resnet import ResNet152 as ResNet152
from keras.src.applications.resnet import ResNet50 as ResNet50
from keras.src.applications.resnet import (
decode_predictions as decode_predictions,
)
Expand Down
2 changes: 1 addition & 1 deletion keras/api/applications/resnet_v2/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
since your modifications would be overwritten.
"""

from keras.src.applications.resnet_v2 import ResNet50V2 as ResNet50V2
from keras.src.applications.resnet_v2 import ResNet101V2 as ResNet101V2
from keras.src.applications.resnet_v2 import ResNet152V2 as ResNet152V2
from keras.src.applications.resnet_v2 import ResNet50V2 as ResNet50V2
from keras.src.applications.resnet_v2 import (
decode_predictions as decode_predictions,
)
Expand Down
6 changes: 3 additions & 3 deletions keras/api/initializers/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,6 @@
from keras.src.initializers import deserialize as deserialize
from keras.src.initializers import get as get
from keras.src.initializers import serialize as serialize
from keras.src.initializers.constant_initializers import STFT as STFT
from keras.src.initializers.constant_initializers import STFT as STFTInitializer
from keras.src.initializers.constant_initializers import STFT as stft
from keras.src.initializers.constant_initializers import Constant as Constant
from keras.src.initializers.constant_initializers import Constant as constant
from keras.src.initializers.constant_initializers import Identity as Identity
Expand All @@ -19,6 +16,9 @@
from keras.src.initializers.constant_initializers import Identity as identity
from keras.src.initializers.constant_initializers import Ones as Ones
from keras.src.initializers.constant_initializers import Ones as ones
from keras.src.initializers.constant_initializers import STFT as STFT
from keras.src.initializers.constant_initializers import STFT as STFTInitializer
from keras.src.initializers.constant_initializers import STFT as stft
from keras.src.initializers.constant_initializers import Zeros as Zeros
from keras.src.initializers.constant_initializers import Zeros as zeros
from keras.src.initializers.initializer import Initializer as Initializer
Expand Down
2 changes: 1 addition & 1 deletion keras/api/losses/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@
from keras.src.losses import get as get
from keras.src.losses import serialize as serialize
from keras.src.losses.loss import Loss as Loss
from keras.src.losses.losses import CTC as CTC
from keras.src.losses.losses import BinaryCrossentropy as BinaryCrossentropy
from keras.src.losses.losses import (
BinaryFocalCrossentropy as BinaryFocalCrossentropy,
)
from keras.src.losses.losses import CTC as CTC
from keras.src.losses.losses import (
CategoricalCrossentropy as CategoricalCrossentropy,
)
Expand Down
2 changes: 1 addition & 1 deletion keras/api/ops/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -220,9 +220,9 @@
from keras.src.ops.numpy import less_equal as less_equal
from keras.src.ops.numpy import linspace as linspace
from keras.src.ops.numpy import log as log
from keras.src.ops.numpy import log10 as log10
from keras.src.ops.numpy import log1p as log1p
from keras.src.ops.numpy import log2 as log2
from keras.src.ops.numpy import log10 as log10
from keras.src.ops.numpy import logaddexp as logaddexp
from keras.src.ops.numpy import logaddexp2 as logaddexp2
from keras.src.ops.numpy import logical_and as logical_and
Expand Down
2 changes: 1 addition & 1 deletion keras/api/ops/numpy/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -106,9 +106,9 @@
from keras.src.ops.numpy import less_equal as less_equal
from keras.src.ops.numpy import linspace as linspace
from keras.src.ops.numpy import log as log
from keras.src.ops.numpy import log10 as log10
from keras.src.ops.numpy import log1p as log1p
from keras.src.ops.numpy import log2 as log2
from keras.src.ops.numpy import log10 as log10
from keras.src.ops.numpy import logaddexp as logaddexp
from keras.src.ops.numpy import logaddexp2 as logaddexp2
from keras.src.ops.numpy import logical_and as logical_and
Expand Down
Loading
Loading