Move pymc/distributions/logprob.py to pymc/logprob/

.github/workflows/tests.yml

@@ -39,7 +39,6 @@ jobs:
         test-subset:
           - |
             pymc/tests/test_util.py
-            pymc/tests/distributions/test_logprob.py
             pymc/tests/test_pytensorf.py
             pymc/tests/test_math.py
             pymc/tests/backends/test_base.py

pymc/distributions/__init__.py

@@ -12,11 +12,6 @@
 #   See the License for the specific language governing permissions and
 #   limitations under the License.
 
-from pymc.distributions.logprob import (  # isort:skip
-    logcdf,
-    logp,
-)
-
 from pymc.distributions.bound import Bound
 from pymc.distributions.censored import Censored
 from pymc.distributions.continuous import (
@@ -199,6 +194,4 @@
     "Censored",
     "CAR",
     "PolyaGamma",
-    "logp",
-    "logcdf",
 ]

pymc/distributions/bound.py

@@ -23,9 +23,10 @@
 from pymc.distributions.continuous import BoundedContinuous, bounded_cont_transform
 from pymc.distributions.dist_math import check_parameters
 from pymc.distributions.distribution import Continuous, Discrete
-from pymc.distributions.logprob import ignore_logprob, logp
 from pymc.distributions.shape_utils import to_tuple
 from pymc.distributions.transforms import _default_transform
+from pymc.logprob.joint_logprob import logp
+from pymc.logprob.utils import ignore_logprob
 from pymc.model import modelcontext
 from pymc.pytensorf import floatX, intX
 from pymc.util import check_dist_not_registered

pymc/distributions/discrete.py

@@ -44,9 +44,9 @@
     normal_lcdf,
 )
 from pymc.distributions.distribution import Discrete
-from pymc.distributions.logprob import logp
 from pymc.distributions.mixture import Mixture
 from pymc.distributions.shape_utils import rv_size_is_none
+from pymc.logprob.joint_logprob import logp
 from pymc.math import sigmoid
 from pymc.pytensorf import floatX, intX
 from pymc.vartypes import continuous_types

pymc/distributions/mixture.py

@@ -30,11 +30,12 @@
     _moment,
     moment,
 )
-from pymc.distributions.logprob import ignore_logprob, logcdf, logp
 from pymc.distributions.shape_utils import _change_dist_size, change_dist_size
 from pymc.distributions.transforms import _default_transform
-from pymc.logprob.abstract import _logcdf, _logprob
+from pymc.logprob.abstract import _logcdf, _logprob, logcdf
+from pymc.logprob.joint_logprob import logp
 from pymc.logprob.transforms import IntervalTransform
+from pymc.logprob.utils import ignore_logprob
 from pymc.util import check_dist_not_registered
 from pymc.vartypes import continuous_types, discrete_types
 

pymc/distributions/multivariate.py

@@ -57,7 +57,6 @@
     _moment,
     moment,
 )
-from pymc.distributions.logprob import ignore_logprob
 from pymc.distributions.shape_utils import (
     _change_dist_size,
     broadcast_dist_samples_to,
@@ -68,6 +67,7 @@
 )
 from pymc.distributions.transforms import Interval, ZeroSumTransform, _default_transform
 from pymc.logprob.abstract import _logprob
+from pymc.logprob.utils import ignore_logprob
 from pymc.math import kron_diag, kron_dot
 from pymc.pytensorf import floatX, intX
 from pymc.util import check_dist_not_registered

pymc/distributions/timeseries.py

@@ -33,7 +33,6 @@
     _moment,
     moment,
 )
-from pymc.distributions.logprob import ignore_logprob, logp, reconsider_logprob
 from pymc.distributions.multivariate import MvNormal, MvStudentT
 from pymc.distributions.shape_utils import (
     _change_dist_size,
@@ -43,6 +42,8 @@
 )
 from pymc.exceptions import NotConstantValueError
 from pymc.logprob.abstract import _logprob
+from pymc.logprob.joint_logprob import logp
+from pymc.logprob.utils import ignore_logprob, reconsider_logprob
 from pymc.pytensorf import constant_fold, floatX, intX
 from pymc.util import check_dist_not_registered
 

pymc/logprob/__init__.py

@@ -34,9 +34,9 @@
 #   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 #   SOFTWARE.
 
-from pymc.logprob.abstract import logprob  # isort: split
+from pymc.logprob.abstract import logprob, logcdf  # isort: split
 
-from pymc.logprob.joint_logprob import factorized_joint_logprob, joint_logprob
+from pymc.logprob.joint_logprob import factorized_joint_logprob, joint_logp, logp
 
 # isort: off
 # Add rewrites to the DBs
@@ -49,4 +49,4 @@
 
 # isort: on
 
-__all__ = ()
+__all__ = ("logp", "logcdf")