Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pre-commit.ci] pre-commit autoupdate #299

Merged
merged 2 commits into from
Jan 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.3.0
rev: v4.5.0
hooks:
- id: check-merge-conflict
- id: check-toml
Expand All @@ -11,28 +11,28 @@ repos:
args: [--branch, main]
- id: trailing-whitespace
- repo: https://github.com/PyCQA/isort
rev: 5.12.0
rev: 5.13.2
hooks:
- id: isort
name: isort
- repo: https://github.com/asottile/pyupgrade
rev: v2.37.1
rev: v3.15.0
hooks:
- id: pyupgrade
args: [--py37-plus]
- repo: https://github.com/psf/black
rev: 22.6.0
rev: 23.12.1
hooks:
- id: black
- id: black-jupyter
- repo: https://github.com/PyCQA/pylint
rev: v2.14.5
rev: v3.0.3
hooks:
- id: pylint
args: [--rcfile=.pylintrc]
files: ^pymc_experimental/
- repo: https://github.com/MarcoGorelli/madforhooks
rev: 0.3.0
rev: 0.4.1
hooks:
- id: no-print-statements
exclude: _version.py
Expand Down
1 change: 0 additions & 1 deletion notebooks/discrete_markov_chain.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -568,7 +568,6 @@
" ar_coefs = pm.Normal(\"coefs\", size=order, dims=[\"ar_params\"])\n",
"\n",
" def AR_step(s, L1_s, L2_s, L3_s, L4_s, L1_y, L2_y, L3_y, L4_y, mus, phis):\n",
"\n",
" y_out = (\n",
" mus[s]\n",
" + phis[0] * (L1_y - mus[L1_s])\n",
Expand Down
1 change: 0 additions & 1 deletion pymc_experimental/inference/pathfinder.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ def convert_flat_trace_to_idata(
postprocessing_backend="cpu",
model=None,
):

model = modelcontext(model)
ip = model.initial_point()
ip_point_map_info = pm.blocking.DictToArrayBijection.map(ip).point_map_info
Expand Down
1 change: 0 additions & 1 deletion pymc_experimental/statespace/filters/utilities.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ def split_vars_into_seq_and_nonseq(params, param_names):
seq_names, non_seq_names = [], []

for param, name in zip(params, param_names):

if decide_if_x_time_varies(param, name):
sequences.append(param)
seq_names.append(name)
Expand Down
1 change: 0 additions & 1 deletion pymc_experimental/statespace/models/VARMAX.py
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,6 @@ def __init__(
measurement_error: bool = False,
verbose=True,
):

if (endog_names is None) and (k_endog is None):
raise ValueError("Must specify either endog_names or k_endog")
if (endog_names is not None) and (k_endog is None):
Expand Down
1 change: 0 additions & 1 deletion pymc_experimental/statespace/models/structural.py
Original file line number Diff line number Diff line change
Expand Up @@ -1534,7 +1534,6 @@ def _get_state_names(self, k_exog, state_names, name):
return k_exog, state_names

def _handle_input_data(self, k_exog: int, state_names: Optional[List[str]], name) -> int:

k_exog, state_names = self._get_state_names(k_exog, state_names, name)
self.state_names = state_names

Expand Down
7 changes: 6 additions & 1 deletion pymc_experimental/tests/model/test_marginal_model.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,12 @@ def test_marginalized_bernoulli_logp():

idx = pm.Bernoulli.dist(0.7, name="idx")
y = pm.Normal.dist(mu=mu[idx], sigma=1.0, name="y")
marginal_rv_node = FiniteDiscreteMarginalRV([mu], [idx, y], ndim_supp=None, n_updates=0,)(
marginal_rv_node = FiniteDiscreteMarginalRV(
[mu],
[idx, y],
ndim_supp=None,
n_updates=0,
)(
mu
)[0].owner

Expand Down
4 changes: 2 additions & 2 deletions pymc_experimental/tests/statespace/test_SARIMAX.py
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,7 @@ def test_interpretable_states_are_interpretable(arima_mod_interp, pymc_mod_inter
ma_lags = prior.prior.coords["ma_lag"].values - 1

# Check the first p states are lags of the previous state
for (t, tm1) in zip(ar_lags[1:], ar_lags[:-1]):
for t, tm1 in zip(ar_lags[1:], ar_lags[:-1]):
assert_allclose(
prior_outputs.prior_latent.isel(state=t).values[1:],
prior_outputs.prior_latent.isel(state=tm1).values[:-1],
Expand All @@ -348,7 +348,7 @@ def test_interpretable_states_are_interpretable(arima_mod_interp, pymc_mod_inter

# Check the next p+q states are lags of the innovations
n = len(ar_lags)
for (t, tm1) in zip(ma_lags[1:], ma_lags[:-1]):
for t, tm1 in zip(ma_lags[1:], ma_lags[:-1]):
assert_allclose(
prior_outputs.prior_latent.isel(state=n + t).values[1:],
prior_outputs.prior_latent.isel(state=n + tm1).values[:-1],
Expand Down
8 changes: 4 additions & 4 deletions pymc_experimental/tests/statespace/test_structural.py
Original file line number Diff line number Diff line change
Expand Up @@ -177,8 +177,8 @@ def create_structural_model_and_equivalent_statsmodel(
params = {}
sm_params = {}
sm_init = {}
expected_param_dims = defaultdict(lambda: ())
expected_coords = defaultdict(lambda: [])
expected_param_dims = defaultdict(tuple)
expected_coords = defaultdict(list)
expected_param_dims["P0"] += ("state", "state_aux")

default_states = [
Expand Down Expand Up @@ -727,15 +727,15 @@ def test_add_components():
se_mats = [se_T, se_R, se_Q]
all_mats = [T, R, Q]

for (ll_mat, se_mat, all_mat) in zip(ll_mats, se_mats, all_mats):
for ll_mat, se_mat, all_mat in zip(ll_mats, se_mats, all_mats):
assert_allclose(all_mat, linalg.block_diag(ll_mat, se_mat), atol=ATOL, rtol=RTOL)

ll_mats = [ll_x0, ll_c, ll_Z]
se_mats = [se_x0, se_c, se_Z]
all_mats = [x0, c, Z]
axes = [0, 0, 1]

for (ll_mat, se_mat, all_mat, axis) in zip(ll_mats, se_mats, all_mats, axes):
for ll_mat, se_mat, all_mat, axis in zip(ll_mats, se_mats, all_mats, axes):
assert_allclose(all_mat, np.concatenate([ll_mat, se_mat], axis=axis), atol=ATOL, rtol=RTOL)


Expand Down
1 change: 0 additions & 1 deletion pymc_experimental/tests/test_pathfinder.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ def test_pathfinder():
sigma = np.array([15.0, 10.0, 16.0, 11.0, 9.0, 11.0, 10.0, 18.0])

with pm.Model() as model:

mu = pm.Normal("mu", mu=0.0, sigma=10.0)
tau = pm.HalfCauchy("tau", 5.0)

Expand Down
2 changes: 0 additions & 2 deletions pymc_experimental/utils/linear_cg.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ def masked_fill(vector, mask, fill_value):
def linear_cg_updates(
result, alpha, residual_inner_prod, eps, beta, residual, precond_residual, curr_conjugate_vec
):

# Everything inside _jit_linear_cg_updates
result = result + alpha * curr_conjugate_vec
beta = np.copy(residual_inner_prod)
Expand Down Expand Up @@ -68,7 +67,6 @@ def linear_cg(
terminate_cg_by_size=False,
use_eval_tolerange=False,
):

if initial_guess is None:
initial_guess = np.zeros_like(rhs)

Expand Down
1 change: 0 additions & 1 deletion pymc_experimental/utils/pytensorf.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ class StringConstant(Constant):

@pytensor._as_symbolic.register(str)
def as_symbolic_string(x, **kwargs):

return StringConstant(stringtype, x)


Expand Down
1 change: 0 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,6 @@ def read_version():


if __name__ == "__main__":

setup(
name="pymc-experimental",
version=read_version(),
Expand Down
Loading