diff --git a/numpyro/distributions/util.py b/numpyro/distributions/util.py index 36d2b2938..956a5cd3f 100644 --- a/numpyro/distributions/util.py +++ b/numpyro/distributions/util.py @@ -13,7 +13,6 @@ import jax from jax import Array, jit, lax, random, vmap -from jax.core import Tracer import jax.numpy as jnp from jax.scipy.linalg import solve_triangular from jax.scipy.special import digamma @@ -298,7 +297,7 @@ def _multinomial(key, p, n, n_max, shape=()): def multinomial(key, p, n, shape=(), total_count_max=None): if total_count_max is None: - if isinstance(n, Tracer): + if not not_jax_tracer(n): raise ValueError( "Please specify total_count_max in Multinomial distribution." ) diff --git a/numpyro/infer/reparam.py b/numpyro/infer/reparam.py index 783318ed1..d1f69ed43 100644 --- a/numpyro/infer/reparam.py +++ b/numpyro/infer/reparam.py @@ -7,7 +7,6 @@ import numpy as np -import jax import jax.numpy as jnp import numpyro @@ -92,7 +91,7 @@ class LocScaleReparam(Reparam): def __init__(self, centered=None, shape_params=()): assert centered is None or isinstance( - centered, (int, float, np.generic, np.ndarray, jnp.ndarray, jax.core.Tracer) + centered, (int, float, np.generic, np.ndarray, jnp.ndarray) ) assert isinstance(shape_params, (tuple, list)) assert all(isinstance(name, str) for name in shape_params) diff --git a/test/infer/test_reparam.py b/test/infer/test_reparam.py index 9d2854684..3f3fad6fe 100644 --- a/test/infer/test_reparam.py +++ b/test/infer/test_reparam.py @@ -7,7 +7,7 @@ from numpy.testing import assert_allclose import pytest -from jax import jacobian, lax, random +from jax import jacobian, jit, lax, random import jax.numpy as jnp import numpyro @@ -591,3 +591,12 @@ def run(config): return mcmc.get_samples()["x"].mean(0) assert_allclose(run({"x": reparam}), run({}), atol=0.15) + + +def test_loc_scale_traced_centered(): + @jit + def f(centered): + reparam = LocScaleReparam(centered) + return reparam.centered + + assert f(jnp.array(0.5)) == 0.5 diff --git a/test/test_distributions_util.py b/test/test_distributions_util.py index 9616b9645..b37bfceb6 100644 --- a/test/test_distributions_util.py +++ b/test/test_distributions_util.py @@ -473,3 +473,14 @@ def test_promote_shapes_array_like(): assert y.shape == (1,) assert x.shape == (3,) assert_allclose(y.todense(), jnp.array([2.0])) + + +def test_multinomial_traced_n_requires_total_count_max(): + p = jnp.array([0.2, 0.3, 0.5]) + + @jax.jit + def f(n): + return multinomial(random.key(0), p, n) + + with pytest.raises(ValueError, match="total_count_max"): + f(jnp.array(10))