API: make BitGenerators private

12 files changed, 25 insertions, 29 deletions

diff --git a/numpy/random/__init__.py b/numpy/random/__init__.py
index 6a11bee56..169b059b7 100644
--- a/numpy/random/__init__.py
+++ b/numpy/random/__init__.py
@@ -182,14 +182,13 @@ from . import _pickle
 from . import _common
 from . import _bounded_integers
 
-from .mtrand import *
 from .generator import Generator, default_rng
 from .bit_generator import SeedSequence
-from .mt19937 import MT19937
-from .pcg64 import PCG64
-from .philox import Philox
-from .sfc64 import SFC64
-from .mtrand import RandomState
+from ._mt19937 import MT19937
+from ._pcg64 import PCG64
+from ._philox import Philox
+from ._sfc64 import SFC64
+from .mtrand import *
 
 __all__ += ['Generator', 'RandomState', 'SeedSequence', 'MT19937',
             'Philox', 'PCG64', 'SFC64', 'default_rng']
diff --git a/numpy/random/mt19937.pyx b/numpy/random/_mt19937.pyx
index 24d4c19b6..24d4c19b6 100644
--- a/numpy/random/mt19937.pyx
+++ b/numpy/random/_mt19937.pyx
diff --git a/numpy/random/pcg64.pyx b/numpy/random/_pcg64.pyx
index 2886b0c82..2886b0c82 100644
--- a/numpy/random/pcg64.pyx
+++ b/numpy/random/_pcg64.pyx
diff --git a/numpy/random/philox.pyx b/numpy/random/_philox.pyx
index 1dd1972d4..1dd1972d4 100644
--- a/numpy/random/philox.pyx
+++ b/numpy/random/_philox.pyx
diff --git a/numpy/random/_pickle.py b/numpy/random/_pickle.py
index 3b58f21e8..d71cf4311 100644
--- a/numpy/random/_pickle.py
+++ b/numpy/random/_pickle.py
@@ -1,10 +1,10 @@
 from .mtrand import RandomState
-from .philox import Philox
-from .pcg64 import PCG64
-from .sfc64 import SFC64
+from ._philox import Philox
+from ._pcg64 import PCG64
+from ._sfc64 import SFC64
 
 from .generator import Generator
