Commit 3e9556ca authored by Martin Schorb's avatar Martin Schorb
Browse files

switch from rendermodules to asap

parent 5f8a3282
......@@ -191,7 +191,7 @@ def bdv_finalize_execute_gobutton(click,jsonfile,launch_store):
log_file += '.log'
mkxml_p = launch_jobs.run(target='standalone',pyscript=params.rendermodules_dir+'rendermodules/materialize/make_xml.py',jsonfile = param_file,
mkxml_p = launch_jobs.run(target='standalone',pyscript=params.rendermodules_dir+'/materialize/make_xml.py',jsonfile = param_file,
logfile=log_file,errfile=err_file)
......
......@@ -212,7 +212,7 @@ def sbem_conv_gobutton(stack_sel, in_dir, click, proj_dd_sel, compute_sel, run_s
#launch
# -----------------------
sbem_conv_p = launch_jobs.run(target=compute_sel,pyscript=params.rendermodules_dir+'/rendermodules/dataimport/generate_EM_tilespecs_from_SBEMImage.py',
sbem_conv_p = launch_jobs.run(target=compute_sel,pyscript=params.rendermodules_dir+'/dataimport/generate_EM_tilespecs_from_SBEMImage.py',
jsonfile=param_file,run_args=None,logfile=log_file,errfile=err_file)
run_state['status'] = 'running'
......
......@@ -203,7 +203,7 @@ def serialem_conv_gobutton(stack_sel, in_dir, click, proj_dd_sel, compute_sel, r
#launch
# -----------------------
sbem_conv_p = launch_jobs.run(target=compute_sel,pyscript=params.rendermodules_dir+'/rendermodules/dataimport/generate_EM_tilespecs_from_SerialEMmontage.py',
sbem_conv_p = launch_jobs.run(target=compute_sel,pyscript=params.rendermodules_dir+'/dataimport/generate_EM_tilespecs_from_SerialEMmontage.py',
jsonfile=param_file,run_args=None,logfile=log_file,errfile=err_file)
run_state['status'] = 'running'
......
......@@ -380,7 +380,7 @@ def mipmaps_gobutton(mipmapdir,click,click2,run_state,comp_sel,runstep_in,owner,
mipmap_generate_p = launch_jobs.run(target=comp_sel,pyscript=params.rendermodules_dir+'/rendermodules/dataimport/generate_mipmaps.py',
mipmap_generate_p = launch_jobs.run(target=comp_sel,pyscript=params.asap_dir+'/dataimport/generate_mipmaps.py',
json=param_file,run_args=None,target_args=target_args,logfile=log_file,errfile=err_file)
......@@ -434,7 +434,7 @@ def mipmaps_gobutton(mipmapdir,click,click2,run_state,comp_sel,runstep_in,owner,
err_file = log_file + '.err'
log_file += '.log'
mipmap_apply_p = launch_jobs.run(target=comp_sel,pyscript=params.rendermodules_dir+'/rendermodules/dataimport/apply_mipmaps_to_render.py',
mipmap_apply_p = launch_jobs.run(target=comp_sel,pyscript=params.asap_dir+'/dataimport/apply_mipmaps_to_render.py',
jsonfile=param_file,run_args=None,logfile=log_file,errfile=err_file)
launch_store=dict()
......
......@@ -20,7 +20,8 @@ conda_dir = '/g/emcf/software/python/miniconda'
render_log_dir = '/g/emcf/software/render-logs'
rendermodules_dir = '/g/emcf/schorb/code/render-modules/'
rendermodules_dir = '/g/emcf/schorb/code/render-modules/rendermodules_addons'
asap_dir = '/g/emcf/schorb/code/asap-modules/asap/'
gc3_conffile = os.path.join(base_dir,'launchers/gc3conf/template_gc3pie.conf')
......
......@@ -278,7 +278,7 @@ def sift_pointmatch_execute_gobutton(click,matchID,matchcoll,comp_sel,mc_owner,t
target_args = None
run_args = None
script = params.rendermodules_dir+'/rendermodules/pointmatch/generate_point_matches_opencv.py'
script = params.asap_dir+'/pointmatch/generate_point_matches_opencv.py'
elif comp_sel == 'sparkslurm':
spsl_p = dict()
......
......@@ -345,7 +345,7 @@ def solve_execute_gobutton(click,matchcoll,outstack,tform,stype,comp_sel,startse
# time.sleep(5)
solve_generate_p = launch_jobs.run(target=comp_sel,pyscript=params.rendermodules_dir+'/rendermodules/solver/solve.py',
solve_generate_p = launch_jobs.run(target=comp_sel,pyscript=params.asap_dir+'/solver/solve.py',
jsonfile=param_file,run_args=None,target_args=None,logfile=log_file,errfile=err_file)
time.sleep(5)
......
......@@ -195,7 +195,7 @@ def tilepairs_execute_gobutton(click,pairmode,stack,slicedepth,comp_sel,startsec
err_file = log_file + '.err'
log_file += '.log'
tilepairs_generate_p = launch_jobs.run(target=comp_sel,pyscript=params.rendermodules_dir+'rendermodules/pointmatch/create_tilepairs.py',
tilepairs_generate_p = launch_jobs.run(target=comp_sel,pyscript=params.asap_dir+'/pointmatch/create_tilepairs.py',
jsonfile=param_file,run_args=None,target_args=None,logfile=log_file,errfile=err_file)
......
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