From 61a0db8a1b2d7918d0fb250e6fdb500de4c8c022 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Sierro?= Date: Mon, 7 Jun 2021 16:46:25 +0200 Subject: [PATCH] misc --- src/scgenerator/cli/cli.py | 23 +++++++++++------------ src/scgenerator/utils.py | 1 - 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/src/scgenerator/cli/cli.py b/src/scgenerator/cli/cli.py index 2bd9e72..f8350dc 100644 --- a/src/scgenerator/cli/cli.py +++ b/src/scgenerator/cli/cli.py @@ -1,20 +1,20 @@ import argparse import os -from pathlib import Path import random +from pathlib import Path + +from scgenerator import io +from scgenerator.physics.simulate import ( + SequencialSimulations, + resume_simulations, + run_simulation_sequence, +) try: import ray except ImportError: ray = None -from scgenerator.physics.simulate import ( - run_simulation_sequence, - resume_simulations, - SequencialSimulations, -) -from scgenerator import io - def create_parser(): parser = argparse.ArgumentParser(description="scgenerator command", prog="scgenerator") @@ -30,7 +30,7 @@ def create_parser(): parser.add_argument( "--start-ray", action="store_true", - help="assume no ray instance has been started beforehand", + help="initialize ray (ray must be installed)", ) parser.add_argument( @@ -94,12 +94,11 @@ def prep_ray(args): try: init_str = ray.init( address="auto", - # _node_ip_address=os.environ.get("ip_head", "127.0.0.1").split(":")[0], _redis_password=os.environ.get("redis_password", "caco1234"), ) print(init_str) - except ConnectionError: - pass + except ConnectionError as e: + print(e) return SequencialSimulations if args.no_ray else None diff --git a/src/scgenerator/utils.py b/src/scgenerator/utils.py index eade833..7e6f636 100644 --- a/src/scgenerator/utils.py +++ b/src/scgenerator/utils.py @@ -173,7 +173,6 @@ def progress_worker( if raw == 0: return i, rel_pos = raw - print(i) pbars[i].update(rel_pos - pbars[i].n) pbars[0].update()