Thanks to visit codestin.com
Credit goes to github.com

Skip to content

BLD: streamlined library names in site.cfg sections #13157

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 12 commits into from
Apr 30, 2019

Conversation

zerothi
Copy link
Contributor

@zerothi zerothi commented Mar 19, 2019

This unifies the names for retrieving libraries in sections.
Previously one could only get umfpack libraries using:

[umfpack]
umfpack_libs = ...

while now it prefers to use

[umfpack]
libraries = ...

(but defaults to use umfpack_libs).
Some libraries is system_info uses libraries whereas others were using
*_libs as keys. All future developments I think should retain the
libraries keyword, and only if applicable for sub-packages it should
be deferred to more _libs entries.

This commit also fixes CBLAS linkage if the user has supplied a
sufficient library. I.e. it first checks whether the CBLAS interface
is present as is, then tries to add cblas, etc.
It should at least now work for more diverse libraries.

This unifies the names for retrieving libraries in sections.
Previously one could only get umfpack libraries using:

  [umfpack]
  umfpack_libs = ...

while now it prefers to use

  [umfpack]
  libraries = ...

(but defaults to use umfpack_libs).
Some libraries is system_info uses libraries whereas others were using
*_libs as keys. All future developments I think should retain the
libraries keyword, and only if applicable for sub-packages it should
be deferred to more _libs entries.

Signed-off-by: Nick Papior <[email protected]>
This enables one to force users to use only one keyword in
the site.cfg file for distutils.

Signed-off-by: Nick Papior <[email protected]>
@zerothi
Copy link
Contributor Author

zerothi commented Mar 27, 2019

@eric-wieser, @rgommers I have marked conversations as resolved. Please reopen if needed!

@mattip
Copy link
Member

mattip commented Mar 27, 2019

Could use some new tests in numpy/distutils/tests/test_system_info.py

@zerothi
Copy link
Contributor Author

zerothi commented Mar 27, 2019

Could use some new tests in numpy/distutils/tests/test_system_info.py

Added!

@zerothi zerothi force-pushed the linalg-libraries branch 3 times, most recently from aac9fa5 to f29e4bf Compare March 27, 2019 11:40
@zerothi zerothi force-pushed the linalg-libraries branch from f29e4bf to 6993157 Compare April 3, 2019 11:54
@zerothi
Copy link
Contributor Author

zerothi commented Apr 10, 2019

@mattip fixed remaining issues!

zerothi added 4 commits April 10, 2019 10:07
This unifies the names for retrieving libraries in sections.
Previously one could only get umfpack libraries using:

  [umfpack]
  umfpack_libs = ...

while now it prefers to use

  [umfpack]
  libraries = ...

(but defaults to use umfpack_libs).
Some libraries is system_info uses libraries whereas others were using
*_libs as keys. All future developments I think should retain the
libraries keyword, and only if applicable for sub-packages it should
be deferred to more _libs entries.

Signed-off-by: Nick Papior <[email protected]>
This enables one to force users to use only one keyword in
the site.cfg file for distutils.

Signed-off-by: Nick Papior <[email protected]>
@mattip
Copy link
Member

mattip commented Apr 26, 2019

It would be nice to document this but ...

  • site.cfg.example is not linked into the html document tree at all.
  • Documentation for system_info (which uses and describes site.cfg) is in the docstring for numpy/distutils/system_info.py but is not linked to the documentation, the closest we get is doc/DISTUTILS.rst.txt.

Could you take a look at both those files anyway (site.cfg.example and system_info.py) and update them for the preferred libraries= usage? Extra points if you figure out a nice way to link that into the documentation, but it should probably be a different issue/PR

@mattip
Copy link
Member

mattip commented Apr 30, 2019

LGTM. Will give other reviewers a chance to take a look before merging

@mattip mattip merged commit c51a56c into numpy:master Apr 30, 2019
@mattip
Copy link
Member

mattip commented Apr 30, 2019

Thanks @zerothi

lijunzh added a commit to lijunzh/numpy that referenced this pull request May 2, 2019
* master: (25 commits)
  BUG: fix unravel_index when dimension is greater than 'intp'
  MANT: refactor unravel_index for code repetition (numpy#13446)
  BLD, TST: implicit func errors
  DOC: document existance of linalg backends
  BLD: streamlined library names in site.cfg sections (numpy#13157)
  MAINT: fixed typo 'wtihout' from numpy/core/shape_base.py
  BUG: fixing bugs in AVX exp/log while handling special value floats (numpy#13415)
  update sequence
  Add analysis check
  BUG: blindly add TypeError to accepted exceptions
  MAINT: fixed several PYTHONOPTIMIZE=2 failures
  BUG: fixed PYTHONOPTIMIZE run
  MAINT: fixed typo 'Mismacth' from numpy.core.setup_common.py
  MAINT: fixed last issues and questions according to numpy#13132
  MAINT: improve efficiency of pad by avoiding use of apply_along_axis
  DOC: dimension sizes are non-negative, not positive
  BUILD, BUG: fix from review, fix bug in git_version
  MAINT: mention 'make dist' in error messsage
  BUILD: allow version-check to pass if GITVER is Unknown (sdist build)
  BUILD: fail documentation build if numpy version does not match
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants