steffen/hom_traj_gen
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

logging active and clean

Browse Source
This commit is contained in:
steffen 2020-03-03 22:02:24 +01:00
parent 1f612a968c
commit c054751b96
6 changed files with 13 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
.idea/deployment.xml generated
View File

@ -1,15 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="PublishConfigData" autoUpload="On explicit save action" serverName="traj_gen-AiMachine"> <component name="PublishConfigData" autoUpload="On explicit save action" serverName="steffen@aimachine:22">
<serverData> <serverData>
<paths name="ErLoWa-AiMachine"> <paths name="steffen@aimachine:22">
<serverdata>
<mappings>
<mapping local="$PROJECT_DIR$" web="/" />
</mappings>
</serverdata>
</paths>
<paths name="traj_gen-AiMachine">
<serverdata> <serverdata>
<mappings> <mappings>
<mapping deploy="/" local="$PROJECT_DIR$" web="/" /> <mapping deploy="/" local="$PROJECT_DIR$" web="/" />

2
.idea/hom_traj_gen.iml generated
View File

@ -2,7 +2,7 @@
<module type="PYTHON_MODULE" version="4"> <module type="PYTHON_MODULE" version="4">
<component name="NewModuleRootManager"> <component name="NewModuleRootManager">
<content url="file://$MODULE_DIR$" /> <content url="file://$MODULE_DIR$" />
<orderEntry type="jdk" jdkName="traj_gen@AiMachine" jdkType="Python SDK" /> <orderEntry type="jdk" jdkName="Remote Python 3.7.6 (sftp://steffen@aimachine:22/home/steffen/envs/traj_gen/bin/python)" jdkType="Python SDK" />
<orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="sourceFolder" forTests="false" />
</component> </component>
</module> </module>

2
.idea/misc.xml generated
View File

@ -3,5 +3,5 @@
<component name="JavaScriptSettings"> <component name="JavaScriptSettings">
<option name="languageLevel" value="ES6" /> <option name="languageLevel" value="ES6" />
</component> </component>
<component name="ProjectRootManager" version="2" project-jdk-name="traj_gen@AiMachine" project-jdk-type="Python SDK" /> <component name="ProjectRootManager" version="2" project-jdk-name="hom_traj_gen@aimachine" project-jdk-type="Python SDK" />
</project> </project>

16
lib/utils/logging.py
View File

@ -18,9 +18,7 @@ class Logger(LightningLoggerBase):
@property @property
def log_dir(self): def log_dir(self):
if self.debug: return Path(self.testtubelogger.experiment.get_logdir()).parent
return Path(self.outpath)
return Path(self.experiment.log_dir).parent
@property @property
def name(self): def name(self):
@ -32,14 +30,14 @@ class Logger(LightningLoggerBase):
@property @property
def version(self): def version(self):
return f"version_{self.config.get('main', 'seed')}" return self.config.get('main', 'seed')
@property @property
def outpath(self): def outpath(self):
# ToDo: Add further path modification such as dataset config etc. # ToDo: Add further path modification such as dataset config etc.
return Path(self.config.train.outpath) return Path(self.config.train.outpath)
def __init__(self, config: Config, debug=False): def __init__(self, config: Config):
""" """
params (dict|None): Optional. Parameters of the experiment. After experiment creation params are read-only. params (dict|None): Optional. Parameters of the experiment. After experiment creation params are read-only.
Parameters are displayed in the experiment’s Parameters section and each key-value pair can be Parameters are displayed in the experiment’s Parameters section and each key-value pair can be
@ -53,8 +51,8 @@ class Logger(LightningLoggerBase):
""" """
super(Logger, self).__init__() super(Logger, self).__init__()
self.debug = debug
self.config = config self.config = config
self.debug = self.config.main.debug
self._testtube_kwargs = dict(save_dir=self.outpath, version=self.version, name=self.name) self._testtube_kwargs = dict(save_dir=self.outpath, version=self.version, name=self.name)
self._neptune_kwargs = dict(offline_mode=self.debug, self._neptune_kwargs = dict(offline_mode=self.debug,
api_key=self.config.project.neptune_key, api_key=self.config.project.neptune_key,
@ -68,9 +66,9 @@ class Logger(LightningLoggerBase):
self.testtubelogger.log_hyperparams(params) self.testtubelogger.log_hyperparams(params)
pass pass
def log_metrics(self, metrics, step_num): def log_metrics(self, metrics, step=None):
self.neptunelogger.log_metrics(metrics, step_num) self.neptunelogger.log_metrics(metrics, step=step)
self.testtubelogger.log_metrics(metrics, step_num) self.testtubelogger.log_metrics(metrics, step=step)
pass pass
def log_config_as_ini(self): def log_config_as_ini(self):

4
main.py
View File

@ -66,7 +66,7 @@ config = Config.read_namespace(args)
# Logger # Logger
# ============================================================================= # =============================================================================
logger = Logger(config, debug=True) logger = Logger(config)
# Checkpoint Callback # Checkpoint Callback
# ============================================================================= # =============================================================================
@ -95,7 +95,7 @@ if __name__ == "__main__":
log_save_interval=model.data_len // 10, # TODO: Better Value / Setting log_save_interval=model.data_len // 10, # TODO: Better Value / Setting
checkpoint_callback=checkpoint_callback, checkpoint_callback=checkpoint_callback,
logger=logger, logger=logger,
fast_dev_run=config.get('main', 'debug'), fast_dev_run=config.main.debug,
early_stop_callback=None early_stop_callback=None
) )

0
main_post.py Normal file
View File