-
Notifications
You must be signed in to change notification settings - Fork 16
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
CXXTest Build Fix #37
Merged
MishaZakharchanka
merged 52 commits into
feature/sidre-data-collection
from
python-env-sidre
Nov 24, 2020
Merged
CXXTest Build Fix #37
MishaZakharchanka
merged 52 commits into
feature/sidre-data-collection
from
python-env-sidre
Nov 24, 2020
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
… the heap corruption error.
the pip modules have already been downloaded we can skip that step.
* commit '69e4dbfb2f474a0c9f1c60caf74022c12954fb2b': Fixes for downloading pip modules as a separate stage. Locking the version of numpy-stl that works with our Python 2.7.* series. Splitting up pip download and pip install as separate stages, so if the pip modules have already been downloaded we can skip that step.
* commit 'e31d742cfac0e005a986dee62ffb4563c9e6ab8d': Fixed pybind11 naming conflict. Added tests for new physical constants. Fixed unit energy in constants. Added Planck constant. Fixed some errors. Added bindings for vector gradientRK. Added gradient of FieldList<Dimension, std::vector<DataType>>.
…llation compatibility with Spheral extension repos.
not install any libs. Defaults to OFF.
* commit '4a87764cb3515b20000e5f9fc0f51c67e15d2989': Adding cmake flag BOOST_HEADER_ONLY, which specifies that boost will not install any libs. Defaults to OFF. This "Spheral" needs to be here or the PYBIND11 stuff doesn't get build. Forgot to remove CInterface from the list of directories here. Updating stuff from ALE3D's Spheral repo. Putting in #ifdefs to protect against the fix on Windows which avoids the heap corruption error. Updating the Windows project files for ALE3D. Taking the master branch changes to sampleMultipleFields2LatticeMash.cc. Updating to feature/tsuji1/spheralrk on the ALE3D repo.
* commit '8ae944866bb966c114013bbaa1425980f4df2776': Unified method of handling distutils installed python packages. Fixed pybind11 naming conflict. Some protections from unphysical Cv. Added tests for new physical constants. Fixed unit energy in constants. Added Planck constant. Fixed some errors. Added bindings for vector gradientRK. Added gradient of FieldList<Dimension, std::vector<DataType>>.
…into feature/python-env
… after all other C++ spheral libs have been configured.
MishaZakharchanka
approved these changes
Nov 24, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR looks rather large as it pulls in updates from develop and feature/python-env.
Summary
The main changes that should be noted exist in
cmake/tpl/python.cmake
src/CMakeLists.txt
andsrc/CXXTests/CMakeLists.txt
.C++ test executables need to be linked to all of our compiled C++ libraries else we encounter undefined references at link time. This includes pythons library, which needs to be a shared library, this required changes to the python build options. The CMake Call into the CXXTest directory has been moved to the bottom of
src/CMakeLists.txt
as we need to include all C++ libs, those of which are listed in SPHERAL_CXX_LIBS cmake variable (formerly SPHERAL_PYTHON_DEPENDS).A Python TPL rebuild will be necessary to get this working again.