Skip to content

Commit 841413e

Browse files
wenyi-guowenyi-guo
committed
fix jax2tf import
1 parent 9e6afa9 commit 841413e

File tree

134 files changed

+872
-2015
lines changed

Some content is hidden

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

134 files changed

+872
-2015
lines changed

‎keras/api/__init__.py‎

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

7+
78
from keras import _tf_keras as _tf_keras
89
from keras import activations as activations
910
from keras import applications as applications
@@ -40,16 +41,10 @@
4041
from keras.src.backend.common.keras_tensor import KerasTensor as KerasTensor
4142
from keras.src.backend.common.remat import RematScope as RematScope
4243
from keras.src.backend.common.remat import remat as remat
43-
from keras.src.backend.common.stateless_scope import (
44-
StatelessScope as StatelessScope,
45-
)
46-
from keras.src.backend.common.symbolic_scope import (
47-
SymbolicScope as SymbolicScope,
48-
)
44+
from keras.src.backend.common.stateless_scope import StatelessScope as StatelessScope
45+
from keras.src.backend.common.symbolic_scope import SymbolicScope as SymbolicScope
4946
from keras.src.dtype_policies.dtype_policy import DTypePolicy as DTypePolicy
50-
from keras.src.dtype_policies.dtype_policy import (
51-
FloatDTypePolicy as FloatDTypePolicy,
52-
)
47+
from keras.src.dtype_policies.dtype_policy import FloatDTypePolicy as FloatDTypePolicy
5348
from keras.src.initializers.initializer import Initializer as Initializer
5449
from keras.src.layers.core.input_layer import Input as Input
5550
from keras.src.layers.input_spec import InputSpec as InputSpec
@@ -63,5 +58,5 @@
6358
from keras.src.optimizers.optimizer import Optimizer as Optimizer
6459
from keras.src.quantizers.quantizers import Quantizer as Quantizer
6560
from keras.src.regularizers.regularizers import Regularizer as Regularizer
66-
from keras.src.version import __version__ as __version__
6761
from keras.src.version import version as version
62+
from keras.src.version import __version__ as __version__

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

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

7+
78
from keras import activations as activations
89
from keras import applications as applications
910
from keras import callbacks as callbacks
@@ -27,27 +28,16 @@
2728
from keras import utils as utils
2829
from keras import visualization as visualization
2930
from keras import wrappers as wrappers
30-
from keras._tf_keras.keras import backend as backend
31-
from keras._tf_keras.keras import layers as layers
32-
from keras._tf_keras.keras import losses as losses
33-
from keras._tf_keras.keras import metrics as metrics
34-
from keras._tf_keras.keras import preprocessing as preprocessing
3531
from keras.src.backend import Variable as Variable
3632
from keras.src.backend import device as device
3733
from keras.src.backend import name_scope as name_scope
3834
from keras.src.backend.common.keras_tensor import KerasTensor as KerasTensor
3935
from keras.src.backend.common.remat import RematScope as RematScope
4036
from keras.src.backend.common.remat import remat as remat
41-
from keras.src.backend.common.stateless_scope import (
42-
StatelessScope as StatelessScope,
43-
)
44-
from keras.src.backend.common.symbolic_scope import (
45-
SymbolicScope as SymbolicScope,
46-
)
37+
from keras.src.backend.common.stateless_scope import StatelessScope as StatelessScope
38+
from keras.src.backend.common.symbolic_scope import SymbolicScope as SymbolicScope
4739
from keras.src.dtype_policies.dtype_policy import DTypePolicy as DTypePolicy
48-
from keras.src.dtype_policies.dtype_policy import (
49-
FloatDTypePolicy as FloatDTypePolicy,
50-
)
40+
from keras.src.dtype_policies.dtype_policy import FloatDTypePolicy as FloatDTypePolicy
5141
from keras.src.initializers.initializer import Initializer as Initializer
5242
from keras.src.layers.core.input_layer import Input as Input
5343
from keras.src.layers.input_spec import InputSpec as InputSpec
@@ -61,5 +51,14 @@
6151
from keras.src.optimizers.optimizer import Optimizer as Optimizer
6252
from keras.src.quantizers.quantizers import Quantizer as Quantizer
6353
from keras.src.regularizers.regularizers import Regularizer as Regularizer
64-
from keras.src.version import __version__ as __version__
6554
from keras.src.version import version as version
55+
from keras.src.version import __version__ as __version__
56+
57+
58+
59+
60+
from keras._tf_keras.keras import backend as backend
61+
from keras._tf_keras.keras import layers as layers
62+
from keras._tf_keras.keras import losses as losses
63+
from keras._tf_keras.keras import metrics as metrics
64+
from keras._tf_keras.keras import preprocessing as preprocessing

‎keras/api/_tf_keras/keras/activations/__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+
78
from keras.src.activations import deserialize as deserialize
89
from keras.src.activations import get as get
910
from keras.src.activations import serialize as serialize

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

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

7+
78
from keras.applications import convnext as convnext
89
from keras.applications import densenet as densenet
910
from keras.applications import efficientnet as efficientnet
@@ -37,47 +38,27 @@
3738
from keras.src.applications.efficientnet import EfficientNetB5 as EfficientNetB5
3839
from keras.src.applications.efficientnet import EfficientNetB6 as EfficientNetB6
3940
from keras.src.applications.efficientnet import EfficientNetB7 as EfficientNetB7
40-
from keras.src.applications.efficientnet_v2 import (
41-
EfficientNetV2B0 as EfficientNetV2B0,
42-
)
43-
from keras.src.applications.efficientnet_v2 import (
44-
EfficientNetV2B1 as EfficientNetV2B1,
45-
)
46-
from keras.src.applications.efficientnet_v2 import (
47-
EfficientNetV2B2 as EfficientNetV2B2,
48-
)
49-
from keras.src.applications.efficientnet_v2 import (
50-
EfficientNetV2B3 as EfficientNetV2B3,
51-
)
52-
from keras.src.applications.efficientnet_v2 import (
53-
EfficientNetV2L as EfficientNetV2L,
54-
)
55-
from keras.src.applications.efficientnet_v2 import (
56-
EfficientNetV2M as EfficientNetV2M,
57-
)
58-
from keras.src.applications.efficientnet_v2 import (
59-
EfficientNetV2S as EfficientNetV2S,
60-
)
61-
from keras.src.applications.inception_resnet_v2 import (
62-
InceptionResNetV2 as InceptionResNetV2,
63-
)
41+
from keras.src.applications.efficientnet_v2 import EfficientNetV2B0 as EfficientNetV2B0
42+
from keras.src.applications.efficientnet_v2 import EfficientNetV2B1 as EfficientNetV2B1
43+
from keras.src.applications.efficientnet_v2 import EfficientNetV2B2 as EfficientNetV2B2
44+
from keras.src.applications.efficientnet_v2 import EfficientNetV2B3 as EfficientNetV2B3
45+
from keras.src.applications.efficientnet_v2 import EfficientNetV2L as EfficientNetV2L
46+
from keras.src.applications.efficientnet_v2 import EfficientNetV2M as EfficientNetV2M
47+
from keras.src.applications.efficientnet_v2 import EfficientNetV2S as EfficientNetV2S
48+
from keras.src.applications.inception_resnet_v2 import InceptionResNetV2 as InceptionResNetV2
6449
from keras.src.applications.inception_v3 import InceptionV3 as InceptionV3
6550
from keras.src.applications.mobilenet import MobileNet as MobileNet
6651
from keras.src.applications.mobilenet_v2 import MobileNetV2 as MobileNetV2
67-
from keras.src.applications.mobilenet_v3 import (
68-
MobileNetV3Large as MobileNetV3Large,
69-
)
70-
from keras.src.applications.mobilenet_v3 import (
71-
MobileNetV3Small as MobileNetV3Small,
72-
)
52+
from keras.src.applications.mobilenet_v3 import MobileNetV3Large as MobileNetV3Large
53+
from keras.src.applications.mobilenet_v3 import MobileNetV3Small as MobileNetV3Small
7354
from keras.src.applications.nasnet import NASNetLarge as NASNetLarge
7455
from keras.src.applications.nasnet import NASNetMobile as NASNetMobile
75-
from keras.src.applications.resnet import ResNet50 as ResNet50
7656
from keras.src.applications.resnet import ResNet101 as ResNet101
7757
from keras.src.applications.resnet import ResNet152 as ResNet152
78-
from keras.src.applications.resnet_v2 import ResNet50V2 as ResNet50V2
58+
from keras.src.applications.resnet import ResNet50 as ResNet50
7959
from keras.src.applications.resnet_v2 import ResNet101V2 as ResNet101V2
8060
from keras.src.applications.resnet_v2 import ResNet152V2 as ResNet152V2
61+
from keras.src.applications.resnet_v2 import ResNet50V2 as ResNet50V2
8162
from keras.src.applications.vgg16 import VGG16 as VGG16
8263
from keras.src.applications.vgg19 import VGG19 as VGG19
8364
from keras.src.applications.xception import Xception as Xception

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

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

7+
78
from keras.src.applications.convnext import ConvNeXtBase as ConvNeXtBase
89
from keras.src.applications.convnext import ConvNeXtLarge as ConvNeXtLarge
910
from keras.src.applications.convnext import ConvNeXtSmall as ConvNeXtSmall
1011
from keras.src.applications.convnext import ConvNeXtTiny as ConvNeXtTiny
1112
from keras.src.applications.convnext import ConvNeXtXLarge as ConvNeXtXLarge
12-
from keras.src.applications.convnext import (
13-
decode_predictions as decode_predictions,
14-
)
13+
from keras.src.applications.convnext import decode_predictions as decode_predictions
1514
from keras.src.applications.convnext import preprocess_input as preprocess_input

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

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

7+
78
from keras.src.applications.densenet import DenseNet121 as DenseNet121
89
from keras.src.applications.densenet import DenseNet169 as DenseNet169
910
from keras.src.applications.densenet import DenseNet201 as DenseNet201
10-
from keras.src.applications.densenet import (
11-
decode_predictions as decode_predictions,
12-
)
11+
from keras.src.applications.densenet import decode_predictions as decode_predictions
1312
from keras.src.applications.densenet import preprocess_input as preprocess_input

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

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

7+
78
from keras.src.applications.efficientnet import EfficientNetB0 as EfficientNetB0
89
from keras.src.applications.efficientnet import EfficientNetB1 as EfficientNetB1
910
from keras.src.applications.efficientnet import EfficientNetB2 as EfficientNetB2
@@ -12,9 +13,5 @@
1213
from keras.src.applications.efficientnet import EfficientNetB5 as EfficientNetB5
1314
from keras.src.applications.efficientnet import EfficientNetB6 as EfficientNetB6
1415
from keras.src.applications.efficientnet import EfficientNetB7 as EfficientNetB7
15-
from keras.src.applications.efficientnet import (
16-
decode_predictions as decode_predictions,
17-
)
18-
from keras.src.applications.efficientnet import (
19-
preprocess_input as preprocess_input,
20-
)
16+
from keras.src.applications.efficientnet import decode_predictions as decode_predictions
17+
from keras.src.applications.efficientnet import preprocess_input as preprocess_input

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

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

7-
from keras.src.applications.efficientnet_v2 import (
8-
EfficientNetV2B0 as EfficientNetV2B0,
9-
)
10-
from keras.src.applications.efficientnet_v2 import (
11-
EfficientNetV2B1 as EfficientNetV2B1,
12-
)
13-
from keras.src.applications.efficientnet_v2 import (
14-
EfficientNetV2B2 as EfficientNetV2B2,
15-
)
16-
from keras.src.applications.efficientnet_v2 import (
17-
EfficientNetV2B3 as EfficientNetV2B3,
18-
)
19-
from keras.src.applications.efficientnet_v2 import (
20-
EfficientNetV2L as EfficientNetV2L,
21-
)
22-
from keras.src.applications.efficientnet_v2 import (
23-
EfficientNetV2M as EfficientNetV2M,
24-
)
25-
from keras.src.applications.efficientnet_v2 import (
26-
EfficientNetV2S as EfficientNetV2S,
27-
)
28-
from keras.src.applications.efficientnet_v2 import (
29-
decode_predictions as decode_predictions,
30-
)
31-
from keras.src.applications.efficientnet_v2 import (
32-
preprocess_input as preprocess_input,
33-
)
7+
8+
from keras.src.applications.efficientnet_v2 import EfficientNetV2B0 as EfficientNetV2B0
9+
from keras.src.applications.efficientnet_v2 import EfficientNetV2B1 as EfficientNetV2B1
10+
from keras.src.applications.efficientnet_v2 import EfficientNetV2B2 as EfficientNetV2B2
11+
from keras.src.applications.efficientnet_v2 import EfficientNetV2B3 as EfficientNetV2B3
12+
from keras.src.applications.efficientnet_v2 import EfficientNetV2L as EfficientNetV2L
13+
from keras.src.applications.efficientnet_v2 import EfficientNetV2M as EfficientNetV2M
14+
from keras.src.applications.efficientnet_v2 import EfficientNetV2S as EfficientNetV2S
15+
from keras.src.applications.efficientnet_v2 import decode_predictions as decode_predictions
16+
from keras.src.applications.efficientnet_v2 import preprocess_input as preprocess_input

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

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

7-
from keras.src.applications.imagenet_utils import (
8-
decode_predictions as decode_predictions,
9-
)
10-
from keras.src.applications.imagenet_utils import (
11-
preprocess_input as preprocess_input,
12-
)
7+
8+
from keras.src.applications.imagenet_utils import decode_predictions as decode_predictions
9+
from keras.src.applications.imagenet_utils import preprocess_input as preprocess_input

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

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

7-
from keras.src.applications.inception_resnet_v2 import (
8-
InceptionResNetV2 as InceptionResNetV2,
9-
)
10-
from keras.src.applications.inception_resnet_v2 import (
11-
decode_predictions as decode_predictions,
12-
)
13-
from keras.src.applications.inception_resnet_v2 import (
14-
preprocess_input as preprocess_input,
15-
)
7+
8+
from keras.src.applications.inception_resnet_v2 import InceptionResNetV2 as InceptionResNetV2
9+
from keras.src.applications.inception_resnet_v2 import decode_predictions as decode_predictions
10+
from keras.src.applications.inception_resnet_v2 import preprocess_input as preprocess_input

0 commit comments

Comments
 (0)