chore: pre-commit fix and actually match mkl_fft

Author: jharlow-intel

.pylintrc

@@ -25,55 +25,15 @@
 
 """Define functions for patching NumPy with MKL-based NumPy interface."""
 
+import warnings
 from contextlib import ContextDecorator
 from threading import Lock, local
 
 import numpy as _np
 
-from . import mklrand as _mr
-
-
-_DEFAULT_NAMES = (
-    # Legacy seeding / state
-    "seed",
-    "get_state",
-    "set_state",
-    "RandomState",
-    # Common global sampling helpers
-    "random",
-    "random_sample",
-    "sample",
-    "rand",
-    "randn",
-    "bytes",
-    # Integers
-    "randint",
-    # Common distributions (only patched if present on both sides)
-    "standard_normal",
-    "normal",
-    "uniform",
-    "exponential",
-    "gamma",
-    "beta",
-    "chisquare",
-    "f",
-    "lognormal",
-    "laplace",
-    "logistic",
-    "multivariate_normal",
-    "poisson",
-    "power",
-    "rayleigh",
-    "triangular",
-    "vonmises",
-    "wald",
-    "weibull",
-    "zipf",
-    # Permutations / choices
-    "choice",
-    "permutation",
-    "shuffle",
-)
+import mkl_random.interfaces.numpy_random as _nrand
+
+_DEFAULT_NAMES = tuple(_nrand.__all__)
 
 
 class _GlobalPatch:
@@ -131,16 +91,16 @@ def _initialize_patch(self, numpy_module, names, strict):
             if name not in self._patched_functions:
                 missing.append(name)
                 continue
-            if not hasattr(np_random, name) or not hasattr(_mr, name):
+            if not hasattr(np_random, name) or not hasattr(_nrand, name):
                 missing.append(name)
                 continue
             patchable.append(name)
 
         if strict and missing:
             raise AttributeError(
                 "Could not patch these names (missing on numpy.random or "
-                "mkl_random.mklrand): "
-                + ", ".join([str(x) for x in missing])
+                "mkl_random.interfaces.numpy_random): "
+                + ", ".join(str(x) for x in missing)
             )
 
         self._numpy_module = numpy_module
@@ -174,7 +134,7 @@ def do_patch(
                         "https://github.com/IntelPython/mkl_random"
                     )
                 for name in self._active_names:
-                    self._register_func(name, getattr(_mr, name))
+                    self._register_func(name, getattr(_nrand, name))
             else:
                 if self._numpy_module is not numpy_module:
                     raise RuntimeError(
@@ -194,9 +154,10 @@ def do_restore(self, verbose=False):
             local_count = getattr(self._tls, "local_count", 0)
             if local_count <= 0:
                 if verbose:
-                    print(
+                    warnings.warn(
                         "Warning: restore_numpy_random called more times than "
-                        "patch_numpy_random in this thread."
+                        "patch_numpy_random in this thread.",
+                        stacklevel=2,
                     )
                 return
 
@@ -279,16 +240,12 @@ def restore_numpy_random(verbose=False):
 
 
 def is_patched():
-    """
-    Returns whether NumPy has been patched with mkl_random.
-    """
+    """Return whether NumPy has been patched with mkl_random."""
     return _patch.is_patched()
 
 
 def patched_names():
-    """
-    Returns the names actually patched in `numpy.random`.
-    """
+    """Return names actually patched in `numpy.random`."""
     return _patch.patched_names()
 
 

mkl_random/_patch_numpy.py

@@ -135,10 +135,10 @@ def test_patch_redundant_patching():
         mkl_random.patch_numpy_random(np)
         mkl_random.patch_numpy_random(np)
         assert mkl_random.is_patched()
-        assert np.random.normal is mkl_random.mklrand.normal
+        assert np.random.normal is mkl_random.normal
         mkl_random.restore_numpy_random()
         assert mkl_random.is_patched()
-        assert np.random.normal is mkl_random.mklrand.normal
+        assert np.random.normal is mkl_random.normal
         mkl_random.restore_numpy_random()
         assert not mkl_random.is_patched()
         assert np.random.normal is orig_normal