Skip to content
Snippets Groups Projects
Commit 8354dc0c authored by Pavel KORSHUNOV's avatar Pavel KORSHUNOV
Browse files

Merge branch 'annots' into 'master'

Improvements

See merge request !31
parents e31cb9d7 a301d629
No related branches found
No related tags found
1 merge request!31Improvements
Pipeline #
......@@ -114,7 +114,6 @@ def add_jobs(args, submitter):
**args.grid.projection_queue)
deps.append(job_ids['projection'])
concat_deps = {}
for group in args.groups:
# compute scores
if not args.skip_score_computation:
......@@ -124,14 +123,8 @@ def add_jobs(args, submitter):
job_ids['score-%s' % group] = submitter.submit(
'--sub-task compute-scores --group %s' % group,
name="score-%s" % group,
number_of_parallel_jobs=args.grid.number_of_scoring_jobs,
dependencies=deps,
**args.grid.scoring_queue)
concat_deps[group] = [job_ids['score-%s' % group]]
else:
concat_deps[group] = []
if args.grid is None:
# return the list of jobs that need to be executed in series
......
......@@ -120,7 +120,7 @@ def project(algorithm, extractor, groups=None, indices=None, allow_missing_files
logger.debug("... Cannot find extracted feature file %s; skipping", feature_file)
continue
else:
logger.error("Cannot find extracted feature file %s", feature_file)
raise RuntimeError("Cannot find extracted feature file %s" % feature_file)
if not utils.check_file(projected_file, force, 1000):
logger.debug("... Projecting features for file '%s'", feature_file)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment