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

[Bugfix] CPP support + OSX build fix. #2943

Merged
merged 4 commits into from
Oct 14, 2020

Conversation

cphyc
Copy link
Member

@cphyc cphyc commented Oct 14, 2020

PR Summary

This PR is a companion of #2939 (which is why there are some conversion to C++ happening). It should probably be merged first.

  • Fixes the build of pykdtree on travis by preventing the usage of openmp
  • Fix a bug revealed by adding the C++14 flag on windows

@cphyc cphyc added bug infrastructure Related to CI, versioning, websites, organizational issues, etc labels Oct 14, 2020
@cphyc cphyc mentioned this pull request Oct 14, 2020
6 tasks
Comment on lines +4 to +5
# distutils: extra_compile_args = CPP14_FLAG OMP_ARGS
# distutils: extra_link_args = CPP14_FLAG OMP_ARGS
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

isn't this meant for #2939 ?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure anymore... Would you be OK with this bit going in this PR? Otherwise, I'll have to rebase, etc... and it will happen anyway in #2939.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it's fine since this is high priority and will I hope we merge #2939 asap too !

@neutrinoceros neutrinoceros merged commit d3da8a9 into yt-project:master Oct 14, 2020
@cphyc cphyc deleted the bugfix/cpp-support branch January 13, 2021 11:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug infrastructure Related to CI, versioning, websites, organizational issues, etc
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants