Fixed conflicts between cluster and github versions
This commit is contained in:
+29
-27
@@ -21,46 +21,43 @@ logger = logging.getLogger()
|
||||
|
||||
|
||||
parser = argparse.ArgumentParser()
|
||||
parser.add_argument("--folder", type=str, help="location to save submitit logs")
|
||||
parser.add_argument(
|
||||
'--folder', type=str,
|
||||
help='location to save submitit logs')
|
||||
"--batch-launch",
|
||||
action="store_true",
|
||||
help="whether fname points to a file to batch-lauch several config files",
|
||||
)
|
||||
parser.add_argument(
|
||||
'--batch-launch', action='store_true',
|
||||
help='whether fname points to a file to batch-lauch several config files')
|
||||
"--fname",
|
||||
type=str,
|
||||
help="yaml file containing config file names to launch",
|
||||
default="configs.yaml",
|
||||
)
|
||||
parser.add_argument("--partition", type=str, help="cluster partition to submit jobs on")
|
||||
parser.add_argument(
|
||||
'--fname', type=str,
|
||||
help='yaml file containing config file names to launch',
|
||||
default='configs.yaml')
|
||||
"--nodes", type=int, default=1, help="num. nodes to request for job"
|
||||
)
|
||||
parser.add_argument(
|
||||
'--partition', type=str,
|
||||
help='cluster partition to submit jobs on')
|
||||
parser.add_argument(
|
||||
'--nodes', type=int, default=1,
|
||||
help='num. nodes to request for job')
|
||||
parser.add_argument(
|
||||
'--tasks-per-node', type=int, default=1,
|
||||
help='num. procs to per node')
|
||||
parser.add_argument(
|
||||
'--time', type=int, default=4300,
|
||||
help='time in minutes to run job')
|
||||
"--tasks-per-node", type=int, default=1, help="num. procs to per node"
|
||||
)
|
||||
parser.add_argument("--time", type=int, default=4300, help="time in minutes to run job")
|
||||
|
||||
|
||||
class Trainer:
|
||||
|
||||
def __init__(self, fname='configs.yaml', load_model=None):
|
||||
def __init__(self, fname="configs.yaml", load_model=None):
|
||||
self.fname = fname
|
||||
self.load_model = load_model
|
||||
|
||||
def __call__(self):
|
||||
fname = self.fname
|
||||
load_model = self.load_model
|
||||
logger.info(f'called-params {fname}')
|
||||
logger.info(f"called-params {fname}")
|
||||
|
||||
# -- load script params
|
||||
params = None
|
||||
with open(fname, 'r') as y_file:
|
||||
with open(fname, "r") as y_file:
|
||||
params = yaml.load(y_file, Loader=yaml.FullLoader)
|
||||
logger.info('loaded params...')
|
||||
logger.info("loaded params...")
|
||||
pp = pprint.PrettyPrinter(indent=4)
|
||||
pp.pprint(params)
|
||||
|
||||
@@ -69,7 +66,9 @@ class Trainer:
|
||||
|
||||
def checkpoint(self):
|
||||
fb_trainer = Trainer(self.fname, True)
|
||||
return submitit.helpers.DelayedSubmission(fb_trainer,)
|
||||
return submitit.helpers.DelayedSubmission(
|
||||
fb_trainer,
|
||||
)
|
||||
|
||||
|
||||
def launch():
|
||||
@@ -83,7 +82,8 @@ def launch():
|
||||
nodes=args.nodes,
|
||||
ntasks_per_node=args.tasks_per_node,
|
||||
cpus_per_task=10,
|
||||
gpus_per_node=args.tasks_per_node)
|
||||
gpus_per_node=args.tasks_per_node,
|
||||
)
|
||||
|
||||
config_fnames = [args.fname]
|
||||
|
||||
@@ -91,7 +91,9 @@ def launch():
|
||||
with executor.batch():
|
||||
for cf in config_fnames:
|
||||
fb_trainer = Trainer(cf)
|
||||
job = executor.submit(fb_trainer,)
|
||||
job = executor.submit(
|
||||
fb_trainer,
|
||||
)
|
||||
trainers.append(fb_trainer)
|
||||
jobs.append(job)
|
||||
|
||||
@@ -99,6 +101,6 @@ def launch():
|
||||
print(job.job_id)
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
if __name__ == "__main__":
|
||||
args = parser.parse_args()
|
||||
launch()
|
||||
|
||||
Reference in New Issue
Block a user