Commit 00e3572b authored by Richard O'Shaughnessy's avatar Richard O'Shaughnessy

CIPP.bi: fix problem with iteration (convert step).

parent 6a993582
......@@ -70,6 +70,7 @@ parser.add_argument("--convert-args",default=None,help="filename of args_convert
parser.add_argument("--plot-args",default=None,help="filename of args_plot.txt, which holds plot arguments. Note i/o arguments will be modified, so should NOT specify the samples files or the output file, just the test to be performed and any related arguments")
parser.add_argument("--ile-batch",action='store_true',help="Different workflow: the ILE job is assumed to create a .composite file directly in the current working directory. Designed for fake ILE sets and long-term batch workflow. NOT IMPLEMENTED ")
parser.add_argument("--transfer-file-list",default=None,help="File containing list of *input* filenames to transfer, one name per file. Copied into transfer_files for condor directly. If provided, also enables attempts to deduce files that need to be transferred for the pipeline to operate, as needed for OSG, etc")
parser.add_argument("--request-memory-ILE",default=4096,type=int,help="Memory request for condor (in Mb) for ILE jobs.")
parser.add_argument("--request-memory-CIP",default=16384,type=int,help="Memory request for condor (in Mb) for fitting jobs.")
parser.add_argument('--n-copies',default=2,type=int,help="Number of duplicates of each ILE job, for redundant Monte Carlo")
parser.add_argument('--n-iterations',default=3,type=int,help="Number of iterations to perform")
......@@ -229,7 +230,7 @@ for indx in np.arange(it_start,opts.n_iterations):
## ILE job
ile_job, ile_job_name = dag_utils.write_ILE_sub_simple(tag='ILE',log_dir=None,arg_str=ile_args,output_file="CME_out.xml",ncopies=opts.n_copies,exe=opts.ile_exe,transfer_files=transfer_file_names)
ile_job, ile_job_name = dag_utils.write_ILE_sub_simple(tag='ILE',log_dir=None,arg_str=ile_args,output_file="CME_out.xml",ncopies=opts.n_copies,exe=opts.ile_exe,transfer_files=transfer_file_names,request_memory=opts.request_memory_ILE)
# Modify: create macro for iteration
# - added on a per-node basis
# Modify: add macro argument for overlap grid to be used (kept in top-level directory)
......@@ -284,7 +285,6 @@ if opts.test_args:
convert_job.add_condor_cmd("initialdir",opts.working_directory)
convert_job.set_log_file(opts.working_directory+"/iteration_$(macroiteration)_test/logs/convert-$(cluster)-$(process).log")
convert_job.set_stderr_file(opts.working_directory+"/iteration_$(macroiteration)_test/logs/convert-$(cluster)-$(process).err")
convert_job.set_stdout_file(opts.working_directory+"/iteration_$(macroiteration)_test/logs/convert-$(cluster)-$(process).out")
convert_job.write_sub_file()
......@@ -381,7 +381,7 @@ for it in np.arange(it_start,opts.n_iterations):
if opts.test_args and i>0:
if opts.test_args and it>0:
# Cannot run test on first iteration
test_node = pipeline.CondorDAGNode(test_job)
test_node.add_macro("macroiteration", it)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment