diff --git a/keras_core/backend/jax/__init__.py b/keras_core/backend/jax/__init__.py index 881538f12..c1f8b00f9 100644 --- a/keras_core/backend/jax/__init__.py +++ b/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 diff --git a/keras_core/backend/keras_tensor.py b/keras_core/backend/keras_tensor.py index ca90641a1..90a686073 100644 --- a/keras_core/backend/keras_tensor.py +++ b/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 diff --git a/keras_core/backend/tensorflow/__init__.py b/keras_core/backend/tensorflow/__init__.py index 387efe8a6..7d8843590 100644 --- a/keras_core/backend/tensorflow/__init__.py +++ b/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 diff --git a/keras_core/backend/tensorflow/trainer.py b/keras_core/backend/tensorflow/trainer.py index ce24cc4c8..73fa32c48 100644 --- a/keras_core/backend/tensorflow/trainer.py +++ b/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 diff --git a/keras_core/engine/__init__.py b/keras_core/engine/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/keras_core/layers/layer.py b/keras_core/layers/layer.py index 8fe395c93..09cb19348 100644 --- a/keras_core/layers/layer.py +++ b/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 diff --git a/keras_core/losses/loss.py b/keras_core/losses/loss.py index f74dfaadc..79e5b2d4a 100644 --- a/keras_core/losses/loss.py +++ b/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: diff --git a/keras_core/metrics/metric.py b/keras_core/metrics/metric.py index c03792f36..c0c5d4c1f 100644 --- a/keras_core/metrics/metric.py +++ b/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: diff --git a/keras_core/models/functional.py b/keras_core/models/functional.py index 0037919dc..eeafcd27d 100644 --- a/keras_core/models/functional.py +++ b/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 diff --git a/keras_core/engine/model.py b/keras_core/models/model.py similarity index 100% rename from keras_core/engine/model.py rename to keras_core/models/model.py diff --git a/keras_core/operations/function.py b/keras_core/operations/function.py index 97bf0ee6a..3a2e885c0 100644 --- a/keras_core/operations/function.py +++ b/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 diff --git a/keras_core/engine/function_test.py b/keras_core/operations/function_test.py similarity index 100% rename from keras_core/engine/function_test.py rename to keras_core/operations/function_test.py diff --git a/keras_core/engine/node.py b/keras_core/operations/node.py similarity index 98% rename from keras_core/engine/node.py rename to keras_core/operations/node.py index b4b20486a..7a58805b7 100644 --- a/keras_core/engine/node.py +++ b/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: diff --git a/keras_core/operations/numpy.py b/keras_core/operations/numpy.py index 9c64303a1..efdb4d51a 100644 --- a/keras_core/operations/numpy.py +++ b/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 diff --git a/keras_core/engine/operation.py b/keras_core/operations/operation.py similarity index 97% rename from keras_core/engine/operation.py rename to keras_core/operations/operation.py index 8735bf800..e3a7cd8c5 100644 --- a/keras_core/engine/operation.py +++ b/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 diff --git a/keras_core/engine/operation_test.py b/keras_core/operations/operation_test.py similarity index 99% rename from keras_core/engine/operation_test.py rename to keras_core/operations/operation_test.py index e7ba4374d..79be189b5 100644 --- a/keras_core/engine/operation_test.py +++ b/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 diff --git a/keras_core/engine/symbolic_arguments.py b/keras_core/operations/symbolic_arguments.py similarity index 100% rename from keras_core/engine/symbolic_arguments.py rename to keras_core/operations/symbolic_arguments.py diff --git a/keras_core/optimizers/optimizer.py b/keras_core/optimizers/optimizer.py index 948265dff..a886d8739 100644 --- a/keras_core/optimizers/optimizer.py +++ b/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 diff --git a/keras_core/engine/trainer.py b/keras_core/trainers/trainer.py similarity index 100% rename from keras_core/engine/trainer.py rename to keras_core/trainers/trainer.py diff --git a/keras_core/engine/naming.py b/keras_core/utils/naming.py similarity index 100% rename from keras_core/engine/naming.py rename to keras_core/utils/naming.py diff --git a/keras_core/engine/tracking.py b/keras_core/utils/tracking.py similarity index 100% rename from keras_core/engine/tracking.py rename to keras_core/utils/tracking.py diff --git a/keras_core/engine/tracking_test.py b/keras_core/utils/tracking_test.py similarity index 100% rename from keras_core/engine/tracking_test.py rename to keras_core/utils/tracking_test.py