Merge pull request #965 from wpoely86/psi

PSI: prepare for PSI4 1.0
easybuilders · Jul 7, 2016 · 0693990 · 0693990
2 parents fda89fe + 2d9c0ef
commit 0693990
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/easybuild/easyblocks/p/psi.py b/easybuild/easyblocks/p/psi.py
@@ -98,7 +98,8 @@ def configure_step(self):
             raise EasyBuildError("Boost module not loaded.")
 
         # pre 4.0b5, they were using autotools, on newer it's CMake
-        if LooseVersion(self.version) <= LooseVersion("4.0b5"):
+        if LooseVersion(self.version) <= LooseVersion("4.0b5") and self.cfg.name == "PSI":
+            self.log.info("Using configure based build")
             env.setvar('PYTHON', os.path.join(pythonroot, 'bin', 'python'))
             env.setvar('USE_SYSTEM_BOOST', 'TRUE')
 
@@ -136,14 +137,15 @@ def configure_step(self):
 
             ConfigureMake.configure_step(self, cmd_prefix=self.cfg['start_dir'])
         else:
-            self.cfg['configopts'] += "-DPYTHON_INTERPRETER=%s " % os.path.join(pythonroot, 'bin', 'python')
-            self.cfg['configopts'] += "-DCMAKE_BUILD_TYPE=Release "
+            self.log.info("Using CMake based build")
+            self.cfg.update('configopts', ' -DPYTHON_INTERPRETER=%s' % os.path.join(pythonroot, 'bin', 'python'))
+            self.cfg.update('configopts', ' -DCMAKE_BUILD_TYPE=Release')
 
             if self.toolchain.options.get('usempi', None):
-                self.cfg['configopts'] += "-DENABLE_MPI=ON "
+                self.cfg.update('configopts', " -DENABLE_MPI=ON")
 
             if get_software_root('impi'):
-                self.cfg['configopts'] += "-DENABLE_CSR=ON -DBLAS_TYPE=MKL "
+                self.cfg.update('configopts', " -DENABLE_CSR=ON -DBLAS_TYPE=MKL")
 
             CMakeMake.configure_step(self, srcdir=self.cfg['start_dir'])
 
@@ -176,7 +178,7 @@ def test_step(self):
     def sanity_check_step(self):
         """Custom sanity check for PSI."""
         custom_paths = {
-            'files': ['bin/psi%s' % self.version.split('.')[0]],
+            'files': ['bin/psi4'],
             'dirs': ['include', ('share/psi', 'share/psi4')],
         }
         super(EB_PSI, self).sanity_check_step(custom_paths=custom_paths)