Skip to content

Remove intX and floatX from distributions #7114

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.

Sign up for GitHub

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

Merged
merged 18 commits into from
Feb 17, 2024
Merged

Remove intX and floatX from distributions #7114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
f2398f5
remove floatX() from distribution/continuous.py
aerubanov Jan 23, 2024
47d8a13
remove floatX and intX from distributions/discrete.py
aerubanov Jan 24, 2024
38bb888
remove floatX from distributions/bound.py
aerubanov Jan 24, 2024
4d2617f
remove floatX() from distributions/mixture.py
aerubanov Jan 24, 2024
e5e0f99
remove floatX from distributions/multivariate.py
aerubanov Jan 24, 2024
1f34f68
remove other floatX() cals
aerubanov Jan 24, 2024
0940c2c
fix TestZeroSumNormal::test_does_not_upcast_to_float64
aerubanov Jan 25, 2024
cbc2ff0
fix error in CAR distribution
aerubanov Jan 25, 2024
5ce0847
fix Gamma error
aerubanov Jan 26, 2024
5a3bd2c
change test rtol value
aerubanov Jan 29, 2024
58635f3
fix test in TestInitvalAssignment
aerubanov Jan 29, 2024
f564f46
Fix check in CAR make_node to also work with SparseConstants
ricardoV94 Feb 5, 2024
9e77a0f
Update pymc/distributions/multivariate.py
aerubanov Feb 9, 2024
7837795
Update tests/distributions/test_mixture.py
aerubanov Feb 9, 2024
f2b5ef5
Update pymc/distributions/multivariate.py
aerubanov Feb 9, 2024
bab56c1
add .astype(floatX)
aerubanov Feb 9, 2024
8d26013
remove rtol from test
aerubanov Feb 9, 2024
00ca006
fix tests
aerubanov Feb 9, 2024
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
18 changes: 8 additions & 10 deletions pymc/distributions/bound.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
from pymc.distributions.transforms import _default_transform
from pymc.logprob.basic import logp
from pymc.model import modelcontext
from pymc.pytensorf import floatX, intX
from pymc.util import check_dist_not_registered

__all__ = ["Bound"]
Expand Down Expand Up @@ -206,7 +205,7 @@ def __new__(
res = _ContinuousBounded(
name,
[dist, lower, upper],
initval=floatX(initval),
initval=initval.astype("float"),
size=size,
shape=shape,
**kwargs,
Expand All @@ -215,7 +214,7 @@ def __new__(
res = _DiscreteBounded(
name,
[dist, lower, upper],
initval=intX(initval),
initval=initval.astype("int"),
size=size,
shape=shape,
**kwargs,
Expand All @@ -241,15 +240,15 @@ def dist(
shape=shape,
**kwargs,
)
res.tag.test_value = floatX(initval)
res.tag.test_value = initval
else:
res = _DiscreteBounded.dist(
[dist, lower, upper],
size=size,
shape=shape,
**kwargs,
)
res.tag.test_value = intX(initval)
res.tag.test_value = initval.astype("int")
return res

@classmethod
Expand Down Expand Up @@ -286,9 +285,9 @@ def _set_values(cls, lower, upper, size, shape, initval):
size = shape

lower = np.asarray(lower)
lower = floatX(np.where(lower == None, -np.inf, lower)) # noqa E711
lower = np.where(lower == None, -np.inf, lower) # noqa E711
upper = np.asarray(upper)
upper = floatX(np.where(upper == None, np.inf, upper)) # noqa E711
upper = np.where(upper == None, np.inf, upper) # noqa E711

if initval is None:
_size = np.broadcast_shapes(to_tuple(size), np.shape(lower), np.shape(upper))
Expand All @@ -303,7 +302,6 @@ def _set_values(cls, lower, upper, size, shape, initval):
np.where(_upper == np.inf, _lower + 1, (_lower + _upper) / 2),
),
)

lower = as_tensor_variable(floatX(lower))
upper = as_tensor_variable(floatX(upper))
lower = as_tensor_variable(lower, dtype="floatX")
upper = as_tensor_variable(upper, dtype="floatX")
return lower, upper, initval
Loading