Skip to content

Commit 0431292

Browse files
authored
rel to abs again (#4292)
1 parent d595d29 commit 0431292

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

91 files changed

+336
-329
lines changed

.pre-commit-config.yaml

+5
Original file line numberDiff line numberDiff line change
@@ -61,3 +61,8 @@ repos:
6161
language: python
6262
name: Check no tests are ignored
6363
pass_filenames: false
64+
- id: no-relative-imports
65+
name: No relative imports
66+
entry: from \.[\.\w]* import
67+
types: [python]
68+
language: pygrep

pymc3/__init__.py

+22-22
Original file line numberDiff line numberDiff line change
@@ -38,16 +38,16 @@ def __set_compiler_flags():
3838

3939
__set_compiler_flags()
4040

41-
from . import gp, ode, sampling
42-
from .backends import load_trace, save_trace
43-
from .backends.tracetab import *
44-
from .blocking import *
45-
from .data import *
46-
from .distributions import *
47-
from .distributions import transforms
48-
from .exceptions import *
49-
from .glm import *
50-
from .math import (
41+
from pymc3 import gp, ode, sampling
42+
from pymc3.backends import load_trace, save_trace
43+
from pymc3.backends.tracetab import *
44+
from pymc3.blocking import *
45+
from pymc3.data import *
46+
from pymc3.distributions import *
47+
from pymc3.distributions import transforms
48+
from pymc3.exceptions import *
49+
from pymc3.glm import *
50+
from pymc3.math import (
5151
expand_packed_triangular,
5252
invlogit,
5353
invprobit,
@@ -56,15 +56,15 @@ def __set_compiler_flags():
5656
logsumexp,
5757
probit,
5858
)
59-
from .model import *
60-
from .model_graph import model_to_graphviz
61-
from .plots import *
62-
from .sampling import *
63-
from .smc import *
64-
from .stats import *
65-
from .step_methods import *
66-
from .tests import test
67-
from .theanof import *
68-
from .tuning import *
69-
from .variational import *
70-
from .vartypes import *
59+
from pymc3.model import *
60+
from pymc3.model_graph import model_to_graphviz
61+
from pymc3.plots import *
62+
from pymc3.sampling import *
63+
from pymc3.smc import *
64+
from pymc3.stats import *
65+
from pymc3.step_methods import *
66+
from pymc3.tests import test
67+
from pymc3.theanof import *
68+
from pymc3.tuning import *
69+
from pymc3.variational import *
70+
from pymc3.vartypes import *

pymc3/backends/__init__.py

+6-1
Original file line numberDiff line numberDiff line change
@@ -60,4 +60,9 @@
6060
Saved backends can be loaded using `arviz.from_netcdf`
6161
6262
"""
63-
from ..backends.ndarray import NDArray, load_trace, point_list_to_multitrace, save_trace
63+
from pymc3.backends.ndarray import (
64+
NDArray,
65+
load_trace,
66+
point_list_to_multitrace,
67+
save_trace,
68+
)

pymc3/backends/base.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@
2626
import numpy as np
2727
import theano.tensor as tt
2828

29-
from ..model import modelcontext
30-
from ..util import get_var_name
31-
from .report import SamplerReport, merge_reports
29+
from pymc3.backends.report import SamplerReport, merge_reports
30+
from pymc3.model import modelcontext
31+
from pymc3.util import get_var_name
3232

3333
logger = logging.getLogger("pymc3")
3434

pymc3/backends/report.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
import arviz
2222

23-
from ..util import get_untransformed_name, is_transformed_name
23+
from pymc3.util import get_untransformed_name, is_transformed_name
2424

2525
logger = logging.getLogger("pymc3")
2626

pymc3/backends/tracetab.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import numpy as np
2121
import pandas as pd
2222

23-
from ..util import get_default_varnames
23+
from pymc3.util import get_default_varnames
2424

2525
__all__ = ["trace_to_dataframe"]
2626

pymc3/blocking.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
import numpy as np
2424

25-
from .util import get_var_name
25+
from pymc3.util import get_var_name
2626

2727
__all__ = ["ArrayOrdering", "DictToArrayBijection", "DictToVarBijection"]
2828

pymc3/distributions/__init__.py

+11-11
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
from . import shape_utils, timeseries, transforms
16-
from .bart import BART
17-
from .bound import Bound
18-
from .continuous import (
15+
from pymc3.distributions import shape_utils, timeseries, transforms
16+
from pymc3.distributions.bart import BART
17+
from pymc3.distributions.bound import Bound
18+
from pymc3.distributions.continuous import (
1919
Beta,
2020
Cauchy,
2121
ChiSquared,
@@ -48,7 +48,7 @@
4848
Wald,
4949
Weibull,
5050
)
51-
from .discrete import (
51+
from pymc3.distributions.discrete import (
5252
Bernoulli,
5353
BetaBinomial,
5454
Binomial,
@@ -66,7 +66,7 @@
6666
ZeroInflatedNegativeBinomial,
6767
ZeroInflatedPoisson,
6868
)
69-
from .distribution import (
69+
from pymc3.distributions.distribution import (
7070
Continuous,
7171
DensityDist,
7272
Discrete,
@@ -76,8 +76,8 @@
7676
draw_values,
7777
generate_samples,
7878
)
79-
from .mixture import Mixture, MixtureSameFamily, NormalMixture
80-
from .multivariate import (
79+
from pymc3.distributions.mixture import Mixture, MixtureSameFamily, NormalMixture
80+
from pymc3.distributions.multivariate import (
8181
Dirichlet,
8282
KroneckerNormal,
8383
LKJCholeskyCov,
@@ -89,9 +89,9 @@
8989
Wishart,
9090
WishartBartlett,
9191
)
92-
from .posterior_predictive import fast_sample_posterior_predictive
93-
from .simulator import Simulator
94-
from .timeseries import (
92+
from pymc3.distributions.posterior_predictive import fast_sample_posterior_predictive
93+
from pymc3.distributions.simulator import Simulator
94+
from pymc3.distributions.timeseries import (
9595
AR,
9696
AR1,
9797
GARCH11,

pymc3/distributions/bart.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414

1515
import numpy as np
1616

17-
from .distribution import NoDistribution
18-
from .tree import LeafNode, SplitNode, Tree
17+
from pymc3.distributions.distribution import NoDistribution
18+
from pymc3.distributions.tree import LeafNode, SplitNode, Tree
1919

2020
__all__ = ["BART"]
2121

pymc3/distributions/continuous.py

+6-7
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,8 @@
2727
from scipy.interpolate import InterpolatedUnivariateSpline
2828
from scipy.special import expit
2929

30-
from pymc3.theanof import floatX
31-
32-
from ..math import invlogit, logdiffexp, logit
33-
from . import transforms
34-
from .dist_math import (
30+
from pymc3.distributions import transforms
31+
from pymc3.distributions.dist_math import (
3532
SplineWrapper,
3633
alltrue_elemwise,
3734
betaln,
@@ -46,8 +43,10 @@
4643
std_cdf,
4744
zvalue,
4845
)
49-
from .distribution import Continuous, draw_values, generate_samples
50-
from .special import log_i0
46+
from pymc3.distributions.distribution import Continuous, draw_values, generate_samples
47+
from pymc3.distributions.special import log_i0
48+
from pymc3.math import invlogit, logdiffexp, logit
49+
from pymc3.theanof import floatX
5150

5251
__all__ = [
5352
"Uniform",

pymc3/distributions/discrete.py

+11-5
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,18 @@
1919

2020
from scipy import stats
2121

22+
from pymc3.distributions.dist_math import (
23+
betaln,
24+
binomln,
25+
bound,
26+
factln,
27+
logpow,
28+
random_choice,
29+
)
30+
from pymc3.distributions.distribution import Discrete, draw_values, generate_samples
31+
from pymc3.distributions.shape_utils import broadcast_distribution_samples
2232
from pymc3.math import log1pexp, logaddexp, logit, sigmoid, tround
23-
24-
from ..theanof import floatX, intX, take_along_axis
25-
from .dist_math import betaln, binomln, bound, factln, logpow, random_choice
26-
from .distribution import Discrete, draw_values, generate_samples
27-
from .shape_utils import broadcast_distribution_samples
33+
from pymc3.theanof import floatX, intX, take_along_axis
2834

2935
__all__ = [
3036
"Binomial",

pymc3/distributions/dist_math.py

+2-3
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,10 @@
3131
from theano.scan import until
3232
from theano.tensor.slinalg import Cholesky
3333

34+
from pymc3.distributions.shape_utils import to_tuple
35+
from pymc3.distributions.special import gammaln
3436
from pymc3.theanof import floatX
3537

36-
from .shape_utils import to_tuple
37-
from .special import gammaln
38-
3938
f = floatX
4039
c = -0.5 * np.log(2.0 * np.pi)
4140
_beta_clip_values = {

pymc3/distributions/distribution.py

+9-9
Original file line numberDiff line numberDiff line change
@@ -33,22 +33,22 @@
3333

3434
from theano import function
3535

36-
from ..memoize import memoize
37-
from ..model import (
36+
from pymc3.distributions.shape_utils import (
37+
broadcast_dist_samples_shape,
38+
get_broadcastable_dist_samples,
39+
to_tuple,
40+
)
41+
from pymc3.memoize import memoize
42+
from pymc3.model import (
3843
ContextMeta,
3944
FreeRV,
4045
Model,
4146
MultiObservedRV,
4247
ObservedRV,
4348
build_named_node_tree,
4449
)
45-
from ..util import get_repr_for_variable, get_var_name
46-
from ..vartypes import string_types, theano_constant
47-
from .shape_utils import (
48-
broadcast_dist_samples_shape,
49-
get_broadcastable_dist_samples,
50-
to_tuple,
51-
)
50+
from pymc3.util import get_repr_for_variable, get_var_name
51+
from pymc3.vartypes import string_types, theano_constant
5252

5353
__all__ = [
5454
"DensityDist",

pymc3/distributions/mixture.py

+6-6
Original file line numberDiff line numberDiff line change
@@ -20,23 +20,23 @@
2020
import theano
2121
import theano.tensor as tt
2222

23-
from ..math import logsumexp
24-
from ..theanof import _conversion_map, take_along_axis
25-
from .continuous import Normal, get_tau_sigma
26-
from .dist_math import bound, random_choice
27-
from .distribution import (
23+
from pymc3.distributions.continuous import Normal, get_tau_sigma
24+
from pymc3.distributions.dist_math import bound, random_choice
25+
from pymc3.distributions.distribution import (
2826
Discrete,
2927
Distribution,
3028
_DrawValuesContext,
3129
_DrawValuesContextBlocker,
3230
draw_values,
3331
generate_samples,
3432
)
35-
from .shape_utils import (
33+
from pymc3.distributions.shape_utils import (
3634
broadcast_distribution_samples,
3735
get_broadcastable_dist_samples,
3836
to_tuple,
3937
)
38+
from pymc3.math import logsumexp
39+
from pymc3.theanof import _conversion_map, take_along_axis
4040

4141
__all__ = ["Mixture", "NormalMixture", "MixtureSameFamily"]
4242

pymc3/distributions/multivariate.py

+9-10
Original file line numberDiff line numberDiff line change
@@ -30,22 +30,21 @@
3030

3131
import pymc3 as pm
3232

33-
from pymc3.theanof import floatX
34-
35-
from ..math import kron_diag, kron_dot, kron_solve_lower, kronecker
36-
from ..model import Deterministic
37-
from . import transforms
38-
from .continuous import ChiSquared, Normal
39-
from .dist_math import bound, factln, logpow
40-
from .distribution import (
33+
from pymc3.distributions import transforms
34+
from pymc3.distributions.continuous import ChiSquared, Normal
35+
from pymc3.distributions.dist_math import bound, factln, logpow
36+
from pymc3.distributions.distribution import (
4137
Continuous,
4238
Discrete,
4339
_DrawValuesContext,
4440
draw_values,
4541
generate_samples,
4642
)
47-
from .shape_utils import broadcast_dist_samples_to, to_tuple
48-
from .special import gammaln, multigammaln
43+
from pymc3.distributions.shape_utils import broadcast_dist_samples_to, to_tuple
44+
from pymc3.distributions.special import gammaln, multigammaln
45+
from pymc3.math import kron_diag, kron_dot, kron_solve_lower, kronecker
46+
from pymc3.model import Deterministic
47+
from pymc3.theanof import floatX
4948

5049
__all__ = [
5150
"MvNormal",

pymc3/distributions/posterior_predictive.py

+12-12
Original file line numberDiff line numberDiff line change
@@ -27,24 +27,24 @@
2727
from typing_extensions import Literal, Protocol
2828
from xarray import Dataset
2929

30-
from ..backends.base import MultiTrace
31-
from ..exceptions import IncorrectArgumentsError
32-
from ..model import (
33-
Model,
34-
MultiObservedRV,
35-
ObservedRV,
36-
get_named_nodes_and_relations,
37-
modelcontext,
38-
)
39-
from ..util import chains_and_samples, dataset_to_point_list, get_var_name
40-
from ..vartypes import theano_constant
41-
from .distribution import (
30+
from pymc3.backends.base import MultiTrace
31+
from pymc3.distributions.distribution import (
4232
_compile_theano_function,
4333
_DrawValuesContext,
4434
_DrawValuesContextBlocker,
4535
is_fast_drawable,
4636
vectorized_ppc,
4737
)
38+
from pymc3.exceptions import IncorrectArgumentsError
39+
from pymc3.model import (
40+
Model,
41+
MultiObservedRV,
42+
ObservedRV,
43+
get_named_nodes_and_relations,
44+
modelcontext,
45+
)
46+
from pymc3.util import chains_and_samples, dataset_to_point_list, get_var_name
47+
from pymc3.vartypes import theano_constant
4848

4949
# Failing tests:
5050
# test_mixture_random_shape::test_mixture_random_shape

pymc3/distributions/simulator.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
from scipy.spatial import cKDTree
2020

21-
from .distribution import NoDistribution, draw_values
21+
from pymc3.distributions.distribution import NoDistribution, draw_values
2222

2323
__all__ = ["Simulator"]
2424

0 commit comments

Comments
 (0)