evaluable.compile: cache const steps

nutils/evaluable.py

@@ -5273,9 +5273,16 @@ def _compile_tuple(funcs):
     if not graphviz:
 
         serialized = tuple(zip((op.evalf for op in ordereddeps[1:]), deptree[1:]))
+        nconsts = builtins.sum(itertools.takewhile(lambda v: v, map(operator.attrgetter('isconstant'), ordereddeps[1:])))
+        cache = None
 
         def eval(**evalargs):
+            nonlocal serialized, cache
             values = [evalargs]
+            if nconsts and cache:
+                assert len(cache) == nconsts
+                values.extend(cache)
+                log.debug(f'using {nconsts} cached values')
             try:
                 values.extend(evalf(*[values[i] for i in indices]) for evalf, indices in serialized)
             except KeyboardInterrupt:
@@ -5284,6 +5291,10 @@ def eval(**evalargs):
                 log.error(funcs._format_stack(values, e))
                 raise
             else:
+                if nconsts and not cache:
+                    log.debug(f'caching {nconsts} values')
+                    cache = values[1:nconsts + 1]
+                    serialized = serialized[nconsts:]
                 return values[-1]
 
     else:

tests/test_topology.py

@@ -985,7 +985,7 @@ def test_detect_linear(self):
         target = numpy.array([(.2, .3)])
         with self.assertLogs('nutils', level='DEBUG') as cm:
             self.domain.locate(self.geom, target, eps=1e-15, tol=1e-12, arguments=dict(scale=.123))
-        self.assertRegex(cm.output[0], 'locate detected linear geometry')
+        self.assertTrue(any(line.startswith('DEBUG:nutils:locate detected linear geometry') for line in cm.output))
 
 
 for etype in 'square', 'triangle', 'mixed':