fixed broken commit 7976d67860
This commit is contained in:
parent
e550ba408f
commit
ea28ea0293
|
@ -3,7 +3,7 @@
|
||||||
from typing import List, Tuple, Dict
|
from typing import List, Tuple, Dict
|
||||||
import argparse
|
import argparse
|
||||||
from os import getenv, makedirs
|
from os import getenv, makedirs
|
||||||
from .core import IBenchmark, BenchmarkConfig, BenchmarkId, ResultsDbParams
|
from .core import IBenchmark, BenchmarkConfig, BenchmarkId, ResultsDbParams, BenchParam
|
||||||
from .main import BenchmarkFactory
|
from .main import BenchmarkFactory
|
||||||
from .util import Singleton
|
from .util import Singleton
|
||||||
import shutil
|
import shutil
|
||||||
|
@ -377,7 +377,6 @@ def main():
|
||||||
|
|
||||||
args = arg_parser.parse_args()
|
args = arg_parser.parse_args()
|
||||||
benchmark_id = ClusterId(args.benchmark_id)
|
benchmark_id = ClusterId(args.benchmark_id)
|
||||||
benchmark = BenchmarkFactory().create_benchmark(benchmark_id)
|
|
||||||
|
|
||||||
results_dir = Path(args.results_dir)
|
results_dir = Path(args.results_dir)
|
||||||
arch_regexp = args.arch_regexp
|
arch_regexp = args.arch_regexp
|
||||||
|
@ -386,6 +385,12 @@ def main():
|
||||||
cluster = ClusterFactory().create_cluster(args.cluster_id)
|
cluster = ClusterFactory().create_cluster(args.cluster_id)
|
||||||
resultsdb_params = json.loads(args.resultsdb_params)
|
resultsdb_params = json.loads(args.resultsdb_params)
|
||||||
|
|
||||||
|
# TODO: put the declaration of common params in a common function so that there is only one set of common parameters
|
||||||
|
common_params: List[BenchParam] = []
|
||||||
|
common_params.append(BenchParam('launcher', BenchParam.Type.PARAM_TYPE_STRING, description='what triggered the benchmark (eg "alambix.job.12345", or "manual")'))
|
||||||
|
|
||||||
|
benchmark = BenchmarkFactory().create_benchmark(benchmark_id, common_params)
|
||||||
|
|
||||||
if not cluster.path_is_reachable_by_compute_nodes(results_dir):
|
if not cluster.path_is_reachable_by_compute_nodes(results_dir):
|
||||||
raise ValueError('the results path is expected to be on a disk that is accessible to all cluster nodes, and it doesn\'t seem to be the case for {results_dir}')
|
raise ValueError('the results path is expected to be on a disk that is accessible to all cluster nodes, and it doesn\'t seem to be the case for {results_dir}')
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue