From def104f19f571bfd67de5ecd3b37ed2e4bb7c5d8 Mon Sep 17 00:00:00 2001 From: Shivesh Mandalia Date: Sat, 29 Feb 2020 02:43:35 +0000 Subject: python3 support --- submitter/contour_dag.py | 8 +++++--- submitter/fr_dag.py | 10 ++++++---- submitter/mc_texture_dag.py | 10 ++++++---- submitter/sens_dag.py | 16 +++++++++------- 4 files changed, 26 insertions(+), 18 deletions(-) (limited to 'submitter') diff --git a/submitter/contour_dag.py b/submitter/contour_dag.py index d8e8e49..fc7c191 100644 --- a/submitter/contour_dag.py +++ b/submitter/contour_dag.py @@ -1,5 +1,7 @@ #! /usr/bin/env python +from __future__ import absolute_import, division, print_function + import os import numpy as np @@ -52,7 +54,7 @@ dagfile += prefix + '.submit' with open(dagfile, 'w') as f: job_number = 1 for inj in injected_ratios: - print 'inj', inj + print('inj', inj) f.write('JOB\tjob{0}\t{1}\n'.format(job_number, condor_script)) f.write('VARS\tjob{0}\tir0="{1}"\n'.format(job_number, inj[0])) f.write('VARS\tjob{0}\tir1="{1}"\n'.format(job_number, inj[1])) @@ -63,5 +65,5 @@ with open(dagfile, 'w') as f: job_number += 1 if GLOBAL_PARAMS['data'] == 'real': break -print 'total jobs = {0}'.format(job_number - 1) -print 'dag file = {0}'.format(dagfile) +print('total jobs = {0}'.format(job_number - 1)) +print('dag file = {0}'.format(dagfile)) diff --git a/submitter/fr_dag.py b/submitter/fr_dag.py index d50417c..b0902f6 100644 --- a/submitter/fr_dag.py +++ b/submitter/fr_dag.py @@ -1,5 +1,7 @@ #! /usr/bin/env python +from __future__ import absolute_import, division, print_function + import os import numpy as np @@ -61,10 +63,10 @@ dagfile += prefix + '.submit' with open(dagfile, 'w') as f: job_number = 1 for dim in dims: - print 'dims', dim + print('dims', dim) of_d = datadir + '/DIM{0}/{1}'.format(dim, prefix) for src, tex in scenarios: - print 'scenario: src =', src, 'tex =', tex + print('scenario: src =', src, 'tex =', tex) f.write('JOB\tjob{0}\t{1}\n'.format(job_number, condor_script)) f.write('VARS\tjob{0}\tdimension="{1}"\n'.format(job_number, dim)) f.write('VARS\tjob{0}\ttexture="{1}"\n'.format(job_number, tex)) @@ -76,6 +78,6 @@ with open(dagfile, 'w') as f: f.write('VARS\tjob{0}\tdatadir="{1}"\n'.format(job_number, datadir)) job_number += 1 -print 'total jobs = {0}'.format(job_number - 1) -print 'dag file = {0}'.format(dagfile) +print('total jobs = {0}'.format(job_number - 1)) +print('dag file = {0}'.format(dagfile)) diff --git a/submitter/mc_texture_dag.py b/submitter/mc_texture_dag.py index 0b5adf4..a52f044 100644 --- a/submitter/mc_texture_dag.py +++ b/submitter/mc_texture_dag.py @@ -1,5 +1,7 @@ #! /usr/bin/env python +from __future__ import absolute_import, division, print_function + import os import numpy as np @@ -55,9 +57,9 @@ dagfile += prefix + '.submit' with open(dagfile, 'w') as f: job_number = 1 for src in source_ratios: - print 'src', src + print('src', src) for tex in textures: - print 'texture', tex + print('texture', tex) f.write('JOB\tjob{0}\t{1}\n'.format(job_number, condor_script)) f.write('VARS\tjob{0}\tsr0="{1}"\n'.format(job_number, src[0])) f.write('VARS\tjob{0}\tsr1="{1}"\n'.format(job_number, src[1])) @@ -68,6 +70,6 @@ with open(dagfile, 'w') as f: f.write('VARS\tjob{0}\tdatadir="{1}"\n'.format(job_number, datadir)) job_number += 1 -print 'total jobs = {0}'.format(job_number - 1) -print 'dag file = {0}'.format(dagfile) +print('total jobs = {0}'.format(job_number - 1)) +print('dag file = {0}'.format(dagfile)) diff --git a/submitter/sens_dag.py b/submitter/sens_dag.py index c51fcbe..1fa1531 100644 --- a/submitter/sens_dag.py +++ b/submitter/sens_dag.py @@ -1,5 +1,7 @@ #! /usr/bin/env python +from __future__ import absolute_import, division, print_function + import os import numpy as np @@ -72,14 +74,14 @@ dagfile += prefix + '.submit' with open(dagfile, 'w') as f: job_number = 1 for dim in dims: - print 'dims', dim + print('dims', dim) of_d = datadir + '/DIM{0}/{1}'.format(dim, prefix) for sources, tex in scenarios: - print 'texture', tex + print('texture', tex) for src in sources: - print 'source flavor', src - for r in xrange(GLOBAL_PARAMS['segments']): - print 'run', r + print('source flavor', src) + for r in range(GLOBAL_PARAMS['segments']): + print('run', r) f.write('JOB\tjob{0}\t{1}\n'.format(job_number, condor_script)) f.write('VARS\tjob{0}\tdimension="{1}"\n'.format(job_number, dim)) f.write('VARS\tjob{0}\tsr0="{1}"\n'.format(job_number, src[0])) @@ -92,5 +94,5 @@ with open(dagfile, 'w') as f: f.write('VARS\tjob{0}\tdatadir="{1}"\n'.format(job_number, of_d)) job_number += 1 -print 'total jobs = {0}'.format(job_number - 1) -print 'dag file = {0}'.format(dagfile) +print('total jobs = {0}'.format(job_number - 1)) +print('dag file = {0}'.format(dagfile)) -- cgit v1.2.3