Merge pull request #8 from boegel/module-append-text

fix conflict with develop

Author: pescobar

easybuild/framework/easyblock.py

@@ -915,16 +915,19 @@ def load_module(self, mod_paths=None, purge=True):
         """
         Load module for this software package/version, after purging all currently loaded modules.
         """
+        modtool = modules_tool()
+        if mod_paths is not None:
+            for mod_path in mod_paths:
+                modtool.prepend_module_path(mod_path)
         # self.mod_name might not be set (e.g. during unit tests)
         if self.mod_name is not None:
-            m = modules_tool(mod_paths=mod_paths)
             # purge all loaded modules if desired
             if purge:
-                m.purge()
+                modtool.purge()
                 # restore original environment
                 modify_env(os.environ, self.orig_environ)
-            m.check_module_path()  # make sure MODULEPATH is set correctly after purging
-            m.load([self.mod_name])
+            modtool.check_module_path()  # make sure MODULEPATH is set correctly after purging
+            modtool.load([self.mod_name])
         else:
             self.log.warning("Not loading module, since self.mod_name is not set.")
 
@@ -940,35 +943,29 @@ def load_fake_module(self, purge=False):
         fake_mod_path = self.make_module_step(True)
 
         # load fake module
-        mod_paths = [fake_mod_path]
-        mod_paths.extend(self.orig_modulepath.split(':'))
-        self.log.debug("mod_paths: %s" % mod_paths)
-
-        self.load_module(mod_paths=mod_paths, purge=purge)
+        modtool = modules_tool()
+        modtool.prepend_module_path(fake_mod_path)
+        self.load_module(purge=purge)
 
         return (fake_mod_path, orig_env)
 
     def clean_up_fake_module(self, fake_mod_data):
         """
         Clean up fake module.
         """
-
         fake_mod_path, orig_env = fake_mod_data
-
         # unload module and remove temporary module directory
-        if fake_mod_path:
+        # self.mod_name might not be set (e.g. during unit tests)
+        if fake_mod_path and self.mod_name is not None:
             try:
-                mod_paths = [fake_mod_path]
-                mod_paths.extend(self.modules_tool.mod_paths)
-                m = modules_tool(mod_paths=mod_paths)
-                # self.mod_name might not be set (e.g. during unit tests)
-                if self.mod_name is not None:
-                    m.unload([self.mod_name])
-                else:
-                    self.log.warning("Not unloading module, since self.mod_name is not set.")
+                modtool = modules_tool()
+                modtool.unload([self.mod_name])
+                modtool.remove_module_path(fake_mod_path)
                 rmtree2(os.path.dirname(fake_mod_path))
             except OSError, err:
                 self.log.error("Failed to clean up fake module dir: %s" % err)
+        elif self.mod_name is None:
+            self.log.warning("Not unloading module, since self.mod_name is not set.")
 
         # restore original environment
         modify_env(os.environ, orig_env)

easybuild/main.py

@@ -40,6 +40,7 @@
 import subprocess
 import sys
 import tempfile
+import traceback
 from vsc.utils import fancylogger
 from vsc.utils.missing import any
 
@@ -88,6 +89,7 @@ def build_and_install_software(ecs, init_session_state, exit_on_failure=True):
             # purposely catch all exceptions
             ec_res['success'] = False
             ec_res['err'] = err
+            ec_res['traceback'] = traceback.format_exc()
 
         # keep track of success/total count
         if ec_res['success']:
@@ -104,7 +106,10 @@ def build_and_install_software(ecs, init_session_state, exit_on_failure=True):
             write_file(test_report_fp, test_report_txt)
 
         if not ec_res['success'] and exit_on_failure:
-            _log.error(test_msg)
+            if 'traceback' in ec_res:
+                _log.error(ec_res['traceback'])
+            else:
+                _log.error(test_msg)
 
         res.append((ec, ec_res))
 
@@ -234,6 +239,7 @@ def main(testing_data=(None, None, None)):
         'ignore_dirs': options.ignore_dirs,
         'modules_footer': options.modules_footer,
         'only_blocks': options.only_blocks,
+        'optarch': options.optarch,
         'recursive_mod_unload': options.recursive_module_unload,
         'regtest_output_dir': options.regtest_output_dir,
         'retain_all_deps': retain_all_deps,
@@ -245,6 +251,7 @@ def main(testing_data=(None, None, None)):
         'skip_test_cases': options.skip_test_cases,
         'sticky_bit': options.sticky_bit,
         'stop': options.stop,
+        'test_report_env_filter': options.test_report_env_filter,
         'umask': options.umask,
         'valid_module_classes': module_classes(),
         'valid_stops': [x[0] for x in EasyBlock.get_steps()],

easybuild/toolchains/foss.py

@@ -0,0 +1,40 @@
+##
+# Copyright 2013 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/>.
+##
+"""
+EasyBuild support for foss compiler toolchain (includes GCC, OpenMPI, OpenBLAS, LAPACK, ScaLAPACK and FFTW).
+
+@author: Kenneth Hoste (Ghent University)
+"""
+
+from easybuild.toolchains.compiler.gcc import Gcc
+from easybuild.toolchains.fft.fftw import Fftw
+from easybuild.toolchains.linalg.openblas import OpenBLAS
+from easybuild.toolchains.linalg.scalapack import ScaLAPACK
+from easybuild.toolchains.mpi.openmpi import OpenMPI
+
+
+class Foss(Gcc, OpenMPI, OpenBLAS, ScaLAPACK, Fftw):
+    """Compiler toolchain with GCC, OpenMPI, OpenBLAS, ScaLAPACK and FFTW."""
+    NAME = 'foss'

easybuild/toolchains/ictce.py

@@ -24,7 +24,7 @@
 ##
 """
 EasyBuild support for ictce compiler toolchain (includes Intel compilers (icc, ifort), Intel MPI,
-Intel Math Kernel Library (MKL), and Intel FFTW wrappers.
+Intel Math Kernel Library (MKL), and Intel FFTW wrappers).
 
 @author: Stijn De Weirdt (Ghent University)
 @author: Kenneth Hoste (Ghent University)

easybuild/toolchains/intel.py

@@ -0,0 +1,44 @@
+##
+# Copyright 2012-2013 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/>.
+##
+"""
+EasyBuild support for intel compiler toolchain (includes Intel compilers (icc, ifort), Intel MPI,
+Intel Math Kernel Library (MKL), and Intel FFTW wrappers).
+
+@author: Stijn De Weirdt (Ghent University)
+@author: Kenneth Hoste (Ghent University)
+"""
+
+from easybuild.toolchains.compiler.inteliccifort import IntelIccIfort
+from easybuild.toolchains.fft.intelfftw import IntelFFTW
+from easybuild.toolchains.mpi.intelmpi import IntelMPI
+from easybuild.toolchains.linalg.intelmkl import IntelMKL
+
+
+class Intel(IntelIccIfort, IntelMPI, IntelMKL, IntelFFTW):
+    """
+    Compiler toolchain with Intel compilers (icc/ifort), Intel MPI,
+    Intel Math Kernel Library (MKL) and Intel FFTW wrappers.
+    """
+    NAME = 'intel'

easybuild/tools/config.py

@@ -84,6 +84,7 @@
     'ignore_dirs': None,
     'modules_footer': None,
     'only_blocks': None,
+    'optarch': None,
     'recursive_mod_unload': False,
     'regtest_output_dir': None,
     'retain_all_deps': False,
@@ -95,6 +96,7 @@
     'skip_test_cases': False,
     'sticky_bit': False,
     'stop': None,
+    'test_report_env_filter': None,
     'umask': None,
     'valid_module_classes': None,
     'valid_stops': None,