Changeset 6007 for anuga_validation/automated_validation_tests/fitting/validate_benchmark_fit.py

Timestamp:

Nov 27, 2008, 11:34:01 AM (16 years ago)

Author:

ole

Message:

Verified validate_all.py on Windows and Linux64 with more superfluous parameters removed

File:

• anuga_validation/automated_validation_tests/fitting/validate_benchmark_fit.py (modified) (4 diffs)

anuga_validation/automated_validation_tests/fitting/validate_benchmark_fit.py

@@ -62 +62 @@
         #print "time", time
         #print "mem", mem
+
+        #Defaults
+        time_standard = 50.
+        mem_standard = 50000.
+        
         if host.find('tornado') == 0:
             # Tornado headnode
             #time_standard = 14.5
-            time_standard = 24
-            mem_standard = 302404 
+            time_standard = 24.
+            mem_standard = 302404. 
             
         elif host.find('compute-1') == 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 = 29424.
 
         elif host.find('nautilus') == 0:
@@ -80 +85 @@
             
             # 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. #?
 
             """
@@ -108 +113 @@
         assert time<time_standard*1.2
 
+
+
+        if sys.platform == 'win32':
+            # Memory usage does not work on windows
+            return
         
         # Before change: https://datamining.anu.edu.au/anuga/changeset/5855
@@ -114 +124 @@
         mem_standard *= 1.25
 
-        msg = 'Memory used was %d, mem_standard is %d' %(mem, mem_standard)
+        msg = 'Memory used was %f, mem_standard is %f' %(float(mem), mem_standard)
         #print msg 
         assert mem<mem_standard*1.2, msg