Skip to content

Commit

Permalink
Merge pull request #346 from matthew-brett/reverting-lapack-refactor
Browse files Browse the repository at this point in the history
MRG: revert lapack refactor for compatibility

Lapack refactor increases our scipy dependency to 0.13 (see gh-344) and causes
some build errors (see gh-342).

Revert for now, so we can reconsider how best to fix up gh-328.

As discussed in gh-344.
  • Loading branch information
matthew-brett committed Aug 31, 2015
2 parents 6259598 + 14e5332 commit c9520f4
Show file tree
Hide file tree
Showing 50 changed files with 16,866 additions and 20,942 deletions.
2 changes: 1 addition & 1 deletion Makefile
Expand Up @@ -108,7 +108,7 @@ tox-stale:

recythonize:
# Recythonize all pyx files
find . -name "*.pyx" -exec cython -I libcstat/wrapper {} \;
find . -name "*.pyx" -exec cython -I libcstat/wrapper -I lib/fff_python_wrapper {} \;

# Website stuff
$(WWW_DIR):
Expand Down
2 changes: 2 additions & 0 deletions lib/fff/fff_base.c
Expand Up @@ -44,6 +44,8 @@ unsigned int fff_nbytes(fff_datatype type)
}




int fff_is_integer(fff_datatype type)
{
int ok = 0;
Expand Down

0 comments on commit c9520f4

Please sign in to comment.