Merge engine namespace into specialized namespaces.

keras_core/backend/jax/__init__.py

@@ -3,7 +3,7 @@ import numpy as np
 from keras_core.backend.common import KerasVariable
 from keras_core.backend.common import standardize_dtype
 from keras_core.backend.keras_tensor import KerasTensor
-from keras_core.engine.naming import auto_name
+from keras_core.utils.naming import auto_name
 from keras_core.backend.common import in_stateless_scope
 from keras_core.backend.common import get_stateless_scope
 from keras_core.backend.common import StatelessScope

keras_core/backend/keras_tensor.py

@@ -1,4 +1,4 @@
-from keras_core.engine.naming import auto_name
+from keras_core.utils.naming import auto_name
 from tensorflow import nest
 
 

keras_core/backend/tensorflow/__init__.py

@@ -3,7 +3,7 @@ from tensorflow.experimental import numpy as tfnp
 from keras_core.backend.common import KerasVariable
 from keras_core.backend.common import standardize_dtype
 from keras_core.backend.keras_tensor import KerasTensor
-from keras_core.engine.naming import auto_name
+from keras_core.utils.naming import auto_name
 from keras_core.backend.tensorflow.trainer import Trainer
 from keras_core.backend.common import in_stateless_scope
 from keras_core.backend.common import get_stateless_scope

keras_core/backend/tensorflow/trainer.py

@@ -1,4 +1,4 @@
-from keras_core.engine import trainer
+from keras_core.trainers import trainer
 import tensorflow as tf
 
 

keras_core/layers/layer.py

@@ -14,10 +14,10 @@ And some more magic:
 - metric tracking
 - RNG seed tracking
 """
-from keras_core.engine.operation import Operation
+from keras_core.operations.operation import Operation
 from keras_core.backend import KerasTensor
 from keras_core import backend
-from keras_core.engine.tracking import Tracker
+from keras_core.utils.tracking import Tracker
 from keras_core.metrics.metric import Metric
 from keras_core import utils
 from keras_core.layers import input_spec

keras_core/losses/loss.py

@@ -1,6 +1,6 @@
 from keras_core import operations as ops
 from keras_core import backend
-from keras_core.engine.naming import auto_name
+from keras_core.utils.naming import auto_name
 
 
 class Loss:

keras_core/metrics/metric.py

@@ -1,6 +1,6 @@
 from keras_core import backend
-from keras_core.engine.tracking import Tracker
-from keras_core.engine.naming import auto_name
+from keras_core.utils.tracking import Tracker
+from keras_core.utils.naming import auto_name
 
 
 class Metric:

keras_core/models/functional.py

@@ -1,5 +1,5 @@
 from keras_core.operations.function import Function
-from keras_core.engine.model import Model
+from keras_core.models.model import Model
 from keras_core.layers.layer import Layer
 
 

keras_core/operations/function.py

@@ -1,6 +1,6 @@
 from keras_core.backend import KerasTensor
-from keras_core.engine.operation import Operation
-from keras_core.engine.naming import auto_name
+from keras_core.operations.operation import Operation
+from keras_core.utils.naming import auto_name
 from tensorflow import nest
 import collections
 

keras_core/operations/node.py

@@ -1,7 +1,7 @@
 import collections
 from tensorflow import nest
 from keras_core.backend import KerasTensor
-from keras_core.engine.symbolic_arguments import SymbolicArguments
+from keras_core.operations.symbolic_arguments import SymbolicArguments
 
 
 class Node:

keras_core/operations/numpy.py

@@ -20,8 +20,8 @@ ones
 from keras_core.backend import KerasTensor
 from keras_core.backend import any_symbolic_tensors
 from keras_core.backend import convert_to_tensor
-from keras_core.engine.symbolic_arguments import SymbolicArguments
-from keras_core.engine.operation import Operation
+from keras_core.operations.symbolic_arguments import SymbolicArguments
+from keras_core.operations.operation import Operation
 from keras_core import backend
 
 from tensorflow import nest

keras_core/operations/operation.py

@@ -1,6 +1,6 @@
 from keras_core.backend.keras_tensor import any_symbolic_tensors
-from keras_core.engine.node import Node
-from keras_core.engine.naming import auto_name
+from keras_core.operations.node import Node
+from keras_core.utils.naming import auto_name
 from keras_core import backend
 
 

keras_core/operations/operation_test.py

@@ -1,4 +1,4 @@
-from keras_core.engine import operation
+from keras_core.operations import operation
 from keras_core.engine import keras_tensor
 from keras_core.operations import numpy as knp
 from keras_core import backend

keras_core/optimizers/optimizer.py

@@ -1,9 +1,9 @@
 from keras_core import backend
 from keras_core import operations as ops
-from keras_core.engine.tracking import Tracker
+from keras_core.utils.tracking import Tracker
 from keras_core import initializers
 from keras_core.optimizers.schedules import learning_rate_schedule
-from keras_core.engine.naming import auto_name
+from keras_core.utils.naming import auto_name
 import re
 import warnings