Skip to content

Update numpy and SuiteSparse to use scikit-umfpack (REVIEW)#718

Merged
boegel merged 11 commits intoeasybuilders:developfrom
hpcuantwerpen:modules/numpy-scipy-scikit-umfpack
Dec 7, 2015
Merged

Update numpy and SuiteSparse to use scikit-umfpack (REVIEW)#718
boegel merged 11 commits intoeasybuilders:developfrom
hpcuantwerpen:modules/numpy-scipy-scikit-umfpack

Conversation

@sbecuwe
Copy link
Copy Markdown
Contributor

@sbecuwe sbecuwe commented Oct 16, 2015

  • update numpy's site.cfg when SuiteSparse is available
  • update SuiteSparse's LD_LIBRARY_PATH to make libamd.so and libumfpack.so available

- update numpy's site.cfg when SuiteSparse is available
- update SuiteSparse's LD_LIBRARY_PATH to make libamd.so and libumfpack.so available
@hpcugentbot
Copy link
Copy Markdown

Automatic reply from Jenkins: Can I test this?

@boegel
Copy link
Copy Markdown
Member

boegel commented Oct 16, 2015

Jenkins: ok to test

Comment thread easybuild/easyblocks/n/numpy.py Outdated
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

move this above the if and use if suitesparseroot:

also, please use the 'official' name SuiteSparse (get_software_root will convert it to uppercas to check $EBROOTSUITESPARSE)

@hpcugentbot
Copy link
Copy Markdown

