Changeset 7221


Ignore:
Timestamp:
Jun 19, 2009, 8:28:52 AM (15 years ago)
Author:
rwilson
Message:

Added to exception messages, fixed error in tornado memory size standard. Unfortunately, still fails.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • anuga_validation/automated_validation_tests/fitting/validate_benchmark_fit.py

    r7218 r7221  
    6565        #Defaults
    6666        time_standard = 120.
    67         mem_standard = 50000.
     67        mem_standard = 50000
    6868       
    6969        if host.find('tornado') == 0:
     
    7171            #time_standard = 14.5
    7272            time_standard = 24.
    73             mem_standard = 302404.
     73            mem_standard = 30204
    7474           
    7575        elif host.find('compute') == 0: # cyclone or tornado node
    7676            time_standard = 19.0
    77             mem_standard = 30204.
     77            mem_standard = 30204
    7878
    7979        elif host.find('cyclone') == 0: # cyclone headnode
    8080            time_standard = 13.3
    81             mem_standard = 302404.             
    82             #mem_standard = 29424.
     81            mem_standard = 30204             
     82            #mem_standard = 29424
    8383
    8484        elif host.find('nautilus') == 0:
     
    8686           
    8787            # v 4910 is giving a mem of 15572
    88             mem_standard = 15572.
     88            mem_standard = 15572
    8989           
    9090
    9191        elif host.find('bogong') == 0:
    9292            time_standard = 14.2
    93             mem_standard = 30000. # Updated by Ole 20080507
     93            mem_standard = 30000 # Updated by Ole 20080507
    9494
    9595
    9696        elif host.find('pc-31569') == 0: # DSG's PC
    9797            time_standard = 31.6
    98             mem_standard = 15000. #?
     98            mem_standard = 15000 #?
    9999
    100100            """
     
    112112       
    113113        # Do the assertions here
    114         assert time<time_standard*1.2
     114        msg = ('Time used was %.1f s, standard is %.1f s +20%% (%.1f s)'
     115               % (time, time_standard, int(time_standard*1.2)))
     116        assert time < time_standard*1.2
    115117
    116118
     
    127129        #reduced again
    128130
    129         msg = 'Memory used was %d KiB, mem_standard is %d KiB' %(mem, mem_standard)
    130         #print msg
    131         assert mem<mem_standard*1.2, msg           
     131        msg = ('Memory used was %d KiB, standard is %d KiB +20%% (%d KiB)'
     132               % (mem, mem_standard, int(mem_standard*1.2)))
     133        assert mem < mem_standard*1.2, msg           
    132134           
    133135#-------------------------------------------------------------
Note: See TracChangeset for help on using the changeset viewer.