Added isort to pre-commit config (#1451)

* Added isort to pre-commit config

* Added isort badge to README.md

Author: antonwolfy

.git-blame-ignore-revs

@@ -5,3 +5,6 @@ b0cd5f85c9b0c2705359fee3a3f4f3feda53bfa0
 
 # Add black to pre-commit config
 88981b5ae1c99f9b64758db44dfb39f2c20b10db
+
+# Add clang-format to pre-commit config
+ae755b57a9aeeb09435594aa7f6a04bf4cdc55fa

.pre-commit-config.yaml

@@ -28,6 +28,17 @@ repos:
     hooks:
     -   id: black
         args: ["--check", "--diff", "--color"]
+-   repo: https://github.com/pycqa/isort
+    rev: 5.12.0
+    hooks:
+    -   id: isort
+        name: isort (python)
+    -   id: isort
+        name: isort (cython)
+        types: [cython]
+    -   id: isort
+        name: isort (pyi)
+        types: [pyi]
 -   repo: https://github.com/pocc/pre-commit-hooks
     rev: v1.3.5
     hooks:

README.md

@@ -1,4 +1,5 @@
 [![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
+[![Imports: isort](https://img.shields.io/badge/%20imports-isort-%231674b1?style=flat&labelColor=ef8336)](https://pycqa.github.io/isort/)
 [![Pre-commit](https://github.com/IntelPython/dpnp/actions/workflows/pre-commit.yml/badge.svg?branch=master&event=push)](https://github.com/IntelPython/dpnp/actions/workflows/pre-commit.yml)
 [![Conda package](https://github.com/IntelPython/dpnp/actions/workflows/conda-package.yml/badge.svg?branch=master&event=push)](https://github.com/IntelPython/dpnp/actions/workflows/conda-package.yml)
 [![Coverage Status](https://coveralls.io/repos/github/IntelPython/dpnp/badge.svg?branch=master)](https://coveralls.io/github/IntelPython/dpnp?branch=master)

benchmarks/benchmarks/bench_elementwise.py

@@ -1,5 +1,7 @@
 import numpy
+
 import dpnp
+
 from .common import Benchmark
 
 

benchmarks/benchmarks/bench_linalg.py

@@ -1,8 +1,9 @@
-from .common import Benchmark, get_squares_, get_indexes_rand, TYPES1
-
 import numpy
+
 import dpnp
 
+from .common import TYPES1, Benchmark, get_indexes_rand, get_squares_
+
 
 class Eindot(Benchmark):
     params = [

benchmarks/benchmarks/bench_random.py

@@ -1,5 +1,7 @@
 import numpy
+
 import dpnp
+
 from .common import Benchmark
 
 

benchmarks/benchmarks/common.py

@@ -1,6 +1,7 @@
-import numpy
 import random
 
+import numpy
+
 # Various pre-crafted datasets/variables for testing
 # !!! Must not be changed -- only appended !!!
 # while testing numpy we better not rely on numpy to produce random

benchmarks/pytest_benchmark/test_random.py

@@ -25,10 +25,10 @@
 # THE POSSIBILITY OF SUCH DAMAGE.
 # *****************************************************************************
 
+import numpy as np
 import pytest
 
 import dpnp
-import numpy as np
 
 ROUNDS = 30
 ITERATIONS = 4

dpnp/__init__.py

@@ -51,11 +51,9 @@
 
 from dpnp.dpnp_array import dpnp_array as ndarray
 from dpnp.dpnp_flatiter import flatiter as flatiter
-
 from dpnp.dpnp_iface_types import *
 from dpnp.dpnp_iface import *
 from dpnp.dpnp_iface import __all__ as _iface__all__
 from dpnp.version import __version__
 
-
 __all__ = _iface__all__

dpnp/config.py

@@ -27,7 +27,6 @@
 
 import os
 
-
 __DPNP_ORIGIN__ = int(os.getenv("DPNP_ORIGIN", 0))
 """
 Explicitly use original host Python NumPy

dpnp/dparray.pyx

@@ -38,7 +38,12 @@ import warnings
 
 from libcpp cimport bool as cpp_bool
 
-from dpnp.dpnp_iface_types import *
+import numpy
+
+# to avoid interference with Python internal functions
+from dpnp.dpnp_iface import get_dpnp_descriptor as iface_get_dpnp_descriptor
+from dpnp.dpnp_iface import prod as iface_prod
+from dpnp.dpnp_iface import sum as iface_sum
 
 # It's prohibeted to use 'import *' from 'dpnp.dpnp_iface_arraycreation' module here,
 # because module has 'array' function, but cython has already imported 'array' by default.
@@ -79,33 +84,31 @@ from dpnp.dpnp_iface_arraycreation import (
     triu,
     vander,
     zeros,
-    zeros_like
+    zeros_like,
 )
 from dpnp.dpnp_iface_bitwise import *
 from dpnp.dpnp_iface_counting import *
 from dpnp.dpnp_iface_indexing import *
 from dpnp.dpnp_iface_libmath import *
 from dpnp.dpnp_iface_linearalgebra import *
 from dpnp.dpnp_iface_logic import *
+from dpnp.dpnp_iface_logic import all, any  # TODO do the same as for iface_sum
 from dpnp.dpnp_iface_manipulation import *
 from dpnp.dpnp_iface_mathematical import *
 from dpnp.dpnp_iface_searching import *
 from dpnp.dpnp_iface_sorting import *
 from dpnp.dpnp_iface_statistics import *
+from dpnp.dpnp_iface_statistics import (  # TODO do the same as for iface_sum
+    max,
+    min,
+)
 from dpnp.dpnp_iface_trigonometric import *
+from dpnp.dpnp_iface_types import *
 
-# to avoid interference with Python internal functions
-from dpnp.dpnp_iface import sum as iface_sum
-from dpnp.dpnp_iface import prod as iface_prod
-from dpnp.dpnp_iface import get_dpnp_descriptor as iface_get_dpnp_descriptor
-
-from dpnp.dpnp_iface_statistics import min, max  # TODO do the same as for iface_sum
-from dpnp.dpnp_iface_logic import all, any  # TODO do the same as for iface_sum
-import numpy
 cimport numpy
 
-from dpnp.dpnp_algo cimport *
 cimport dpnp.dpnp_utils as utils
+from dpnp.dpnp_algo cimport *
 
 
 # initially copied from original

dpnp/dpnp_algo/dpnp_algo.pxd

@@ -25,12 +25,11 @@
 # THE POSSIBILITY OF SUCH DAMAGE.
 # *****************************************************************************
 cimport dpctl as c_dpctl
-
 from libcpp cimport bool as cpp_bool
 
+from dpnp.dpnp_algo cimport shape_elem_type, shape_type_c
 from dpnp.dpnp_utils.dpnp_algo_utils cimport dpnp_descriptor
 
-from dpnp.dpnp_algo cimport shape_elem_type, shape_type_c
 
 cdef extern from "dpnp_iface_fptr.hpp" namespace "DPNPFuncName":  # need this namespace for Enum import
     cdef enum DPNPFuncName "DPNPFuncName":

dpnp/dpnp_algo/dpnp_algo.pyx

@@ -35,22 +35,23 @@ and the rest of the library
 
 from libc.time cimport time, time_t
 from libcpp.vector cimport vector
+
+import dpctl
+
 import dpnp
 import dpnp.config as config
 import dpnp.dpnp_container as dpnp_container
 import dpnp.dpnp_utils as utils_py
 from dpnp.dpnp_array import dpnp_array
 
-import dpctl
-
 cimport cpython
-cimport dpnp.dpnp_utils as utils
-
 cimport numpy
-import numpy
+
+cimport dpnp.dpnp_utils as utils
 
 import operator
 
+import numpy
 
 __all__ = [
     "dpnp_astype",

dpnp/dpnp_algo/dpnp_elementwise_common.py

@@ -27,17 +27,15 @@
 # *****************************************************************************
 
 
-import dpnp
-from dpnp.dpnp_array import dpnp_array
-import dpnp.backend.extensions.vm._vm_impl as vmi
-
-from dpctl.tensor._elementwise_common import BinaryElementwiseFunc
-import dpctl.tensor._tensor_impl as ti
-import dpctl.tensor as dpt
 import dpctl
-
+import dpctl.tensor as dpt
+import dpctl.tensor._tensor_impl as ti
 import numpy
+from dpctl.tensor._elementwise_common import BinaryElementwiseFunc
 
+import dpnp
+import dpnp.backend.extensions.vm._vm_impl as vmi
+from dpnp.dpnp_array import dpnp_array
 
 __all__ = ["dpnp_add", "dpnp_divide", "dpnp_multiply", "dpnp_subtract"]
 

dpnp/dpnp_container.py

@@ -34,12 +34,11 @@
 """
 
 
-import dpctl.utils as dpu
 import dpctl.tensor as dpt
+import dpctl.utils as dpu
 
-from dpnp.dpnp_array import dpnp_array
 import dpnp
-
+from dpnp.dpnp_array import dpnp_array
 
 __all__ = [
     "arange",

dpnp/dpnp_iface.py

@@ -40,17 +40,17 @@
 """
 
 
-import os
-import numpy
-import numpy.lib.stride_tricks as np_st
-import dpnp.config as config
 import collections
+import os
 
 import dpctl
 import dpctl.tensor as dpt
+import numpy
+import numpy.lib.stride_tricks as np_st
 
-from dpnp.dpnp_array import dpnp_array
+import dpnp.config as config
 from dpnp.dpnp_algo import *
+from dpnp.dpnp_array import dpnp_array
 from dpnp.dpnp_utils import *
 from dpnp.fft import *
 from dpnp.linalg import *
@@ -73,34 +73,32 @@
     "is_supported_array_type",
 ]
 
-from dpnp import isscalar, float64
-
+from dpnp import float64, isscalar
 from dpnp.dpnp_iface_arraycreation import *
-from dpnp.dpnp_iface_bitwise import *
-from dpnp.dpnp_iface_counting import *
-from dpnp.dpnp_iface_indexing import *
-from dpnp.dpnp_iface_libmath import *
-from dpnp.dpnp_iface_linearalgebra import *
-from dpnp.dpnp_iface_logic import *
-from dpnp.dpnp_iface_manipulation import *
-from dpnp.dpnp_iface_mathematical import *
-from dpnp.dpnp_iface_searching import *
-from dpnp.dpnp_iface_sorting import *
-from dpnp.dpnp_iface_statistics import *
-from dpnp.dpnp_iface_trigonometric import *
-
 from dpnp.dpnp_iface_arraycreation import __all__ as __all__arraycreation
+from dpnp.dpnp_iface_bitwise import *
 from dpnp.dpnp_iface_bitwise import __all__ as __all__bitwise
+from dpnp.dpnp_iface_counting import *
 from dpnp.dpnp_iface_counting import __all__ as __all__counting
+from dpnp.dpnp_iface_indexing import *
 from dpnp.dpnp_iface_indexing import __all__ as __all__indexing
+from dpnp.dpnp_iface_libmath import *
 from dpnp.dpnp_iface_libmath import __all__ as __all__libmath
+from dpnp.dpnp_iface_linearalgebra import *
 from dpnp.dpnp_iface_linearalgebra import __all__ as __all__linearalgebra
+from dpnp.dpnp_iface_logic import *
 from dpnp.dpnp_iface_logic import __all__ as __all__logic
+from dpnp.dpnp_iface_manipulation import *
 from dpnp.dpnp_iface_manipulation import __all__ as __all__manipulation
+from dpnp.dpnp_iface_mathematical import *
 from dpnp.dpnp_iface_mathematical import __all__ as __all__mathematical
+from dpnp.dpnp_iface_searching import *
 from dpnp.dpnp_iface_searching import __all__ as __all__searching
+from dpnp.dpnp_iface_sorting import *
 from dpnp.dpnp_iface_sorting import __all__ as __all__sorting
+from dpnp.dpnp_iface_statistics import *
 from dpnp.dpnp_iface_statistics import __all__ as __all__statistics
+from dpnp.dpnp_iface_trigonometric import *
 from dpnp.dpnp_iface_trigonometric import __all__ as __all__trigonometric
 
 __all__ += __all__arraycreation

dpnp/dpnp_iface_arraycreation.py

@@ -40,19 +40,18 @@
 """
 
 
-import numpy
-import dpnp
 import operator
 
+import dpctl
+import dpctl.tensor as dpt
+import numpy
+
+import dpnp
 import dpnp.config as config
+import dpnp.dpnp_container as dpnp_container
 from dpnp.dpnp_algo import *
 from dpnp.dpnp_utils import *
 
-import dpnp.dpnp_container as dpnp_container
-import dpctl.tensor as dpt
-import dpctl
-
-
 __all__ = [
     "arange",
     "array",

dpnp/dpnp_iface_bitwise.py

@@ -40,13 +40,12 @@
 """
 
 
-from dpnp.dpnp_algo import *
-from dpnp.dpnp_utils import *
-import dpnp
-
-import numpy
 import dpctl.tensor as dpt
+import numpy
 
+import dpnp
+from dpnp.dpnp_algo import *
+from dpnp.dpnp_utils import *
 
 __all__ = [
     "bitwise_and",

dpnp/dpnp_iface_counting.py

@@ -40,13 +40,12 @@
 """
 
 
-import dpnp
 import numpy
 
+import dpnp
 import dpnp.config as config
-from dpnp.dpnp_utils import *
-
 from dpnp.dpnp_algo.dpnp_algo import *  # TODO need to investigate why dpnp.dpnp_algo can not be used
+from dpnp.dpnp_utils import *
 
 __all__ = ["count_nonzero"]
 

dpnp/dpnp_iface_indexing.py

@@ -39,15 +39,13 @@
 
 """
 
-from dpnp.dpnp_algo import *
-from dpnp.dpnp_utils import *
+import dpctl.tensor as dpt
+import numpy
 
 import dpnp
+from dpnp.dpnp_algo import *
 from dpnp.dpnp_array import dpnp_array
-
-import numpy
-import dpctl.tensor as dpt
-
+from dpnp.dpnp_utils import *
 
 __all__ = [
     "choose",

dpnp/dpnp_iface_libmath.py

@@ -41,9 +41,9 @@
 
 import math
 
+import dpnp
 from dpnp.dpnp_algo import *
 from dpnp.dpnp_utils import *
-import dpnp
 
 __all__ = ["erf"]