-from .mt19937 import MT19937
+from ._mt19937 import MT19937
 
 BitGenerators = {'MT19937': MT19937,
                  'PCG64': PCG64,
diff --git a/numpy/random/sfc64.pyx b/numpy/random/_sfc64.pyx
index d1b0a0a52..d1b0a0a52 100644
--- a/numpy/random/sfc64.pyx
+++ b/numpy/random/_sfc64.pyx
diff --git a/numpy/random/generator.pyx b/numpy/random/generator.pyx
index 251b673ab..1c23444a4 100644
--- a/numpy/random/generator.pyx
+++ b/numpy/random/generator.pyx
@@ -18,7 +18,7 @@ from ._bounded_integers cimport (_rand_bool, _rand_int32, _rand_int64,
          _rand_int16, _rand_int8, _rand_uint64, _rand_uint32, _rand_uint16,
          _rand_uint8, _gen_mask)
 from ._bounded_integers import _integers_types
-from .pcg64 import PCG64
+from ._pcg64 import PCG64
 from .bit_generator cimport bitgen_t
 from ._common cimport (POISSON_LAM_MAX, CONS_POSITIVE, CONS_NONE,
             CONS_NON_NEGATIVE, CONS_BOUNDED_0_1, CONS_BOUNDED_GT_0_1,
diff --git a/numpy/random/mtrand.pyx b/numpy/random/mtrand.pyx
index e2db73875..8de00eec2 100644
--- a/numpy/random/mtrand.pyx
+++ b/numpy/random/mtrand.pyx
@@ -16,7 +16,7 @@ from ._bounded_integers cimport (_rand_bool, _rand_int32, _rand_int64,
          _rand_int16, _rand_int8, _rand_uint64, _rand_uint32, _rand_uint16,
          _rand_uint8,)
 from ._bounded_integers import _integers_types
-from .mt19937 import MT19937 as _MT19937
+from ._mt19937 import MT19937 as _MT19937
 from .bit_generator cimport bitgen_t
 from ._common cimport (POISSON_LAM_MAX, CONS_POSITIVE, CONS_NONE,
             CONS_NON_NEGATIVE, CONS_BOUNDED_0_1, CONS_BOUNDED_GT_0_1, CONS_GTE_1,
diff --git a/numpy/random/setup.py b/numpy/random/setup.py
index 20025e5b0..463f483cd 100644
--- a/numpy/random/setup.py
+++ b/numpy/random/setup.py
@@ -61,28 +61,28 @@ def configuration(parent_package='', top_path=None):
 
     for gen in ['mt19937']:
         # gen.pyx, src/gen/gen.c, src/gen/gen-jump.c
-        config.add_extension(gen,
-                             sources=['{0}.c'.format(gen),
+        config.add_extension('_{0}'.format(gen),
+                             sources=['_{0}.c'.format(gen),
                                       'src/{0}/{0}.c'.format(gen),
                                       'src/{0}/{0}-jump.c'.format(gen)],
                              include_dirs=['.', 'src', join('src', gen)],
                              libraries=EXTRA_LIBRARIES,
                              extra_compile_args=EXTRA_COMPILE_ARGS,
                              extra_link_args=EXTRA_LINK_ARGS,
-                             depends=['%s.pyx' % gen],
+                             depends=['_%s.pyx' % gen],
                              define_macros=defs,
                              )
     for gen in ['philox', 'pcg64', 'sfc64']:
         # gen.pyx, src/gen/gen.c
         _defs = defs + PCG64_DEFS if gen == 'pcg64' else defs
-        config.add_extension(gen,
-                             sources=['{0}.c'.format(gen),
+        config.add_extension('_{0}'.format(gen),
+                             sources=['_{0}.c'.format(gen),
                                       'src/{0}/{0}.c'.format(gen)],
                              include_dirs=['.', 'src', join('src', gen)],
                              libraries=EXTRA_LIBRARIES,
                              extra_compile_args=EXTRA_COMPILE_ARGS,
                              extra_link_args=EXTRA_LINK_ARGS,
-                             depends=['%s.pyx' % gen, 'bit_generator.pyx',
+                             depends=['_%s.pyx' % gen, 'bit_generator.pyx',
                                       'bit_generator.pxd'],
                              define_macros=_defs,
                              )
@@ -130,11 +130,11 @@ def configuration(parent_package='', top_path=None):
     config.add_data_files('_bounded_integers.pxd')
     config.add_data_files('_common.pxd')
     # config.add_data_files('generator.pxd')
-    # config.add_data_files('mt19937.pxd')
-    # config.add_data_files('mtrand.pxd')
-    # config.add_data_files('pcg64.pxd')
-    # config.add_data_files('philox.pxd')
-    # config.add_data_files('sfc64.pxd')
+    # config.add_data_files('_mt19937.pxd')
+    # config.add_data_files('_mtrand.pxd')
+    # config.add_data_files('_pcg64.pxd')
+    # config.add_data_files('_philox.pxd')
+    # config.add_data_files('_sfc64.pxd')
     return config
 
 
diff --git a/numpy/random/tests/test_randomstate.py b/numpy/random/tests/test_randomstate.py
index a0edc5c23..5131f1839 100644
--- a/numpy/random/tests/test_randomstate.py
+++ b/numpy/random/tests/test_randomstate.py
@@ -11,7 +11,8 @@ from numpy.testing import (
         suppress_warnings
         )
 
-from numpy.random import MT19937, PCG64, mtrand as random
+from numpy.random import MT19937, PCG64
+from numpy import random
 
 INT_FUNCS = {'binomial': (100.0, 0.6),
              'geometric': (.5,),
diff --git a/numpy/random/tests/test_randomstate_regression.py b/numpy/random/tests/test_randomstate_regression.py
index edf32ea97..bdc2214b6 100644
--- a/numpy/random/tests/test_randomstate_regression.py
+++ b/numpy/random/tests/test_randomstate_regression.py
@@ -8,7 +8,7 @@ from numpy.testing import (
 from numpy.compat import long
 import numpy as np
 
-from numpy.random import mtrand as random
+from numpy import random
 
 
 class TestRegression(object):
diff --git a/numpy/tests/test_public_api.py b/numpy/tests/test_public_api.py
index 409d7e28e..8afcede0b 100644
--- a/numpy/tests/test_public_api.py
+++ b/numpy/tests/test_public_api.py
@@ -300,11 +300,7 @@ PRIVATE_BUT_PRESENT_MODULES = ['numpy.' + s for s in [
     "matrixlib.defmatrix",
     "random.bit_generator",
     "random.generator",
-    "random.mt19937",
     "random.mtrand",
-    "random.pcg64",
-    "random.philox",
-    "random.sfc64",
     "testing.print_coercion_tables",
     "testing.utils",
 ]]