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

BF: fix link to npy_math function #448

Merged
merged 2 commits into from Nov 2, 2014

Conversation

Projects
None yet
3 participants
@matthew-brett
Member

matthew-brett commented Oct 25, 2014

@matthew-brett

This comment has been minimized.

Member

matthew-brett commented Oct 26, 2014

@stefanv

This comment has been minimized.

Contributor

stefanv commented Oct 26, 2014

Aren't the include directories the same for the two? (get_includes, get_info)

@matthew-brett

This comment has been minimized.

Member

matthew-brett commented Oct 26, 2014

You mean - does this PR change the include directories? No, but the missing piece was the need for the 'libraries' and 'library_dirs' parts of 'get_info'.

@stefanv

This comment has been minimized.

Contributor

stefanv commented Oct 26, 2014

Thanks for the clarification, that makes sense

@Garyfallidis

This comment has been minimized.

Member

Garyfallidis commented Oct 26, 2014

Hi @matthew-brett is this ready to be merged? The title says BF but the commit message says WIP.

@matthew-brett

This comment has been minimized.

Member

matthew-brett commented Oct 26, 2014

It's WIP because the Windows build is still broken. I'll check what Omar did in his PR #443, and see if I can get all builds working.

@matthew-brett matthew-brett force-pushed the matthew-brett:npy_log-fix branch 2 times, most recently from 2fc5014 to 9cbf93e Oct 29, 2014

@matthew-brett

This comment has been minimized.

Member

matthew-brett commented Oct 29, 2014

OK - I think this one is ready for review / merge now. It fails on Windows still because it needs a fix for the new conditional compiling code (another PR forthcoming) and on Omar's registration code (Omar has already fixed that in #443).

The last commit is an ugly hack to get round a missing library on Windows, you can tell me it's too ugly, I won't be offended.

@matthew-brett

This comment has been minimized.

Member

matthew-brett commented Oct 29, 2014

Pull request to fix conditional compiling is #453

@Garyfallidis

This comment has been minimized.

Member

Garyfallidis commented Oct 30, 2014

Okay I merged #453 you may want to rebase this one.

matthew-brett added some commits Oct 25, 2014

HACK: work round windows npymath compiling
Numpy binaries built with mingw have ``libnpymath.a`` library to link
against, but VC needs ``npymath.lib``.  The mingw library may be
compatible with VC, so detect the problem, and copy the library to a
temporary location to link against.

@matthew-brett matthew-brett force-pushed the matthew-brett:npy_log-fix branch from 9cbf93e to 4537535 Oct 30, 2014

@matthew-brett

This comment has been minimized.

Member

matthew-brett commented Oct 30, 2014

Rebased

Garyfallidis added a commit that referenced this pull request Nov 2, 2014

Merge pull request #448 from matthew-brett/npy_log-fix
BF: fix link to npy_math function

@Garyfallidis Garyfallidis merged commit 1b2d245 into nipy:master Nov 2, 2014

1 check passed

continuous-integration/travis-ci The Travis CI build passed
Details
@Garyfallidis

This comment has been minimized.

Member

Garyfallidis commented Nov 2, 2014

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment