From 82b863feb9aadc5c6dadec9fd639e88d0de07817 Mon Sep 17 00:00:00 2001 From: Karamaz0V1 Date: Thu, 4 Oct 2018 08:15:23 +0200 Subject: [PATCH 1/2] Add setup.py to access minigrida package --- setup.py | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 setup.py diff --git a/setup.py b/setup.py new file mode 100644 index 0000000..9dbb74b --- /dev/null +++ b/setup.py @@ -0,0 +1,20 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- +# \file setup.py +# \brief TODO +# \author Florent Guiotte +# \version 0.1 +# \date 2 oct. 2018 +# +# TODO details + +from distutils.core import setup + +setup(name='minigrida', + version='1.11', + description='Simple and decentralized computing grid', + author='Florent Guiotte', + author_email='florent.guiotte@uhb.fr', + url='https://git.guiotte.fr/Florent/minigrida', + packages=['cvgenerators', 'descriptors', 'protocols'], + ) From 8a46668ff0c9b3449548ad575611b62570f1c125 Mon Sep 17 00:00:00 2001 From: Karamaz0V1 Date: Sat, 13 Oct 2018 18:59:32 +0200 Subject: [PATCH 2/2] Upgrade queue management for big job list --- supervisor.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/supervisor.py b/supervisor.py index 4b7c000..63cacb8 100644 --- a/supervisor.py +++ b/supervisor.py @@ -164,6 +164,9 @@ class ExpePath: def _get_complete_name(self): return self._get_hash_name() + '.yml' + def exists(self): + return self._actual.exists() + def stage(self, expe): log.info('Staging {}'.format(self._base_name)) self._check_hash(expe) @@ -219,7 +222,11 @@ def main(): watch_folder() continue try: - run(queue.pop()['expe_file']) + expe_file = queue.pop()['expe_file'] + while(not expe_file.exists() and queue): + expe_file = queue.pop()['expe_file'] + if expe_file.exists(): + run(expe_file) except TestError: log.warning('Test failed, error logged. Resuming') except Exception: