From 8ba09f431fa111052e75930a5851b57ddd15f95f Mon Sep 17 00:00:00 2001 From: kc611 Date: Thu, 2 Sep 2021 11:41:25 +0530 Subject: [PATCH] Removed temporary pin of Aesara version --- conda-envs/environment-dev-py37.yml | 2 +- conda-envs/environment-dev-py38.yml | 2 +- conda-envs/environment-dev-py39.yml | 2 +- conda-envs/windows-environment-dev-py38.yml | 2 +- pymc3/aesaraf.py | 8 ++++++-- requirements-dev.txt | 2 +- requirements.txt | 2 +- 7 files changed, 12 insertions(+), 8 deletions(-) diff --git a/conda-envs/environment-dev-py37.yml b/conda-envs/environment-dev-py37.yml index 21cea38529..394ef30fde 100644 --- a/conda-envs/environment-dev-py37.yml +++ b/conda-envs/environment-dev-py37.yml @@ -3,7 +3,7 @@ channels: - conda-forge - defaults dependencies: -- aesara>=2.1.0, <2.2.0 +- aesara>=2.1.0 - arviz>=0.11.2 - cachetools>=4.2.1 - cloudpickle diff --git a/conda-envs/environment-dev-py38.yml b/conda-envs/environment-dev-py38.yml index 170eb86642..4e8bc64b85 100644 --- a/conda-envs/environment-dev-py38.yml +++ b/conda-envs/environment-dev-py38.yml @@ -3,7 +3,7 @@ channels: - conda-forge - defaults dependencies: -- aesara>=2.1.0, <2.2.0 +- aesara>=2.1.0 - arviz>=0.11.2 - cachetools>=4.2.1 - cloudpickle diff --git a/conda-envs/environment-dev-py39.yml b/conda-envs/environment-dev-py39.yml index 2f431ba0d8..3e33f5c182 100644 --- a/conda-envs/environment-dev-py39.yml +++ b/conda-envs/environment-dev-py39.yml @@ -3,7 +3,7 @@ channels: - conda-forge - defaults dependencies: -- aesara>=2.1.0, <2.2.0 +- aesara>=2.1.0 - arviz>=0.11.2 - cachetools>=4.2.1 - cloudpickle diff --git a/conda-envs/windows-environment-dev-py38.yml b/conda-envs/windows-environment-dev-py38.yml index 3c25ed04ad..b8f054212d 100644 --- a/conda-envs/windows-environment-dev-py38.yml +++ b/conda-envs/windows-environment-dev-py38.yml @@ -4,7 +4,7 @@ channels: - defaults dependencies: # base dependencies (see install guide for Windows) -- aesara>=2.1.0, <2.2.0 +- aesara>=2.1.0 - arviz>=0.11.2 - cachetools>=4.2.1 - cloudpickle diff --git a/pymc3/aesaraf.py b/pymc3/aesaraf.py index fdc6e45e71..97bdd07577 100644 --- a/pymc3/aesaraf.py +++ b/pymc3/aesaraf.py @@ -49,7 +49,7 @@ from aesara.tensor.shape import SpecifyShape from aesara.tensor.sharedvar import SharedVariable from aesara.tensor.subtensor import AdvancedIncSubtensor, AdvancedIncSubtensor1 -from aesara.tensor.var import TensorVariable +from aesara.tensor.var import TensorConstant, TensorVariable from pymc3.exceptions import ShapeError from pymc3.vartypes import continuous_types, int_types, isgenerator, typefilter @@ -389,7 +389,11 @@ def inputvars(a): ------- r: list of tensor variables that are inputs """ - return [v for v in graph_inputs(makeiter(a)) if isinstance(v, TensorVariable)] + return [ + v + for v in graph_inputs(makeiter(a)) + if isinstance(v, TensorVariable) and not isinstance(v, TensorConstant) + ] def cont_inputs(a): diff --git a/requirements-dev.txt b/requirements-dev.txt index 3304e59fc9..a3107a4c73 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,7 +1,7 @@ # This file is auto-generated by scripts/generate_pip_deps_from_conda.py, do not modify. # See that file for comments about the need/usage of each dependency. -aesara>=2.1.0, <2.2.0 +aesara>=2.1.0 arviz>=0.11.2 cachetools>=4.2.1 cloudpickle diff --git a/requirements.txt b/requirements.txt index cd4211d893..8623a90ae7 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -aesara>=2.1.0,<2.2.0 +aesara>=2.1.0 arviz>=0.11.2 cachetools>=4.2.1 cloudpickle