From ffa1f81b9ebce39682ea597b89ba6422f9d2b97b Mon Sep 17 00:00:00 2001 From: Haifeng Jin <5476582+haifeng-jin@users.noreply.github.com> Date: Thu, 27 Apr 2023 17:51:32 -0700 Subject: [PATCH] re-enable imports checks (#51) --- jax_training_scratchpad.py | 1 - keras_core/backend/__init__.py | 4 ++-- keras_core/backend/config.py | 2 -- keras_core/callbacks/progbar_logger.py | 2 -- keras_core/initializers/initializer.py | 2 -- keras_core/losses/losses_test.py | 1 - keras_core/metrics/accuracy_metrics.py | 1 - keras_core/metrics/confusion_metrics.py | 1 - keras_core/metrics/hinge_metrics.py | 3 --- keras_core/metrics/hinge_metrics_test.py | 1 - keras_core/metrics/regression_metrics.py | 3 --- keras_core/metrics/regression_metrics_test.py | 1 - keras_core/operations/__init__.py | 4 ++-- keras_core/operations/nn_test.py | 1 - keras_core/trainers/data_adapters/tf_dataset_adapter_test.py | 1 - keras_core/utils/summary_utils.py | 1 - setup.cfg | 3 +-- 17 files changed, 5 insertions(+), 27 deletions(-) diff --git a/jax_training_scratchpad.py b/jax_training_scratchpad.py index 6da5404d0..fc2a5947a 100644 --- a/jax_training_scratchpad.py +++ b/jax_training_scratchpad.py @@ -1,6 +1,5 @@ import jax import numpy as np -from jax import numpy as jnp from keras_core import backend from keras_core import initializers diff --git a/keras_core/backend/__init__.py b/keras_core/backend/__init__.py index 4a669e5d7..381f18869 100644 --- a/keras_core/backend/__init__.py +++ b/keras_core/backend/__init__.py @@ -23,9 +23,9 @@ from keras_core.utils.io_utils import print_msg # Import backend functions. if backend() == "tensorflow": print_msg("Using TensorFlow backend") - from keras_core.backend.tensorflow import * + from keras_core.backend.tensorflow import * # noqa: F403 elif backend() == "jax": print_msg("Using JAX backend.") - from keras_core.backend.jax import * + from keras_core.backend.jax import * # noqa: F403 else: raise ValueError(f"Unable to import backend : {backend()}") diff --git a/keras_core/backend/config.py b/keras_core/backend/config.py index c5abfefb3..232c01cba 100644 --- a/keras_core/backend/config.py +++ b/keras_core/backend/config.py @@ -1,8 +1,6 @@ import json import os -from keras_core.utils.io_utils import print_msg - # The type of float to use throughout a session. _FLOATX = "float32" diff --git a/keras_core/callbacks/progbar_logger.py b/keras_core/callbacks/progbar_logger.py index ceed41ded..fe3c49f04 100644 --- a/keras_core/callbacks/progbar_logger.py +++ b/keras_core/callbacks/progbar_logger.py @@ -1,5 +1,3 @@ -import copy - from keras_core.api_export import keras_core_export from keras_core.callbacks.callback import Callback from keras_core.utils import io_utils diff --git a/keras_core/initializers/initializer.py b/keras_core/initializers/initializer.py index 77fc8562c..02f78ac2e 100644 --- a/keras_core/initializers/initializer.py +++ b/keras_core/initializers/initializer.py @@ -1,5 +1,3 @@ -import warnings - from keras_core.api_export import keras_core_export diff --git a/keras_core/losses/losses_test.py b/keras_core/losses/losses_test.py index 407501490..015afa2bd 100644 --- a/keras_core/losses/losses_test.py +++ b/keras_core/losses/losses_test.py @@ -1,6 +1,5 @@ import numpy as np -from keras_core import operations as ops from keras_core import testing from keras_core.losses import losses diff --git a/keras_core/metrics/accuracy_metrics.py b/keras_core/metrics/accuracy_metrics.py index 3175eb733..c14b42c94 100644 --- a/keras_core/metrics/accuracy_metrics.py +++ b/keras_core/metrics/accuracy_metrics.py @@ -1,7 +1,6 @@ from keras_core import backend from keras_core import operations as ops from keras_core.api_export import keras_core_export -from keras_core.backend import floatx from keras_core.losses.loss import squeeze_to_same_rank from keras_core.metrics import reduction_metrics diff --git a/keras_core/metrics/confusion_metrics.py b/keras_core/metrics/confusion_metrics.py index 3b7ad5d22..0b9aea486 100644 --- a/keras_core/metrics/confusion_metrics.py +++ b/keras_core/metrics/confusion_metrics.py @@ -1,6 +1,5 @@ from keras_core import backend from keras_core import initializers -from keras_core import operations as ops from keras_core.api_export import keras_core_export from keras_core.metrics import metrics_utils from keras_core.metrics.metric import Metric diff --git a/keras_core/metrics/hinge_metrics.py b/keras_core/metrics/hinge_metrics.py index 0458cd4e7..881aa1a4f 100644 --- a/keras_core/metrics/hinge_metrics.py +++ b/keras_core/metrics/hinge_metrics.py @@ -1,11 +1,8 @@ -from keras_core import operations as ops from keras_core.api_export import keras_core_export -from keras_core.losses import losses from keras_core.losses.losses import categorical_hinge from keras_core.losses.losses import hinge from keras_core.losses.losses import squared_hinge from keras_core.metrics import reduction_metrics -from keras_core.metrics.metric import Metric @keras_core_export("keras_core.metrics.Hinge") diff --git a/keras_core/metrics/hinge_metrics_test.py b/keras_core/metrics/hinge_metrics_test.py index fe368f106..e4aa66c18 100644 --- a/keras_core/metrics/hinge_metrics_test.py +++ b/keras_core/metrics/hinge_metrics_test.py @@ -1,6 +1,5 @@ import numpy as np -from keras_core import operations as ops from keras_core import testing from keras_core.metrics import hinge_metrics diff --git a/keras_core/metrics/regression_metrics.py b/keras_core/metrics/regression_metrics.py index 05f511c28..ae6dcabf8 100644 --- a/keras_core/metrics/regression_metrics.py +++ b/keras_core/metrics/regression_metrics.py @@ -1,9 +1,6 @@ -from keras_core import operations as ops from keras_core.api_export import keras_core_export -from keras_core.losses import losses from keras_core.losses.losses import mean_squared_error from keras_core.metrics import reduction_metrics -from keras_core.metrics.metric import Metric @keras_core_export("keras_core.metrics.MeanSquaredError") diff --git a/keras_core/metrics/regression_metrics_test.py b/keras_core/metrics/regression_metrics_test.py index 1768a4b6e..475437807 100644 --- a/keras_core/metrics/regression_metrics_test.py +++ b/keras_core/metrics/regression_metrics_test.py @@ -1,6 +1,5 @@ import numpy as np -from keras_core import operations as ops from keras_core import testing from keras_core.metrics import regression_metrics diff --git a/keras_core/operations/__init__.py b/keras_core/operations/__init__.py index c1fb0a983..2d393e0ad 100644 --- a/keras_core/operations/__init__.py +++ b/keras_core/operations/__init__.py @@ -9,5 +9,5 @@ from keras_core.backend import is_tensor from keras_core.backend import name_scope from keras_core.backend import random from keras_core.backend import shape -from keras_core.operations.nn import * -from keras_core.operations.numpy import * +from keras_core.operations.nn import * # noqa: F403 +from keras_core.operations.numpy import * # noqa: F403 diff --git a/keras_core/operations/nn_test.py b/keras_core/operations/nn_test.py index decfcc09b..4c9181cc7 100644 --- a/keras_core/operations/nn_test.py +++ b/keras_core/operations/nn_test.py @@ -1,7 +1,6 @@ import numpy as np import pytest import tensorflow as tf -from tensorflow.python.ops.numpy_ops import np_config from keras_core import testing from keras_core.backend import backend diff --git a/keras_core/trainers/data_adapters/tf_dataset_adapter_test.py b/keras_core/trainers/data_adapters/tf_dataset_adapter_test.py index 884720e68..4c89b15d9 100644 --- a/keras_core/trainers/data_adapters/tf_dataset_adapter_test.py +++ b/keras_core/trainers/data_adapters/tf_dataset_adapter_test.py @@ -1,7 +1,6 @@ import numpy as np import tensorflow as tf -from keras_core import backend from keras_core import testing from keras_core.trainers.data_adapters import tf_dataset_adapter diff --git a/keras_core/utils/summary_utils.py b/keras_core/utils/summary_utils.py index 7453e140c..e2aa51ba1 100644 --- a/keras_core/utils/summary_utils.py +++ b/keras_core/utils/summary_utils.py @@ -1,6 +1,5 @@ import math import re -import string from tensorflow import nest diff --git a/setup.cfg b/setup.cfg index 8c763769d..354135a19 100644 --- a/setup.cfg +++ b/setup.cfg @@ -36,8 +36,6 @@ ignore = N812 # do not use bare 'except' E722 - # wildcard imports - F401,F403 # too many "#" E266 @@ -49,6 +47,7 @@ exclude = per-file-ignores = # import not used **/__init__.py:F401 + **/random.py:F401 # TODO: remove the following files when long lines are reformatted. keras_core/trainers/trainer.py:E501 keras_core/trainers/epoch_iterator.py:E501