simplify and remove helper function

Author: williambdean

pymc/data.py

@@ -147,10 +147,6 @@ def __str__(self):
         return "Minibatch"
 
 
-def has_random_ancestor(r):
-    return rvs_in_graph(r) != set()
-
-
 def is_valid_observed(v) -> bool:
     if not isinstance(v, Variable):
         # Non-symbolic constant
@@ -161,7 +157,7 @@ def is_valid_observed(v) -> bool:
         return True
 
     return (
-        not has_random_ancestor(v)
+        not rvs_in_graph(v)
         # Or Minibatch
         or (
             isinstance(v.owner.op, MinibatchOp)

pymc/pytensorf.py

@@ -177,9 +177,9 @@ def extract_obs_data(x: TensorVariable) -> np.ndarray:
             mask[mask_idx] = 1
             return np.ma.MaskedArray(array_data, mask)
 
-    from pymc.data import has_random_ancestor
+    from pymc.logprob.utils import rvs_in_graph
 
-    if not has_random_ancestor(x):
+    if not rvs_in_graph(x):
         cheap_eval_mode = Mode(linker="py", optimizer=None)
         return x.eval(mode=cheap_eval_mode)
 

tests/test_data.py

@@ -628,7 +628,7 @@ def test_multiple_vars(self):
 def test_scaling_data_works_in_likelihood() -> None:
     data = np.array([10, 11, 12, 13, 14, 15])
 
-    with pm.Model() as model:
+    with pm.Model():
         target = pm.Data("target", data)
         scale = 12
         scaled_target = target / scale