Merge pull request #1 from boegel/gc3pie

flesh out ideas to restructure --job support to add GC3Pie backend

Author: riccardomurri

easybuild/tools/job/__init__.py

@@ -0,0 +1,32 @@
+##
+# Copyright 2015-2015 Ghent University
+#
+# This file is part of EasyBuild,
+# originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
+# with support of Ghent University (http://ugent.be/hpc),
+# the Flemish Supercomputer Centre (VSC) (https://vscentrum.be/nl/en),
+# the Hercules foundation (http://www.herculesstichting.be/in_English)
+# and the Department of Economy, Science and Innovation (EWI) (http://www.ewi-vlaanderen.be/en).
+#
+# http://github.com/hpcugent/easybuild
+#
+# EasyBuild is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation v2.
+#
+# EasyBuild is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with EasyBuild.  If not, see <http://www.gnu.org/licenses/>.
+##
+"""Interface for submitting jobs via gc3pie"""
+
+from easybuild.tools.job.job import Job
+
+
+# eb --job=GC3Pie
+class GC3Pie(Job):
+    pass

easybuild/tools/job/gc3pie.py

@@ -0,0 +1,29 @@
+##
+# Copyright 2015-2015 Ghent University
+#
+# This file is part of EasyBuild,
+# originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
+# with support of Ghent University (http://ugent.be/hpc),
+# the Flemish Supercomputer Centre (VSC) (https://vscentrum.be/nl/en),
+# the Hercules foundation (http://www.herculesstichting.be/in_English)
+# and the Department of Economy, Science and Innovation (EWI) (http://www.ewi-vlaanderen.be/en).
+#
+# http://github.com/hpcugent/easybuild
+#
+# EasyBuild is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation v2.
+#
+# EasyBuild is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with EasyBuild.  If not, see <http://www.gnu.org/licenses/>.
+##
+"""Abstract interface for submitting jobs"""
+
+
+class Job(object):
+    pass

easybuild/tools/job/job.py

@@ -35,6 +35,8 @@
 import time
 from vsc.utils import fancylogger
 
+from easybuild.tools.job.job import Job
+
 
 _log = fancylogger.getLogger('pbs_job', fname=False)
 
@@ -122,7 +124,7 @@ def make_job(self, script, name, env_vars=None, resources={}):
                       conn=self.conn, ppn=self.ppn)
 
 
-class PbsJob(object):
+class Pbs_python(Job):
     """Interaction with TORQUE"""
 
     def __init__(self, script, name, env_vars=None, resources={}, conn=None, ppn=None):

easybuild/tools/pbs_job.py easybuild/tools/job/pbs_python.pyeasybuild/tools/pbs_job.py renamed to easybuild/tools/job/pbs_python.py

@@ -42,7 +42,7 @@
 from easybuild.tools.build_log import EasyBuildError
 from easybuild.tools.config import get_repository, get_repositorypath
 from easybuild.tools.module_naming_scheme.utilities import det_full_ec_version
-from easybuild.tools.pbs_job import PbsJobFactory
+from easybuild.tools.job.job import job_factory
 #from easybuild.tools.gc3pie_job import GC3PieJobFactory
 from easybuild.tools.repository.repository import init_repository
 from vsc.utils import fancylogger
@@ -78,7 +78,7 @@ def build_easyconfigs_in_parallel(backend, build_command, easyconfigs, output_di
 
     assert backend in _job_submission_backends
     try:
-        job_factory = _job_submission_backends[backend]()
+        job_factory = GC3PieFactory()  #job_factory()
         job_factory.connect_to_server()
     except RuntimeError, err:
         _log.error("connection to server failed (%s: %s), can't submit jobs."

easybuild/tools/parallelbuild.py

@@ -72,7 +72,7 @@ def find_rel_test():
     "easybuild", "easybuild.framework", "easybuild.framework.easyconfig", "easybuild.framework.easyconfig.format",
     "easybuild.toolchains", "easybuild.toolchains.compiler", "easybuild.toolchains.mpi",
     "easybuild.toolchains.fft", "easybuild.toolchains.linalg", "easybuild.tools", "easybuild.tools.deprecated",
-    "easybuild.tools.toolchain", "easybuild.tools.module_naming_scheme", "easybuild.tools.repository",
+    "easybuild.tools.job", "easybuild.tools.toolchain", "easybuild.tools.module_naming_scheme", "easybuild.tools.repository",
     "test.framework", "test",
     "vsc", "vsc.utils",
 ]