Changes in benchmark/rmit.py [3613e25:e9c5db2]

File:

• benchmark/rmit.py (modified) (6 diffs)

benchmark/rmit.py

@@ -46 +46 @@
                 pass
 
-        if values.startswith('\\'):
-                return key, values[1:].split(',')
-        elif re.search("^[0-9-,]+$", values):
+        if re.search("^[0-9-,]+$", values):
                 values = parse_range(values)
                 return key, [v for v in values]
@@ -65 +63 @@
         return eval(fmt)
 
-# Evaluate all the options
-# options can be of the for key = val or key = some_math(other_key)
-# produce a list of all the options to replace some_math(other_key) with actual value
 def eval_options(opts):
-        # Find all the options with dependencies
         dependents = [d for d in opts.values() if type(d) is DependentOpt]
-
-        # we need to find all the straglers
         processed = []
-
-        # extract all the necessary inputs
-        input_keys = {}
+        nopts = []
         for d in dependents:
-                # Mark the dependent as seen
                 processed.append(d.key)
-
-                # process each of the dependencies
+                lists = []
                 for dvar in d.vars:
-                        # Check that it depends on something that exists
                         if not dvar in opts.keys():
                                 print('ERROR: extra pattern option {}:{} uses unknown key {}'.format(d.key,d.value,dvar), file=sys.stderr)
                                 sys.exit(1)
 
-                        # Check that it's not nested
-                        if type(dvar) is DependentOpt:
-                                print('ERROR: dependent options cannot be nested {}:{} uses key {}'.format(d.key,d.value,dvar), file=sys.stderr)
-                                sys.exit(1)
-
-                        # Add the values to the input keys
-                        if dvar not in input_keys:
-                                input_keys[dvar] = opts[dvar]
-                        else :
-                                if input_keys[dvar] != opts[dvar]:
-                                        print('INTERNAL ERROR: repeat input do not match {}:{} vs {}'.format(dvar,opts[dvar],input_keys[dvar]), file=sys.stderr)
-                                        sys.exit(1)
-
-                        # Mark the input as seen
+                        lists.append([(dvar, o) for o in opts[dvar]])
                         processed.append(dvar)
 
-        # add in all the straglers they should cause too many problems
-        for k, v in opts.items():
-                if type(v) is DependentOpt:
-                        continue
-
-                if k in processed:
-                        # consistency check
-                        if k not in input_keys:
-                                print('INTERNAL ERROR: key \'{}\' marked as processed but not in input_keys'.format(k), file=sys.stderr)
-                                sys.exit(1)
-                        continue
-
-                # consistency check
-                if k in input_keys:
-                        print('INTERNAL ERROR: key \'{}\' in input_keys but not marked as processed'.format(k), file=sys.stderr)
-                        sys.exit(1)
-
-                # add the straggler
-                input_keys[k] = v
-
-        # flatten the dict into a list of pairs so it's easier to work with
-        input_list = []
-        for k, v in input_keys.items():
-                input_list.append([(k, o) for o in v])
-
-        # evaluate all the dependents
-        # they are not allowed to produce new values so it's a one-to-one mapping from here
-        evaluated = []
-        for inputs in list(itertools.product(*input_list)):
-                this_eval = list(inputs)
-                for d in dependents:
-                        this_eval.append((d.key, eval_one(d.value, inputs)))
-
-                evaluated.append(this_eval)
-
-        # reformat everything to a list of arguments
-        formated = []
-        for o in evaluated:
-                inner = []
-                for k,v in o:
-                        inner.append("-{}".format(k))
-                        inner.append("{}".format(v))
-
-                # print(inner)
-                formated.append(inner)
-
-        return formated
+                kopt = []
+                for vals in list(itertools.product(*lists)):
+                        res = ['-{}'.format(d.key), "{}".format(eval_one(d.value, vals))]
+                        for k, v in vals:
+                                res.extend(['-{}'.format(k), "{}".format(v)])
+                        kopt.append(res)
+                nopts.append(kopt)
+
+
+        for k, vals in opts.items():
+                if k not in processed:
+                        kopt = []
+                        for v in vals:
+                                kopt.append(['-{}'.format(k), "{}".format(v)])
+                        nopts.append(kopt)
+
+        return nopts
 
 # returns the first option with key 'opt'
@@ -178 +122 @@
         known_hosts = {
                 "jax": {
-                        range(  1,  25) : "48-71",
-                        range( 25,  49) : "48-71,144-167",
-                        range( 49,  97) : "48-95,144-191",
-                        range( 97, 145) : "24-95,120-191",
-                        range(145, 193) : "0-95,96-191",
+                        range(  1,  24) : "48-71",
+                        range( 25,  48) : "48-71,144-167",
+                        range( 49,  96) : "48-95,144-191",
+                        range( 97, 144) : "24-95,120-191",
+                        range(145, 192) : "0-95,96-191",
                 },
         }
@@ -240 +184 @@
 
         except:
+                print('ERROR: invalid arguments', file=sys.stderr)
+                parser.print_help(sys.stderr)
                 sys.exit(1)
 
@@ -269 +215 @@
         # Figure out all the combinations to run
         actions = []
-        for p in itertools.product(range(options.trials), commands, opts):
+        for p in itertools.product(range(options.trials), commands, *opts):
                 act = [p[1]]
                 for o in p[2:]:
@@ -335 +281 @@
 
         if options.file != sys.stdout:
-                print("Done                                                                                ")
+                print("Done");                                                                                ")