Skip to content

Merge from master#1

Merged
benson31 merged 9 commits intollnl:hydrogenfrom
timmoon10:hydrogen
Feb 12, 2018
Merged

Merge from master#1
benson31 merged 9 commits intollnl:hydrogenfrom
timmoon10:hydrogen

Conversation

@timmoon10
Copy link
Copy Markdown
Collaborator

The primary reason for this pull request is get functionality from elemental#251 (OpenMP parallelization of Copy and Zero routines).

@benson31 Several CMake changes from elemental#249 are wiped out by your changes to CMakeLists.txt. I'm not sure whether it's best to completely wipe out that PR, to replicate its functionality, or leave it as is.

Copy link
Copy Markdown
Collaborator

@benson31 benson31 left a comment

Choose a reason for hiding this comment

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

Famous last words: Looks fine to me!

@benson31
Copy link
Copy Markdown
Collaborator

I didn't mean to request changes, I'm just bad at clicking buttons.

@benson31 benson31 merged commit 3162e07 into llnl:hydrogen Feb 12, 2018
@timmoon10 timmoon10 deleted the hydrogen branch February 12, 2018 23:32
benson31 added a commit that referenced this pull request May 10, 2018
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.

5 participants