Psi: python 2.4 compatibility + small bug fixed #270
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Merged
| self.install_psi_objdir = os.path.join(self.installdir, 'obj') | ||
| self.install_psi_srcdir = os.path.join(self.installdir, os.path.relpath(self.cfg['start_dir'], self.builddir)) | ||
| self.install_psi_srcdir = os.path.join(self.installdir, srcdir) |
There was a problem hiding this comment.
I tried solving this last minute in EB 1.8.0, but failed to do it properly in the install_step, see #272. :(
Please merge develop in here, so we can get this fixed ASAP.
* develop: (33 commits) last edits to release notes shutil.copytree doesn't like that target dir already exists fix typo make sure LDFLAGS and INSTANT_*_DIR env vars are set for DOLFIN sanity check commands fix remarks update release notes, bump to v1.8.0 fix signature of load_module in LAPACK easyblock make DOLFIN build more verbose, so we can debug when problems occur don't try to load non-existing LAPACK module during testing os.path.relpath is only available in Python 2.6, so reverting to basename approach (which is less robust though) don't try to load non-existing LAPACK module during testing os.path.relpath is only available in Python 2.6, so reverting to basename approach (which is less robust though) move OS check for Clang to check_readiness_step, to allow a EB build job for Clang to be submitted from SL5 add easyblock for MUMPS fix typo always use -DPentiumCPS insteado -DWALL, patch out CPU throttling check for recent ATLAS versions improve error messages, suggest use of $INTEL_LICENSE_FILE Only use cpu freq (unless ignorethrottling) Some small style changesSome small style changes use load_dependency_modules method ... Conflicts: easybuild/easyblocks/p/psi.py
|
|
|
Please fix #272 by fixing the code in |
|
Should be fully fixed now. Tested on raichu. |
|
Tested, works fine, so merging it in. |
boegel
added a commit
that referenced
this pull request
Oct 11, 2013
Psi: python 2.4 compatibility + small bug fixed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.