Skip to content

Commit 1fa75a0

Browse files
authored
Merge branch 'keras-team:master' into master
2 parents 323ca8d + 10b51ce commit 1fa75a0

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+3384
-101
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ __pycache__
66
**/.vscode test/**
77
**/.vscode-smoke/**
88
**/.venv*/
9+
venv
910
bin/**
1011
build/**
1112
obj/**

keras/api/__init__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
from keras import config as config
1313
from keras import constraints as constraints
1414
from keras import datasets as datasets
15+
from keras import distillation as distillation
1516
from keras import distribution as distribution
1617
from keras import dtype_policies as dtype_policies
1718
from keras import export as export

keras/api/_tf_keras/keras/__init__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
from keras import config as config
1111
from keras import constraints as constraints
1212
from keras import datasets as datasets
13+
from keras import distillation as distillation
1314
from keras import distribution as distribution
1415
from keras import dtype_policies as dtype_policies
1516
from keras import export as export
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
"""DO NOT EDIT.
2+
3+
This file was autogenerated. Do not edit it by hand,
4+
since your modifications would be overwritten.
5+
"""
6+
7+
from keras.src.distillation.distillation_loss import (
8+
DistillationLoss as DistillationLoss,
9+
)
10+
from keras.src.distillation.distillation_loss import (
11+
FeatureDistillation as FeatureDistillation,
12+
)
13+
from keras.src.distillation.distillation_loss import (
14+
LogitsDistillation as LogitsDistillation,
15+
)
16+
from keras.src.distillation.distiller import Distiller as Distiller

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,9 @@
7373
from keras.src.layers.core.input_layer import InputLayer as InputLayer
7474
from keras.src.layers.core.lambda_layer import Lambda as Lambda
7575
from keras.src.layers.core.masking import Masking as Masking
76+
from keras.src.layers.core.reversible_embedding import (
77+
ReversibleEmbedding as ReversibleEmbedding,
78+
)
7679
from keras.src.layers.core.wrapper import Wrapper as Wrapper
7780
from keras.src.layers.input_spec import InputSpec as InputSpec
7881
from keras.src.layers.layer import Layer as Layer

keras/api/_tf_keras/keras/ops/__init__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -286,6 +286,7 @@
286286
from keras.src.ops.numpy import tile as tile
287287
from keras.src.ops.numpy import trace as trace
288288
from keras.src.ops.numpy import transpose as transpose
289+
from keras.src.ops.numpy import trapezoid as trapezoid
289290
from keras.src.ops.numpy import tri as tri
290291
from keras.src.ops.numpy import tril as tril
291292
from keras.src.ops.numpy import triu as triu

keras/api/_tf_keras/keras/ops/image/__init__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
from keras.src.ops.image import crop_images as crop_images
99
from keras.src.ops.image import elastic_transform as elastic_transform
1010
from keras.src.ops.image import extract_patches as extract_patches
11+
from keras.src.ops.image import extract_patches_3d as extract_patches_3d
1112
from keras.src.ops.image import gaussian_blur as gaussian_blur
1213
from keras.src.ops.image import hsv_to_rgb as hsv_to_rgb
1314
from keras.src.ops.image import map_coordinates as map_coordinates

keras/api/_tf_keras/keras/ops/numpy/__init__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,7 @@
172172
from keras.src.ops.numpy import tile as tile
173173
from keras.src.ops.numpy import trace as trace
174174
from keras.src.ops.numpy import transpose as transpose
175+
from keras.src.ops.numpy import trapezoid as trapezoid
175176
from keras.src.ops.numpy import tri as tri
176177
from keras.src.ops.numpy import tril as tril
177178
from keras.src.ops.numpy import triu as triu

keras/api/distillation/__init__.py

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
"""DO NOT EDIT.
2+
3+
This file was autogenerated. Do not edit it by hand,
4+
since your modifications would be overwritten.
5+
"""
6+
7+
from keras.src.distillation.distillation_loss import (
8+
DistillationLoss as DistillationLoss,
9+
)
10+
from keras.src.distillation.distillation_loss import (
11+
FeatureDistillation as FeatureDistillation,
12+
)
13+
from keras.src.distillation.distillation_loss import (
14+
LogitsDistillation as LogitsDistillation,
15+
)
16+
from keras.src.distillation.distiller import Distiller as Distiller

keras/api/layers/__init__.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,9 @@
7373
from keras.src.layers.core.input_layer import InputLayer as InputLayer
7474
from keras.src.layers.core.lambda_layer import Lambda as Lambda
7575
from keras.src.layers.core.masking import Masking as Masking
76+
from keras.src.layers.core.reversible_embedding import (
77+
ReversibleEmbedding as ReversibleEmbedding,
78+
)
7679
from keras.src.layers.core.wrapper import Wrapper as Wrapper
7780
from keras.src.layers.input_spec import InputSpec as InputSpec
7881
from keras.src.layers.layer import Layer as Layer

0 commit comments

Comments
 (0)