Rename SMC files

pymc-devs · Oct 29, 2022 · bcffce2 · bcffce2
1 parent 7fb3623
commit bcffce2
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 9 deletions.
diff --git a/docs/source/api/smc.rst b/docs/source/api/smc.rst
@@ -12,7 +12,7 @@ Sequential Monte Carlo
 SMC kernels
 -----------
 
-.. currentmodule:: pymc.smc.smc
+.. currentmodule:: pymc.smc.kernels
 .. autosummary::
    :toctree: generated/
 

diff --git a/pymc/smc/__init__.py b/pymc/smc/__init__.py
@@ -12,4 +12,7 @@
 #   See the License for the specific language governing permissions and
 #   limitations under the License.
 
-from pymc.smc.sample_smc import sample_smc
+from pymc.smc.kernels import IMH, MH
+from pymc.smc.sampling import sample_smc
+
+__all__ = ("sample_smc",)
diff --git a/pymc/smc/smc.py → pymc/smc/kernels.py b/pymc/smc/smc.py → pymc/smc/kernels.py
diff --git a/pymc/smc/sample_smc.py → pymc/smc/sampling.py b/pymc/smc/sample_smc.py → pymc/smc/sampling.py
@@ -33,7 +33,7 @@
 from pymc.backends.base import MultiTrace
 from pymc.model import modelcontext
 from pymc.parallel_sampling import _cpu_count
-from pymc.smc.smc import IMH
+from pymc.smc.kernels import IMH
 
 
 def sample_smc(

diff --git a/pymc/tests/distributions/test_simulator.py b/pymc/tests/distributions/test_simulator.py
@@ -31,7 +31,7 @@
 from pymc import floatX
 from pymc.aesaraf import compile_pymc
 from pymc.initial_point import make_initial_point_fn
-from pymc.smc.smc import IMH
+from pymc.smc.kernels import IMH
 from pymc.tests.helpers import SeededTest
 
 

diff --git a/pymc/tests/smc/test_smc.py b/pymc/tests/smc/test_smc.py
@@ -24,7 +24,7 @@
 
 from pymc.aesaraf import floatX
 from pymc.backends.base import MultiTrace
-from pymc.smc.smc import IMH
+from pymc.smc.kernels import IMH, systematic_resampling
 from pymc.tests.helpers import SeededTest, assert_random_state_equal
 
 
@@ -291,6 +291,6 @@ def test_proposal_dist_shape(self):
 def test_systematic():
     rng = np.random.default_rng(seed=34)
     weights = [0.33, 0.33, 0.33]
-    np.testing.assert_array_equal(pm.smc.systematic_resampling(weights, rng), [0, 1, 2])
+    np.testing.assert_array_equal(systematic_resampling(weights, rng), [0, 1, 2])
     weights = [0.99, 0.01]
-    np.testing.assert_array_equal(pm.smc.systematic_resampling(weights, rng), [0, 0])
+    np.testing.assert_array_equal(systematic_resampling(weights, rng), [0, 0])
diff --git a/scripts/run_mypy.py b/scripts/run_mypy.py
@@ -53,8 +53,8 @@
 pymc/plots/__init__.py
 pymc/sampling.py
 pymc/smc/__init__.py
-pymc/smc/sample_smc.py
-pymc/smc/smc.py
+pymc/smc/sampling.py
+pymc/smc/kernels.py
 pymc/stats/__init__.py
 pymc/stats/convergence.py
 pymc/step_methods/__init__.py