Changeset 7222

Timestamp:

Jun 19, 2009, 8:31:29 AM (15 years ago)

Author:

rwilson

Message:

Added my Ubuntu box to known time/memory usage data.

Files:

• anuga_core/source/anuga/fit_interpolate/benchmark_least_squares.py (modified) (1 diff)
• branches/numpy_anuga_validation/automated_validation_tests/fitting/validate_benchmark_fit.py (modified) (5 diffs)

anuga_core/source/anuga/fit_interpolate/benchmark_least_squares.py

@@ -110 +110 @@
 
 
-
-
 class BenchmarkLeastSquares:
-
     """
 

branches/numpy_anuga_validation/automated_validation_tests/fitting/validate_benchmark_fit.py

@@ -65 +65 @@
         #Defaults
         time_standard = 120.
-        mem_standard = 50000.
+        mem_standard = 50000
         
         if host.find('tornado') == 0:
@@ -71 +71 @@
             #time_standard = 14.5
             time_standard = 24.
-            mem_standard = 302404. 
+            mem_standard = 30204 
             
-        elif host.find('compute-1') == 0: # cyclone or tornado node
+        elif host.find('compute') == 0: # cyclone or tornado node
             time_standard = 19.0
-            mem_standard = 30204.
+            mem_standard = 30204
 
         elif host.find('cyclone') == 0: # cyclone headnode
             time_standard = 13.3
-            mem_standard = 29424.
+            mem_standard = 30204
+            #mem_standard = 29424
 
         elif host.find('nautilus') == 0:
@@ -85 +86 @@
             
             # v 4910 is giving a mem of 15572
-            mem_standard = 15572. 
+            mem_standard = 15572 
             
 
         elif host.find('bogong') == 0:
             time_standard = 14.2
-            mem_standard = 30000. # Updated by Ole 20080507
+            mem_standard = 30000 # Updated by Ole 20080507
 
 
         elif host.find('pc-31569') == 0: # DSG's PC
             time_standard = 31.6
-            mem_standard = 15000. #?
+            mem_standard = 15000 #?
+
+        elif host.find('PC-32572') == 0: # Ross' Ubuntu box - nump trunk
+            time_standard = 12.8
+            mem_standard = 15788 #?
 
             """
@@ -111 +116 @@
         
         # Do the assertions here
-        assert time<time_standard*1.2
+        msg = ('Time used was %.1f s, standard is %.1f s +20%% (%.1f s)'
+               % (time, time_standard, int(time_standard*1.2)))
+        assert time < time_standard*1.2, msg
 
 
@@ -126 +133 @@
         #reduced again
 
-        msg = 'Memory used was %f, mem_standard is %f' %(float(mem), mem_standard)
-        #print msg 
-        assert mem<mem_standard*1.2, msg            
+        msg = ('Memory used was %d KiB, standard is %d KiB +20%% (%d KiB)'
+               % (mem, mem_standard, int(mem_standard*1.2)))
+        assert mem < mem_standard*1.2, msg            
             
 #-------------------------------------------------------------