Changeset 4338

Timestamp:

Mar 29, 2007, 4:36:47 PM (18 years ago)

Author:

ole

Message:

Brought back caching at the file_function level which was moved down in
changeset:4278

I used the command svn merge -r4278:4277 util.py

The problem was that the input arguments to cahing were so large that it took a long time to hash them. File_function is much faster now and I believe the original problem was fixed when None, True and False were treated explicitly in cahing.myhash (changeset:4198 and changeset:4270).

If a problem arises again, let us write a unit test and then deal with it.

File:

• anuga_core/source/anuga/abstract_2d_finite_volumes/util.py (modified) (5 diffs)

anuga_core/source/anuga/abstract_2d_finite_volumes/util.py

@@ -70 +70 @@
               'interpolation_points': interpolation_points,
               'time_thinning': time_thinning,                   
-              'verbose': verbose,
-              'use_cache': use_cache
-              }
-
-    #caching moved to deeper within the function to avoid caching an
-    #instance of an object, which isn't generally good.
-    f = apply(_file_function,
+              'verbose': verbose}
+
+
+    # Call underlying engine with or without caching
+    if use_cache is True:
+        try:
+            from caching import cache
+        except:
+            msg = 'Caching was requested, but caching module'+\
+                  'could not be imported'
+            raise msg
+
+        f = cache(_file_function,
+                  args, kwargs,
+                  dependencies=[filename],
+                  compression=False,                  
+                  verbose=verbose)
+
+    else:
+        f = apply(_file_function,
                   args, kwargs)
 
@@ -92 +105 @@
                    quantities=None,
                    interpolation_points=None,
-                   time_thinning=1, 
-                   verbose=False,
-                   use_cache=False):
+                   time_thinning=1,                                                
+                   verbose=False):
     """Internal function
     
@@ -134 +146 @@
                                         interpolation_points,
                                         time_thinning=time_thinning,
-                                        verbose=verbose,
-                                        use_cache=use_cache)
+                                        verbose=verbose)
     else:
         raise 'Must be a NetCDF File'
@@ -146 +157 @@
                              interpolation_points=None,
                              time_thinning=1,                             
-                             verbose=False,
-                             use_cache=False):
+                             verbose=False):
     """Read time history of spatial data from NetCDF sww file and
     return a callable object f(t,x,y)
@@ -315 +325 @@
         vertex_coordinates = triangles = interpolation_points = None         
 
-    
- 
-    args = (time, quantities, quantity_names, vertex_coordinates, 
-            triangles, interpolation_points, )
-            
-    kwargs = {'time_thinning': time_thinning,
-              'verbose': verbose
-              }
-    
-#    print'CACHING FROM UTIL.py for interpolation_function', use_cache
-#    from anuga.caching import myhash
-    if use_cache is True:
-        from caching import cache
-        
-        interpolation_function = cache(Interpolation_function,
-                                       args, kwargs,
-                                       verbose=verbose,
-                                       compression=False)
-    else:
-        interpolation_function = apply(Interpolation_function,
-                                       args, kwargs)
-#    print 'myhash', myhash(interpolation_function) 
-    return interpolation_function 
-
+    return Interpolation_function(time,
+                                  quantities,
+                                  quantity_names,
+                                  vertex_coordinates,
+                                  triangles,
+                                  interpolation_points,
+                                  time_thinning=time_thinning,
+                                  verbose=verbose)