more caching bugs

dfm · Sep 28, 2017 · 14693ea · 14693ea
1 parent c1132dd
commit 14693ea
Show file tree

Hide file tree

Showing 3 changed files with 54 additions and 36 deletions.
diff --git a/docs/_static/notebooks/model.ipynb b/docs/_static/notebooks/model.ipynb
diff --git a/george/gp.py b/george/gp.py
@@ -264,14 +264,14 @@ def apply_inverse(self, y):
 
         """
         self.recompute(quiet=False)
-        r = self._check_dimensions(y, check_dim=False)
+        r = np.array(y, dtype=np.float64, order="F")
+        r = self._check_dimensions(r, check_dim=False)
 
         # Broadcast the mean function
         m = [slice(None)] + [np.newaxis for _ in range(len(r.shape) - 1)]
         r -= self._call_mean(self._x)[m]
 
         # Do the solve
-        r = np.asfortranarray(r, dtype=np.float64)
         if len(r.shape) == 1:
             b = self.solver.apply_inverse(r, in_place=True).flatten()
         else:

diff --git a/templates/kernels.py b/templates/kernels.py
@@ -56,13 +56,7 @@ def __getattr__(self, name):
 
     @property
     def kernel(self):
-        if self.dirty or self._kernel is None:
-            try:
-                self._kernel = KernelInterface(self)
-            except AttributeError as e:
-                raise RuntimeError()
-            self.dirty = False
-        return self._kernel
+        return KernelInterface(self)
 
     def __repr__(self):
         kernel = self.models[None]
@@ -154,7 +148,6 @@ def __init__(self, k1, k2):
             raise ValueError("Dimension mismatch")
         self.ndim = k1.ndim
         self._dirty = True
-        self._kernel = None
         super(_operator, self).__init__([("k1", k1), ("k2", k2)])
 
     @property
@@ -248,7 +241,6 @@ def __init__(self,
 
         # Common setup.
         self.dirty = True
-        self._kernel = None
     {% if spec.stationary %}
     @property
     def block(self):