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

Merge 1.0.0 beta.10.3 proposed update into 1.0.0 #1187

Merged
merged 24 commits into from
Dec 23, 2020

Conversation

lifflander
Copy link
Collaborator

@lifflander lifflander commented Dec 16, 2020

Fixes #1186, #1194

@lifflander lifflander changed the base branch from develop to 1.0.0 December 16, 2020 17:52
@cz4rs cz4rs added the Release label Dec 16, 2020
@cz4rs cz4rs force-pushed the 1.0.0-beta.10.3-proposed-update branch 3 times, most recently from 390e7ed to ee68ab5 Compare December 21, 2020 11:02
@cz4rs cz4rs force-pushed the 1.0.0-beta.10.3-proposed-update branch from ee68ab5 to 065bf8a Compare December 21, 2020 11:16
@cz4rs
Copy link
Contributor

cz4rs commented Dec 21, 2020

@cz4rs cz4rs force-pushed the 1.0.0-beta.10.3-proposed-update branch from 065bf8a to 7290bec Compare December 21, 2020 11:27
@cz4rs
Copy link
Contributor

cz4rs commented Dec 21, 2020

@cz4rs cz4rs requested a review from PhilMiller December 21, 2020 13:45
@lifflander
Copy link
Collaborator Author

Looks good so far. Let me know if you need any help from me. The reduce interface did change a lot on develop, but I think the changes Phil made should generally be applicable to 1.0.0.

@cz4rs cz4rs force-pushed the 1.0.0-beta.10.3-proposed-update branch from 482efcc to 866a3aa Compare December 22, 2020 18:09
@cz4rs cz4rs force-pushed the 1.0.0-beta.10.3-proposed-update branch from 866a3aa to beb8e72 Compare December 22, 2020 18:14
@cz4rs cz4rs marked this pull request as ready for review December 22, 2020 18:27
@cz4rs
Copy link
Contributor

cz4rs commented Dec 22, 2020

pushed single commit from #908 to fix another Intel 19 issue (95ff3ea), it might be necessary to include complete solution

ToDo:

@cz4rs
Copy link
Contributor

cz4rs commented Dec 22, 2020

@lifflander

  • I have added up-to-date build definitions for nvcc
  • all the essential builds are passing (including intel 19, nvidia 10.1, nvidia 11.0)

@PhilMiller PhilMiller linked an issue Dec 22, 2020 that may be closed by this pull request
Copy link
Member

@PhilMiller PhilMiller left a comment

Choose a reason for hiding this comment

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

The code changes look as expected, and EMPIRE tests pass.

@PhilMiller
Copy link
Member

The code changes look as expected, and EMPIRE tests pass.

Those tests were with GCC 7.2.0. I'm building and testing with Cuda 9.2 now.

@PhilMiller
Copy link
Member

The code changes look as expected, and EMPIRE tests pass.

Those tests were with GCC 7.2.0. I'm building and testing with Cuda 9.2 now.

And, they passed.

I can merge this, unless there's something else that needs to happen with it first

@lifflander lifflander merged commit a1c3c1d into 1.0.0 Dec 23, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Unused variable in active.cc Prepare beta-10.3 release
3 participants