Skip to content
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

Force build to use our Cython #1522

Merged
merged 2 commits into from Sep 9, 2015
Merged

Force build to use our Cython #1522

merged 2 commits into from Sep 9, 2015

Conversation

@chaosphere2112
Copy link
Contributor

@chaosphere2112 chaosphere2112 commented Sep 8, 2015

I was having some issues building SciPy, and @doutriaux1 and I tracked it down to the existing version of cython I had on my computer overriding the one we installed. This should now be addressed; I relocated the apple specific SB_LIB_DIR up, added a SB_BIN_DIR (which points to the Python bin directory in Library/...) and deduplicated a bit by sticking the common prefix into SB_DIR, then set that separately for OSX and Linux. I insert SB_BIN_DIR at the beginning of $PATH for scipy's installation, and @doutriaux1 suggested I also stick it in cdat_common_environment.cmake.in.

set(SB_EXTERNALS_DIR "${CMAKE_INSTALL_PREFIX}/Externals")
if (APPLE)
set(SB_EXTERNALS_DIR "${CMAKE_INSTALL_PREFIX}/Externals")
set(SB_DIR "${CMAKE_INSTALL_PREFIX}/Library/Frameworks/Python.framework/Versions/2.7")
Copy link
Contributor

@aashish24 aashish24 Sep 9, 2015

I believe we have PYTHON_VERSION var set. Instead of assuming 2.7, can we use that?

Copy link
Contributor Author

@chaosphere2112 chaosphere2112 Sep 9, 2015

PYTHON_VERSION isn't set at this point; it gets set below, during include(python_pkg). Also, it's set to the entire version of python (2.7.10) and the name of this directory is 2.7; also also, this is the same path we were using already, just relocated and refactored. My CMake-fu is too weak to figure out how to get just 2.7 out of 2.7.10 (oh, and this stuff has to be before include(scipy_pkg), because otherwise if there's a system cython it tries to use that). Any ideas?

Copy link
Contributor

@doutriaux1 doutriaux1 Sep 9, 2015

there is a ${PY_VER} somewhere let's see if we can stick it before this.

Copy link
Contributor Author

@chaosphere2112 chaosphere2112 Sep 9, 2015

Alright, I'm testing a build using the ${PYVER} variable, though I had to move this if block down to just above the includes, and I include python prior to it (so I have the version #)

aashish24
Copy link
Contributor

aashish24 commented on d7713b6 Sep 9, 2015

Nice!

@aashish24
Copy link
Contributor

@aashish24 aashish24 commented Sep 9, 2015

LGTM 👍

aashish24 added a commit that referenced this issue Sep 9, 2015
@aashish24 aashish24 merged commit b8bdae1 into master Sep 9, 2015
3 of 6 checks passed
@chaosphere2112 chaosphere2112 deleted the scipy_force_cython branch Feb 12, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants