Skip to content
Snippets Groups Projects
Commit afe2a0e8 authored by Nicola Vigano's avatar Nicola Vigano
Browse files

gtSetupReconstruction: fixed submission of jobs to OAR

parent 9e9bb884
No related branches found
No related tags found
No related merge requests found
...@@ -142,8 +142,8 @@ if strcmpi(check, 'y') ...@@ -142,8 +142,8 @@ if strcmpi(check, 'y')
end end
if (rec_on_OAR) if (rec_on_OAR)
launch_on_OAR('gtReconstructGrains', first, last, phaseID_str, ... launch_on_OAR('gtReconstructGrains', first, last, phaseID_str, ...
parameters, 'core', 8, 'njobs', 8, ... parameters, 'njobs', 8, 'walltime', 3600 * 16, ...
'walltime', 3600 * 16, 'gpu', true, 'distribute', true); 'gpu', true, 'distribute', true);
else else
gtReconstructGrains(first, last, parameters.acq.dir, phaseID, parameters); gtReconstructGrains(first, last, parameters.acq.dir, phaseID, parameters);
end end
...@@ -161,7 +161,8 @@ if (~rec_on_OAR) ...@@ -161,7 +161,8 @@ if (~rec_on_OAR)
check = inputwdefault('Launch grain segmentation via OAR? [y/n]', 'y'); check = inputwdefault('Launch grain segmentation via OAR? [y/n]', 'y');
if (strcmpi(check, 'y')) if (strcmpi(check, 'y'))
launch_on_OAR('gtChangeThreshold3D', first, last, phaseID_str, parameters); launch_on_OAR('gtChangeThreshold3D', first, last, ...
phaseID_str, parameters, 'core', 4);
else else
gtChangeThreshold3D(first, last, parameters.acq.dir, phaseID); gtChangeThreshold3D(first, last, parameters.acq.dir, phaseID);
end end
...@@ -177,6 +178,7 @@ function launch_on_OAR(func_name, first, last, phaseID_str, parameters, varargin ...@@ -177,6 +178,7 @@ function launch_on_OAR(func_name, first, last, phaseID_str, parameters, varargin
oar.walltime = last / oar.njobs * 300; % allow up to 300 seconds per grain oar.walltime = last / oar.njobs * 300; % allow up to 300 seconds per grain
oar.mem = 2048; % Mb oar.mem = 2048; % Mb
oar.gpu = true; oar.gpu = true;
oar.core = [];
oar.distribute = true; oar.distribute = true;
oar = parse_pv_pairs(oar, varargin); oar = parse_pv_pairs(oar, varargin);
...@@ -200,7 +202,7 @@ function launch_on_OAR(func_name, first, last, phaseID_str, parameters, varargin ...@@ -200,7 +202,7 @@ function launch_on_OAR(func_name, first, last, phaseID_str, parameters, varargin
OAR_make(func_name, first, last, OAR_parameters.njobs, ... OAR_make(func_name, first, last, OAR_parameters.njobs, ...
[parameters.acq.dir ' ' phaseID_str ' '''''], true, ... [parameters.acq.dir ' ' phaseID_str ' '''''], true, ...
'walltime', OAR_parameters.walltime, 'mem', OAR_parameters.mem, ... 'walltime', OAR_parameters.walltime, 'mem', OAR_parameters.mem, ...
'cpu', [], 'core', [], 'gpu', OAR_parameters.gpu, ..., 'cpu', [], 'core', oar.core, 'gpu', OAR_parameters.gpu, ...,
'distribute', true); 'distribute', true);
end end
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment