From 16dfc8df20c6befeed423217a2e0f5ae59b5a04d Mon Sep 17 00:00:00 2001 From: Jonathan Herman Date: Mon, 18 Mar 2013 13:15:42 -0400 Subject: Use smarter defaults which can handle data from Bjorns scripts. --- gen/generator.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gen/generator.py') diff --git a/gen/generator.py b/gen/generator.py index dbf2a7b..8c3048b 100644 --- a/gen/generator.py +++ b/gen/generator.py @@ -1,11 +1,10 @@ import gen.rv as rv import os -import run.litmus_util as lu import shutil as sh from Cheetah.Template import Template from collections import namedtuple -from common import get_config_option +from common import get_config_option,num_cpus from config.config import DEFAULTS,PARAMS from gen.dp import DesignPointGenerator from parse.col_map import ColMapBuilder @@ -69,7 +68,7 @@ class Generator(object): if 'cpus' in params: cpus = min(map(int, params['cpus'])) else: - cpus = lu.num_cpus() + cpus = num_cpus() try: config = get_config_option("RELEASE_MASTER") and True except: -- cgit v1.2.2