Easyblocks unit test suite PASSed (see https://jenkins1.ugent.be/job/easybuild-easyblocks-pr-builder/1294/console for more details).

This pull request is now ready for review/testing.

Please try and find someone who can tackle this; contact @boegel if you're not sure what to do.

- clean up rewrite of update of site.cfg for scikit-umfpack
@hpcugentbot
Copy link
Copy Markdown

Easyblocks unit test suite PASSed (see https://jenkins1.ugent.be/job/easybuild-easyblocks-pr-builder/1295/console for more details).

This pull request is now ready for review/testing.

Please try and find someone who can tackle this; contact @boegel if you're not sure what to do.

Comment thread easybuild/easyblocks/n/numpy.py Outdated
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

suggestion to clean this up (way more readable this way imho):

extrasiteconfig += '\n'.join([
    "[amd]",
    "library_dirs = %s" % os.path.join(amddir, 'Lib'),
    "include_dirs = %s" % os.path.join(amddir, 'Include'),
    "amd_libs = amd",
    "[umfpack]",
    "library_dirs = %s" % os.path.join(umfpackdir, 'Lib'),
    "include_dirs = %s" % os.path.join(umfpackdir, 'Include'),
    "umfpack_libs = umfpack",
])

- clean up rewrite of update of site.cfg for scikit-umfpack (part two)
@hpcugentbot
Copy link
Copy Markdown

Easyblocks unit test suite PASSed (see https://jenkins1.ugent.be/job/easybuild-easyblocks-pr-builder/1296/console for more details).

This pull request is now ready for review/testing.

Please try and find someone who can tackle this; contact @boegel if you're not sure what to do.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

add the os.path.exists check I mentioned in a previous remark, just as a safe guard in case something changes in future SuiteSparse versions?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@sbecuwe: ping on this?

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@boegel What do you mean with "ping on this"?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I mean to ask @sbecuwe if he's going to tackle my remark, since it's blocking this PR.

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@boegel If the remark is about "add the os.path.exists check", where did you mention it?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In a remark that is now hidden, can't seem to find it myself anymore (maybe something went wrong with submitting it urgh).

Basically, I would make very sure that these directories are there:

if not os.path.exists(amddir) or not os.path.exists(umfpackdir):
    raise EasyBuildError("Expected SuiteSparse subdirectories are not both there: %s, %s",
                         amddir, umfpackdir)

- added check for existence of directories in site.cfg part
@hpcugentbot
Copy link
Copy Markdown

Easyblocks unit test suite PASSed (see https://jenkins1.ugent.be/job/easybuild-easyblocks-pr-builder/1297/console for more details).

This pull request is now ready for review/testing.

Please try and find someone who can tackle this; contact @boegel if you're not sure what to do.

@hpcugentbot
Copy link
Copy Markdown

Easyblocks unit test suite FAILed.

See https://jenkins1.ugent.be/job/easybuild-easyblocks-pr-builder/1304/console for more details.

Please fix the reported issues by pushing additional commits to the branch corresponding with this pull request; contact @boegel if you're not sure what to do.

@boegel
Copy link
Copy Markdown
Member

boegel commented Oct 20, 2015

@sbecuwe, @backelj: last test failed due to issue on Jenkins, we're working on it, should be resolved soon

@boegel
Copy link
Copy Markdown
Member

boegel commented Oct 20, 2015

Jenkins: test this please

@hpcugentbot
Copy link
Copy Markdown

Easyblocks unit test suite FAILed.

See https://jenkins1.ugent.be/job/easybuild-easyblocks-pr-builder/1305/console for more details.

Please fix the reported issues by pushing additional commits to the branch corresponding with this pull request; contact @boegel if you're not sure what to do.

@boegel
Copy link
Copy Markdown
Member

boegel commented Oct 20, 2015

Jenkins: test this please

@hpcugentbot
Copy link
Copy Markdown

Easyblocks unit test suite PASSed (see https://jenkins1.ugent.be/job/easybuild-easyblocks-pr-builder/1306/console for more details).

This pull request is now ready for review/testing.

Please try and find someone who can tackle this; contact @boegel if you're not sure what to do.

@sbecuwe sbecuwe changed the title Update numpy and SuiteSparse to use scikit-umfpack Update numpy and SuiteSparse to use scikit-umfpack (WIP) Oct 22, 2015
@sbecuwe
Copy link
Copy Markdown
Contributor Author

sbecuwe commented Oct 22, 2015

Pull request currently on hold due to a (possible dependency) problem identified by a user.

@hpcugentbot
Copy link
Copy Markdown

Easyblocks unit test suite PASSed (see https://jenkins1.ugent.be/job/easybuild-easyblocks-pr-builder/1324/console for more details).

This pull request is now ready for review/testing.

Please try and find someone who can tackle this; contact @boegel if you're not sure what to do.

@sbecuwe sbecuwe changed the title Update numpy and SuiteSparse to use scikit-umfpack (WIP) Update numpy and SuiteSparse to use scikit-umfpack (REVIEW) Oct 29, 2015
@hpcugentbot
Copy link
Copy Markdown

Easyblocks unit test suite PASSed (see https://jenkins1.ugent.be/job/easybuild-easyblocks-pr-builder/1362/console for more details).

This pull request is now ready for review/testing.

Please try and find someone who can tackle this; contact @boegel if you're not sure what to do.

@boegel
Copy link
Copy Markdown
Member

boegel commented Nov 26, 2015

@sbecuwe: is this still on hold? any updates? what issue was uncovered that made you block this?

@sbecuwe
Copy link
Copy Markdown
Contributor Author

sbecuwe commented Dec 4, 2015

Blocked because of problems discovered in the process of [https://github.com/easybuilders/easybuild-easyconfigs/pull/2061]. Problems in easyconfig had been solved a month ago, but forgot to release this corresponding easyblock request.

@hpcugentbot
Copy link
Copy Markdown

Easyblocks unit test suite PASSed (see https://jenkins1.ugent.be/job/easybuild-easyblocks-pr-builder/1425/console for more details).

This pull request is now ready for review/testing.

Please try and find someone who can tackle this; contact @boegel if you're not sure what to do.

@wpoely86
Copy link
Copy Markdown
Member

wpoely86 commented Dec 7, 2015

lgtm

Comment thread easybuild/easyblocks/s/suitesparse.py Outdated
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

double docstring (and typo), fixed with hpcuantwerpen#1

@sbecuwe: please merge?

boegel and others added 2 commits December 7, 2015 10:47
fix docstring in EB_SuiteSparse.make_module_req_guess
@hpcugentbot
Copy link
Copy Markdown

Easyblocks unit test suite PASSed (see https://jenkins1.ugent.be/job/easybuild-easyblocks-pr-builder/1437/console for more details).

This pull request is now ready for review/testing.

Please try and find someone who can tackle this; contact @boegel if you're not sure what to do.

@boegel
Copy link
Copy Markdown
Member

boegel commented Dec 7, 2015

Going in, thanks @sbecuwe!

@boegel boegel added this to the v2.5.0 milestone Dec 7, 2015
boegel added a commit that referenced this pull request Dec 7, 2015
…-umfpack

Update numpy and SuiteSparse to use scikit-umfpack (REVIEW)
@boegel boegel merged commit f68fcc7 into easybuilders:develop Dec 7, 2015
@backelj backelj deleted the modules/numpy-scipy-scikit-umfpack branch December 8, 2015 08:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants