Added Conversion Functions #21
Merged
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
versa. The code likely needs reviewing for TiledArray coding standards, but I will worry about that later after a pull request.
Merging upstream into fork to get the updated changes to madness tasks.
different tile type.
upstream fixes for madness issues. Conflicts: examples/cc/input_data.h external/madness.cmake src/TiledArray/permutation.h
commiting before trying to compile.
Necessary to bring in updated madness information and tags.
Needed change to sparsepolicy::truncate() which fixed a bug.
Merging changes from other computer apparently.
Pulled changes from upstream ... it was about time. Only conflict was formating since Justus and I fixed the same issue separately, or maybe I fixed it on both. I can't remember. Conflicts: src/TiledArray/range.h
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.
also two cmake toolchains which can be discarded if they don't need to be there.