Changeset 7276 for anuga_validation/automated_validation_tests/fitting

Timestamp:

Jun 30, 2009, 2:07:41 PM (16 years ago)

Author:

ole

Message:

Merged numpy branch back into the trunk.

In ~/sandpit/anuga/anuga_core/source
svn merge -r 6246:HEAD ../../branches/numpy .

In ~/sandpit/anuga/anuga_validation
svn merge -r 6417:HEAD ../branches/numpy_anuga_validation .

In ~/sandpit/anuga/misc
svn merge -r 6809:HEAD ../branches/numpy_misc .

For all merges, I used numpy version where conflicts existed

The suites test_all.py (in source/anuga) and validate_all.py passed using Python2.5 with numpy on my Ubuntu Linux box.

File:

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

anuga_validation/automated_validation_tests/fitting/validate_benchmark_fit.py

@@ -24 +24 @@
 mem 30200
 
+2009 June 22 - RW
+Changed the time/memory values to be exactly those found on the hardware.
+Took 10 measurements, used maximum in found values.
+
 """
 
@@ -34 +38 @@
     def setUp(self):
         pass
-        
 
     def tearDown(self):
@@ -45 +48 @@
     # That's because v4872 is using geo-ref, whereas the
     # previous version did not.
+
     def test_fit_time_and_mem(self):
         import socket
+
+        # get hostname - for *nix and Windows
         host =  socket.gethostname()
-        #print "host", host
+
+        # define dictionary of expected time/memory usage per machine.
+        # key must be unique *prefix* of machine name, lowercase.
+        # value is tuple: (time, memory) in seconds and KiB.
+        expected_results = {'tornado':  (10.8, 40468),  # tornado headnode
+                            'cyclone':  (7.4,  40468),  # cyclone headnode
+                            'compute':  (10.8, 40468),  # cluster computenode
+                            'nautilus': (8.1,  16104),  # Ole's 32bit Ubuntu
+                            'bogong':   (14.2, 30000),  # ANU?
+                            'pc-31569': (31.6, 15000),  # DSG's PC?
+                            'pc-32572': (12.8, 15788),  # Ross' 32bit work Ubuntu
+                            'saturn':   (12.8, 39404)   # Ross' 64bit home Ubuntu
+                           } 
+
+        # run trial, report on time and memory
         ben = BenchmarkLeastSquares()
-        time, mem, num_tri, one_t, more_t, quad_t = ben.trial(
-            num_of_points=1000
-            ,maxArea=0.0001
-            ,is_fit=True
-            ,segments_in_mesh=False
-            ,use_file_type='pts'
-            ,save=False
-            )
-            
-            
-        #print "time", time
-        #print "mem", mem
+        (time, mem, num_tri, one_t,
+         more_t, quad_t) = ben.trial(num_of_points=1000,
+                                     maxArea=0.0001,
+                                     is_fit=True,
+                                     segments_in_mesh=False,
+                                     use_file_type='pts',
+                                     save=False
+                                    )
 
-        #Defaults
-        time_standard = 120.
-        mem_standard = 50000
-        
-        if host.find('tornado') == 0:
-            # Tornado headnode
-            #time_standard = 14.5
-            time_standard = 24.
-            mem_standard = 40468 
-            
-        elif host.find('compute') == 0: # cyclone or tornado node
-            time_standard = 19.0
-            mem_standard = 40468
+        # Get expected machine values, else a default set of values
+        time_standard = 15.0        # max of above, plus a little
+        mem_standard = 40000
+        for key in expected_results:
+            if host.lower().startswith(key):
+                (time_standard, mem_standard) = expected_results[key]
+                break
 
-        elif host.find('cyclone') == 0: # cyclone headnode
-            time_standard = 13.3
-            mem_standard = 40468
-            #mem_standard = 29424
-
-        elif host.find('nautilus') == 0:
-            time_standard = 27.6
-            
-            # v 4910 is giving a mem of 15572
-            mem_standard = 16104 
-            
-
-        elif host.find('bogong') == 0:
-            time_standard = 14.2
-            mem_standard = 30000 # Updated by Ole 20080507
-
-
-        elif host.find('pc-31569') == 0: # DSG's PC
-            time_standard = 31.6
-            mem_standard = 15000 #?
-
-        elif host.find('PC-32572') == 0: # Ross' Ubuntu box - nump trunk
-            time_standard = 12.8
-            mem_standard = 15788 #?
-
-            """
-            test_fit_time_and_mem (__main__.Test_uq) ...  very start mem_usage() 98076
- before fitting mem_usage() 120012
- after fitting mem_usage() 150212
-time 15.19490695
-mem 30200
-
-test_fit_time_and_mem (__main__.Test_uq) ...  very start mem_usage() 98108
- before fitting mem_usage() 134696
- after fitting mem_usage() 155820
-
-            """
-        
-        # Do the assertions here
+        # don't want exception here, report on time *and* memory
+        got_error = False
         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
-
-
+        #print msg
+        #assert time < time_standard*1.2, msg
+        if time > time_standard*1.2:
+            print msg
+            got_error = True
 
         if sys.platform == 'win32':
@@ -135 +110 @@
         msg = ('Memory used was %d KiB, standard is %d KiB +20%% (%d KiB)'
                % (mem, mem_standard, int(mem_standard*1.2)))
+        #print msg
         assert mem < mem_standard*1.2, msg            
+
+        if got_error:
+            raise RuntimeError
             
 #-------------------------------------------------------------