|
@@ -1,7 +1,7 @@
|
|
|
/* StarPU --- Runtime system for heterogeneous multicore architectures.
|
|
|
*
|
|
|
* Copyright (C) 2016,2017 Inria
|
|
|
- * Copyright (C) 2012,2013,2015-2019 CNRS
|
|
|
+ * Copyright (C) 2012,2013,2015-2020 CNRS
|
|
|
* Copyright (C) 2012-2020 Université de Bordeaux
|
|
|
* Copyright (C) 2013 Thibaut Lambert
|
|
|
*
|
|
@@ -643,13 +643,13 @@ void _starpu_simgrid_submit_job(int workerid, struct _starpu_job *j, struct star
|
|
|
/* This is not useful to include in simulation (and probably
|
|
|
* doesn't have a perfmodel anyway) */
|
|
|
return;
|
|
|
-
|
|
|
+
|
|
|
if (isnan(length))
|
|
|
{
|
|
|
length = starpu_task_expected_length(starpu_task, perf_arch, j->nimpl);
|
|
|
STARPU_ASSERT_MSG(!_STARPU_IS_ZERO(length) && !isnan(length),
|
|
|
- "Codelet %s does not have a perfmodel, or is not calibrated enough, please re-run in non-simgrid mode until it is calibrated",
|
|
|
- _starpu_job_get_model_name(j));
|
|
|
+ "Codelet %s does not have a perfmodel (in directory %s), or is not calibrated enough, please re-run in non-simgrid mode until it is calibrated",
|
|
|
+ _starpu_job_get_model_name(j), _starpu_get_perf_model_dir_codelet());
|
|
|
/* TODO: option to add variance according to performance model,
|
|
|
* to be able to easily check scheduling robustness */
|
|
|
}
|
|
@@ -1242,7 +1242,7 @@ void _starpu_simgrid_count_ngpus(void)
|
|
|
found = 1;
|
|
|
break;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
if (!found)
|
|
|
continue;
|
|
|
|