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

MRG: move conditional compiling to C #528

Merged
merged 4 commits into from Dec 29, 2014

Conversation

matthew-brett
Copy link
Contributor

We were using conditionals in the Cython file, but this means that we can't any
longer ship valid .c files with the release, and we would have to depend on
Cython at build time, even for releases.

Try moving the OpenMP defines into a C header so that the check for OpenMP
happens at C compile-time not Cython compile time.

Do check for openmp with C preprocessor, and then use C variable checks
to avoid using openmp constructs at build time.
Signal that code should use C-level conditionals rather than
Cython-level conditionals by writing .h file instead of .pxi.
@matthew-brett
Copy link
Contributor Author

Eleftherios - does this preserve the Open MP things you need? Is there a good way of checking? It looks to me as if it does.

Add the `src` include directory to allow all (bundlemin in fact) Cython
files to be compiled into the source release tarball.
Try a few times to install travis wheels before giving up.
@Garyfallidis
Copy link
Contributor

Yeah, it works. The tests look good too and the multithreading works in my machine. So, all good here.

@Garyfallidis
Copy link
Contributor

Matthew this says WIP here. Do you really need to add other commits or this is done? If this is done then it's already +1 from me.

@matthew-brett matthew-brett changed the title WIP: trying to move conditional compiling to C MRG: move conditional compiling to C Dec 29, 2014
@Garyfallidis
Copy link
Contributor

Thx!

Garyfallidis added a commit that referenced this pull request Dec 29, 2014
@Garyfallidis Garyfallidis merged commit 0eeef91 into dipy:master Dec 29, 2014
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.

None yet

3 participants