Merge pull request #378 from bashtage/remove-cimport-all

Remove cimport all
bashtage · Sep 30, 2024 · 578219d · 578219d
2 parents ab8661a + a8517fb
commit 578219d
Show file tree

Hide file tree

Showing 54 changed files with 235 additions and 126 deletions.
diff --git a/randomgen/aes.pxd b/randomgen/aes.pxd
@@ -1,5 +1,18 @@
 # cython: binding=True, language_level=3
-from randomgen.common cimport *
+
+cimport numpy as np
+from libc.stdint cimport uint8_t, uint32_t, uint64_t
+
+from randomgen.common cimport (
+    BitGenerator,
+    PyArray_calloc_aligned,
+    PyArray_free_aligned,
+    fully_qualified_name,
+    int_to_array,
+    object_to_int,
+    uint64_to_double,
+    wrap_int,
+)
 
 
 cdef extern from "src/aesctr/aesctr.h":

diff --git a/randomgen/aes.pyx b/randomgen/aes.pyx
@@ -1,7 +1,6 @@
 #!python
 import numpy as np
 
-from randomgen.common cimport *
 from randomgen._deprecated_value import _DeprecatedValue
 
 __all__ = ["AESCounter"]

diff --git a/randomgen/bounded_integers.pyx.in b/randomgen/bounded_integers.pyx.in
@@ -3,9 +3,6 @@
 
 import numpy as np
 
-cimport numpy as np
-
-from randomgen.distributions cimport *
 from randomgen cimport api
 
 __all__ = []

diff --git a/randomgen/chacha.pxd b/randomgen/chacha.pxd
@@ -1,6 +1,17 @@
 # cython: binding=True, language_level=3
 
-from randomgen.common cimport *
+cimport numpy as np
+from libc.stdint cimport uint32_t, uint64_t
+
+from randomgen.common cimport (
+    BitGenerator,
+    PyArray_free_aligned,
+    PyArray_malloc_aligned,
+    fully_qualified_name,
+    int_to_array,
+    object_to_int,
+    view_little_endian,
+)
 
 
 cdef extern from "src/chacha/chacha.h":

diff --git a/randomgen/chacha.pyx b/randomgen/chacha.pyx
@@ -1,8 +1,6 @@
 #!python
 import numpy as np
 
-from randomgen.common cimport *
-
 from randomgen._deprecated_value import _DeprecatedValue
 
 __all__ = ["ChaCha"]

diff --git a/randomgen/common.pyx b/randomgen/common.pyx
@@ -17,7 +17,7 @@ from cpython cimport PyFloat_AsDouble
 from numpy.random.bit_generator cimport BitGenerator as _BitGenerator
 
 from randomgen cimport api
-from randomgen.common cimport *
+
 
 from randomgen._deprecated_value import _DeprecatedValue
 from randomgen.seed_sequence import ISeedSequence

diff --git a/randomgen/dsfmt.pxd b/randomgen/dsfmt.pxd
@@ -1,5 +1,15 @@
 # cython: binding=True, language_level=3
-from randomgen.common cimport *
+cimport numpy as np
+from libc.stdint cimport uint32_t, uint64_t
+
+from randomgen.common cimport (
+    BitGenerator,
+    PyArray_calloc_aligned,
+    PyArray_free_aligned,
+    PyArray_malloc_aligned,
+    check_state_array,
+    fully_qualified_name,
+)
 
 DEF DSFMT_MEXP = 19937
 DEF DSFMT_N = 191  # ((DSFMT_MEXP - 128) / 104 + 1)

diff --git a/randomgen/dsfmt.pyx b/randomgen/dsfmt.pyx
@@ -2,9 +2,8 @@
 import operator
 
 import numpy as np
-cimport numpy as np
+
 from randomgen._deprecated_value import _DeprecatedValue
-from randomgen.common cimport *
 
 __all__ = ["DSFMT"]
 

diff --git a/randomgen/efiix64.pxd b/randomgen/efiix64.pxd
@@ -1,6 +1,14 @@
 # cython: binding=True, language_level=3
 
-from randomgen.common cimport *
+cimport numpy as np
+from libc.stdint cimport uint32_t, uint64_t
+
+from randomgen.common cimport (
+    BitGenerator,
+    check_state_array,
+    fully_qualified_name,
+    uint64_to_double,
+)
 
 DEF INDIRECTION_SIZE = 16
 DEF ITERATION_SIZE = 32

diff --git a/randomgen/efiix64.pyx b/randomgen/efiix64.pyx
@@ -1,8 +1,5 @@
 #!python
 import numpy as np
-cimport numpy as np
-
-from randomgen.common cimport *
 
 DEF INDIRECTION_SIZE = 16
 DEF ITERATION_SIZE = 32

diff --git a/randomgen/hc128.pxd b/randomgen/hc128.pxd
@@ -1,6 +1,16 @@
 # cython: binding=True, language_level=3
 # coding=utf-8
-from randomgen.common cimport *
+cimport numpy as np
+from libc.stdint cimport uint32_t, uint64_t
+
+from randomgen.common cimport (
+    BitGenerator,
+    check_state_array,
+    fully_qualified_name,
+    int_to_array,
+    object_to_int,
+    view_little_endian,
+)
 
 
 cdef extern from "src/hc-128/hc-128.h":

diff --git a/randomgen/hc128.pyx b/randomgen/hc128.pyx
@@ -1,9 +1,7 @@
 #!python
 # coding=utf-8
 import numpy as np
-cimport numpy as np
 
-from randomgen.common cimport *
 from randomgen._deprecated_value import _DeprecatedValue
 
 __all__ = ["HC128"]

diff --git a/randomgen/jsf.pxd b/randomgen/jsf.pxd
@@ -1,6 +1,9 @@
 # cython: binding=True, language_level=3
 
-from randomgen.common cimport *
+cimport numpy as np
+from libc.stdint cimport uint32_t, uint64_t
+
+from randomgen.common cimport BitGenerator, fully_qualified_name, uint64_to_double
 
 
 cdef extern from "src/jsf/jsf.h":

diff --git a/randomgen/jsf.pyx b/randomgen/jsf.pyx
@@ -2,9 +2,8 @@
 
 
 import numpy as np
-cimport numpy as np
+
 from randomgen._deprecated_value import _DeprecatedValue
-from randomgen.common cimport *
 
 __all__ = ["JSF"]
 

diff --git a/randomgen/legacy/bounded_integers.pyx.in b/randomgen/legacy/bounded_integers.pyx.in
@@ -5,8 +5,6 @@ import numpy as np
 
 cimport numpy as np
 
-from randomgen.legacy.distributions cimport *
-
 np.import_array()
 
 _integers_types = {"bool": (0, 2),

diff --git a/randomgen/lxm.pxd b/randomgen/lxm.pxd
@@ -1,6 +1,14 @@
 # cython: binding=True, language_level=3
 
-from randomgen.common cimport *
+cimport numpy as np
+from libc.stdint cimport uint32_t, uint64_t
+
+from randomgen.common cimport (
+    BitGenerator,
+    check_state_array,
+    fully_qualified_name,
+    uint64_to_double,
+)
 
 
 cdef extern from "src/lxm/lxm.h":

diff --git a/randomgen/lxm.pyx b/randomgen/lxm.pyx
@@ -2,9 +2,6 @@
 
 # coding=utf-8
 import numpy as np
-cimport numpy as np
-
-from randomgen.common cimport *
 
 __all__ = ["LXM"]
 

diff --git a/randomgen/mt19937.pxd b/randomgen/mt19937.pxd
@@ -1,4 +1,7 @@
-from randomgen.common cimport *
+cimport numpy as np
+from libc.stdint cimport uint32_t, uint64_t
+
+from randomgen.common cimport BitGenerator, check_state_array, fully_qualified_name
 
 
 cdef extern from "src/mt19937/mt19937.h":

diff --git a/randomgen/mt19937.pyx b/randomgen/mt19937.pyx
@@ -5,9 +5,8 @@
 import operator
 
 import numpy as np
-cimport numpy as np
+
 from randomgen._deprecated_value import _DeprecatedValue
-from randomgen.common cimport *
 
 __all__ = ["MT19937"]
 

diff --git a/randomgen/mt64.pxd b/randomgen/mt64.pxd
@@ -1,6 +1,14 @@
 # cython: binding=True, language_level=3
 
-from randomgen.common cimport *
+cimport numpy as np
+from libc.stdint cimport uint32_t, uint64_t
+
+from randomgen.common cimport (
+    BitGenerator,
+    check_state_array,
+    fully_qualified_name,
+    uint64_to_double,
+)
 
 
 cdef extern from "src/mt64/mt64.h":

diff --git a/randomgen/mt64.pyx b/randomgen/mt64.pyx
@@ -4,9 +4,7 @@
 import operator
 
 import numpy as np
-cimport numpy as np
 
-from randomgen.common cimport *
 from randomgen._deprecated_value import _DeprecatedValue
 
 __all__ = ["MT64"]

diff --git a/randomgen/mtrand.pyx b/randomgen/mtrand.pyx
@@ -1,41 +1,8 @@
 #!python
 #cython: wraparound=False, nonecheck=False, boundscheck=False, cdivision=True, language_level=3
-import operator
-from typing import MutableSequence
-import warnings
-
-import numpy as np
-
-from randomgen.bounded_integers import _integers_types
-from randomgen.mt19937 import MT19937 as _MT19937
-
-cimport cython
-from cpython cimport Py_INCREF, PyFloat_AsDouble
-from cpython.pycapsule cimport PyCapsule_GetPointer, PyCapsule_IsValid
-from libc cimport string
-
-from randomgen cimport api
-from randomgen.common cimport *
-from randomgen.distributions cimport *
-from randomgen.legacy.bounded_integers cimport *
-from randomgen.legacy.distributions cimport *
 
 from typing import Any, Callable
 
-np.import_array()
-
-cdef object int64_to_long(object x):
-    """
-    Convert int64 to long for legacy compatibility, which used long for integer
-    distributions
-    """
-    cdef int64_t x64
-
-    if np.isscalar(x):
-        x64 = x
-        return <long>x64
-    return x.astype("l", casting="unsafe")
-
 
 cdef class RandomState:
     """

diff --git a/randomgen/pcg32.pxd b/randomgen/pcg32.pxd
@@ -1,4 +1,7 @@
-from randomgen.common cimport *
+cimport numpy as np
+from libc.stdint cimport uint32_t, uint64_t
+
+from randomgen.common cimport BitGenerator, fully_qualified_name, wrap_int
 
 
 cdef extern from "src/pcg32/pcg32.h":

diff --git a/randomgen/pcg32.pyx b/randomgen/pcg32.pyx
@@ -2,9 +2,7 @@
 #cython: binding=True
 
 import numpy as np
-cimport numpy as np
 
-from randomgen.common cimport *
 from randomgen._deprecated_value import _DeprecatedValue
 
 __all__ = ["PCG32"]

diff --git a/randomgen/pcg64.pxd b/randomgen/pcg64.pxd
@@ -1,4 +1,14 @@
-from randomgen.common cimport *
+cimport numpy as np
+from libc.stdint cimport uint32_t, uint64_t
+
+from randomgen.common cimport (
+    BitGenerator,
+    PyArray_free_aligned,
+    PyArray_malloc_aligned,
+    fully_qualified_name,
+    uint64_to_double,
+    wrap_int,
+)
 
 
 cdef extern from "src/pcg64/pcg64-common.h":

diff --git a/randomgen/pcg64.pyx b/randomgen/pcg64.pyx
@@ -2,9 +2,7 @@
 #cython: binding=True
 
 import numpy as np
-cimport numpy as np
 
-from randomgen.common cimport *
 from randomgen._deprecated_value import _DeprecatedValue
 
 __all__ = ["PCG64", "LCG128Mix", "PCG64DXSM"]

diff --git a/randomgen/philox.pxd b/randomgen/philox.pxd
@@ -1,5 +1,17 @@
+cimport numpy as np
 from libc.stdint cimport uint32_t, uint64_t
 
+from randomgen.common cimport (
+    BitGenerator,
+    check_state_array,
+    fully_qualified_name,
+    int_to_array,
+    object_to_int,
+    uint64_to_double,
+    view_little_endian,
+    wrap_int,
+)
+
 
 cdef extern from "src/philox/philox.h":
     struct s_r123array1x32:

diff --git a/randomgen/philox.pxd.in b/randomgen/philox.pxd.in
@@ -1,5 +1,17 @@
+cimport numpy as np
 from libc.stdint cimport uint32_t, uint64_t
 
+from randomgen.common cimport (
+    BitGenerator,
+    check_state_array,
+    fully_qualified_name,
+    int_to_array,
+    object_to_int,
+    uint64_to_double,
+    view_little_endian,
+    wrap_int,
+)
+
 {{
 py:
 N = (1, 2, 4)

diff --git a/randomgen/philox.pyx b/randomgen/philox.pyx
@@ -3,7 +3,6 @@
 
 import numpy as np
 
-from randomgen.common cimport *
 from randomgen._deprecated_value import _DeprecatedValue
 
 __all__ = ["Philox"]

diff --git a/randomgen/rdrand.pxd b/randomgen/rdrand.pxd
@@ -1,4 +1,7 @@
-from randomgen.common cimport *
+cimport numpy as np
+from libc.stdint cimport uint32_t, uint64_t
+
+from randomgen.common cimport BitGenerator, fully_qualified_name, uint64_to_double
 
 DEF BUFFER_SIZE = 256