Merge pull request #2513 from lfield/rpc-fpops-est

Obtain the rsc_fpops_est from the job_params
This commit is contained in:
Kevin Reed 2018-05-14 08:51:37 -05:00 committed by GitHub
commit 5c45c2bce1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 0 deletions

View File

@ -426,6 +426,8 @@ function submit_batch($r) {
$total_flops += $job->rsc_fpops_est;
} else if ($job->input_template && $job->input_template->workunit->rsc_fpops_est) {
$total_flops += (double) $job->input_template->workunit->rsc_fpops_est;
} else if ($r->batch->job_params->rsc_fpops_est) {
$total_flops += (double) $r->batch->job_params->rsc_fpops_est;
} else {
$x = (double) $template->workunit->rsc_fpops_est;
if ($x) {