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

Framework/ifpack2/kokkos-kernels: Set standard to C++14 for CUDA 9.2 PR build #8114

Merged
merged 4 commits into from
Sep 30, 2020

Conversation

ZUUL42
Copy link
Contributor

@ZUUL42 ZUUL42 commented Sep 28, 2020

@trilinos/framework
@trilinos/ifpack2
@trilinos/kokkos-kernels

Motivation

This will add the needed flags to set the standard to C++14 for the CUDA 9.2.88 build.
It also fixes a few build errors that come up in ifpack2 and kokkos-kernels.

Associated with #6260
Closes #8016

Stakeholder Feedback

This work moves to a configuration that is c++14 ready making the PR testing scheme ready for Kokkos 3.3 to be merged in.

Testing

Tested by running the CUDA 9.2.88 PR build job manually, merging this branch into develop.
Results: CDash

@ZUUL42 ZUUL42 added Framework tasks Framework tasks (used internally by Framework team) PA: Framework Issues that fall under the Trilinos Framework Product Area labels Sep 28, 2020
@ZUUL42 ZUUL42 requested a review from a team as a code owner September 28, 2020 16:12
@ZUUL42 ZUUL42 self-assigned this Sep 28, 2020
Copy link

@jjwilke jjwilke left a comment

Choose a reason for hiding this comment

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

We should clarify the C++ flags issue.

I'm not qualified to comment on the lambda capture change in the tests.

cmake/std/PullRequestLinuxCuda9.2TestingSettings.cmake Outdated Show resolved Hide resolved
@trilinos-autotester
Copy link
Contributor

Status Flag 'Pre-Test Inspection' - Auto Inspected - Inspection Is Not Necessary for this Pull Request.

@trilinos-autotester
Copy link
Contributor

Status Flag 'Pull Request AutoTester' - Failure: Timed out waiting for job Trilinos_pullrequest_gcc_7.2.0_serial to start: Total Wait = 603

@ZUUL42
Copy link
Contributor Author

ZUUL42 commented Sep 28, 2020

@jjwilke, I took the lambda change from how Phalanx fixed their C++14 CUDA build errors. #8086

@trilinos-autotester
Copy link
Contributor

Status Flag 'Pre-Test Inspection' - Auto Inspected - Inspection Is Not Necessary for this Pull Request.

Copy link
Contributor

@prwolfe prwolfe left a comment

Choose a reason for hiding this comment

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

Looks correct - I am betting that the two bug fixes in this will also solve the compile issue I saw on vortex when using c++14

Thanks!

Copy link
Member

@bartlettroscoe bartlettroscoe left a comment

Choose a reason for hiding this comment

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

Look good to me.

@ZUUL42, have the kokkos-kernels commits been pulled off and applied to the independent kokkos-kernerls GitHub repo? If not, the next snapshot of kokkos-kernels to Trilinos 'develop' will wipe out these changes. (Just making sure.)

@@ -6,6 +6,8 @@

# Usage: cmake -C PullRequestLinuxCUDA9.2TestingSettings.cmake

set (CMAKE_CXX_STANDARD "14" CACHE STRING "Set C++ standard to C++14")
Copy link
Member

Choose a reason for hiding this comment

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

Yup, that should do it.

Copy link
Contributor

Choose a reason for hiding this comment

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

@bartlettroscoe the kokkos-kernels changes were made on the develop branch of the repo with SHA kokkos/kokkos-kernels@5ad4fa1, they'll be pulled in the the 3.2.1 patch release (which will clobber the changes in this PR)

@bartlettroscoe
Copy link
Member

@jjwilke, I requested a new review from you now that that CMAKE_CXX_FLAGS change was reverted.

@trilinos-autotester
Copy link
Contributor

Status Flag 'Pull Request AutoTester' - Failure: Timed out waiting for job Trilinos_pullrequest_intel_17.0.1 to start: Total Wait = 603

@ZUUL42 ZUUL42 added the AT: RETEST Causes the PR autotester to run a new round of PR tests on the next iteration label Sep 28, 2020
@trilinos-autotester
Copy link
Contributor

Status Flag 'Pull Request AutoTester' - User Requested Retest - Label AT: RETEST will be reset after testing.

@trilinos-autotester
Copy link
Contributor

Status Flag 'Pull Request AutoTester' - Testing Jenkins Projects:

Pull Request Auto Testing STARTING (click to expand)

Build Information

Test Name: Trilinos_pullrequest_gcc_8.3.0

  • Build Num: 2342
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
PR_LABELS AT: RETEST;Framework tasks;PA: Framework
PULLREQUESTNUM 8114
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH cuda9c14
TRILINOS_SOURCE_REPO https://github.com/ZUUL42/Trilinos
TRILINOS_SOURCE_SHA f67907b
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 1eadcb5

Build Information

Test Name: Trilinos_pullrequest_gcc_7.2.0_serial

  • Build Num: 9
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
PR_LABELS AT: RETEST;Framework tasks;PA: Framework
PULLREQUESTNUM 8114
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH cuda9c14
TRILINOS_SOURCE_REPO https://github.com/ZUUL42/Trilinos
TRILINOS_SOURCE_SHA f67907b
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 1eadcb5

Build Information

Test Name: Trilinos_pullrequest_gcc_7.2.0_debug

  • Build Num: 508
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
PR_LABELS AT: RETEST;Framework tasks;PA: Framework
PULLREQUESTNUM 8114
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH cuda9c14
TRILINOS_SOURCE_REPO https://github.com/ZUUL42/Trilinos
TRILINOS_SOURCE_SHA f67907b
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 1eadcb5

Build Information

Test Name: Trilinos_pullrequest_intel_17.0.1

  • Build Num: 7874
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
PR_LABELS AT: RETEST;Framework tasks;PA: Framework
PULLREQUESTNUM 8114
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH cuda9c14
TRILINOS_SOURCE_REPO https://github.com/ZUUL42/Trilinos
TRILINOS_SOURCE_SHA f67907b
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 1eadcb5

Build Information

Test Name: Trilinos_pullrequest_cuda_9.2

  • Build Num: 5636
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
PR_LABELS AT: RETEST;Framework tasks;PA: Framework
PULLREQUESTNUM 8114
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH cuda9c14
TRILINOS_SOURCE_REPO https://github.com/ZUUL42/Trilinos
TRILINOS_SOURCE_SHA f67907b
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 1eadcb5

Build Information

Test Name: Trilinos_pullrequest_clang_10.0.0

  • Build Num: 771
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
PR_LABELS AT: RETEST;Framework tasks;PA: Framework
PULLREQUESTNUM 8114
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH cuda9c14
TRILINOS_SOURCE_REPO https://github.com/ZUUL42/Trilinos
TRILINOS_SOURCE_SHA f67907b
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 1eadcb5

Build Information

Test Name: Trilinos_pullrequest_python_2

  • Build Num: 3575
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
PR_LABELS AT: RETEST;Framework tasks;PA: Framework
PULLREQUESTNUM 8114
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH cuda9c14
TRILINOS_SOURCE_REPO https://github.com/ZUUL42/Trilinos
TRILINOS_SOURCE_SHA f67907b
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 1eadcb5

Build Information

Test Name: Trilinos_pullrequest_python_3

  • Build Num: 3607
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
PR_LABELS AT: RETEST;Framework tasks;PA: Framework
PULLREQUESTNUM 8114
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH cuda9c14
TRILINOS_SOURCE_REPO https://github.com/ZUUL42/Trilinos
TRILINOS_SOURCE_SHA f67907b
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 1eadcb5

Using Repos:

Repo: TRILINOS (ZUUL42/Trilinos)
  • Branch: cuda9c14
  • SHA: f67907b
  • Mode: TEST_REPO

Pull Request Author: ZUUL42

@trilinos-autotester
Copy link
Contributor

Status Flag 'Pull Request AutoTester' - Jenkins Testing: all Jobs PASSED

Pull Request Auto Testing has PASSED (click to expand)

Build Information

Test Name: Trilinos_pullrequest_gcc_8.3.0

  • Build Num: 2342
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
PR_LABELS AT: RETEST;Framework tasks;PA: Framework
PULLREQUESTNUM 8114
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH cuda9c14
TRILINOS_SOURCE_REPO https://github.com/ZUUL42/Trilinos
TRILINOS_SOURCE_SHA f67907b
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 1eadcb5

Build Information

Test Name: Trilinos_pullrequest_gcc_7.2.0_serial

  • Build Num: 9
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
PR_LABELS AT: RETEST;Framework tasks;PA: Framework
PULLREQUESTNUM 8114
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH cuda9c14
TRILINOS_SOURCE_REPO https://github.com/ZUUL42/Trilinos
TRILINOS_SOURCE_SHA f67907b
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 1eadcb5

Build Information

Test Name: Trilinos_pullrequest_gcc_7.2.0_debug

  • Build Num: 508
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
PR_LABELS AT: RETEST;Framework tasks;PA: Framework
PULLREQUESTNUM 8114
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH cuda9c14
TRILINOS_SOURCE_REPO https://github.com/ZUUL42/Trilinos
TRILINOS_SOURCE_SHA f67907b
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 1eadcb5

Build Information

Test Name: Trilinos_pullrequest_intel_17.0.1

  • Build Num: 7874
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
PR_LABELS AT: RETEST;Framework tasks;PA: Framework
PULLREQUESTNUM 8114
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH cuda9c14
TRILINOS_SOURCE_REPO https://github.com/ZUUL42/Trilinos
TRILINOS_SOURCE_SHA f67907b
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 1eadcb5

Build Information

Test Name: Trilinos_pullrequest_cuda_9.2

  • Build Num: 5636
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
PR_LABELS AT: RETEST;Framework tasks;PA: Framework
PULLREQUESTNUM 8114
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH cuda9c14
TRILINOS_SOURCE_REPO https://github.com/ZUUL42/Trilinos
TRILINOS_SOURCE_SHA f67907b
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 1eadcb5

Build Information

Test Name: Trilinos_pullrequest_clang_10.0.0

  • Build Num: 771
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
PR_LABELS AT: RETEST;Framework tasks;PA: Framework
PULLREQUESTNUM 8114
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH cuda9c14
TRILINOS_SOURCE_REPO https://github.com/ZUUL42/Trilinos
TRILINOS_SOURCE_SHA f67907b
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 1eadcb5

Build Information

Test Name: Trilinos_pullrequest_python_2

  • Build Num: 3575
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
PR_LABELS AT: RETEST;Framework tasks;PA: Framework
PULLREQUESTNUM 8114
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH cuda9c14
TRILINOS_SOURCE_REPO https://github.com/ZUUL42/Trilinos
TRILINOS_SOURCE_SHA f67907b
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 1eadcb5

Build Information

Test Name: Trilinos_pullrequest_python_3

  • Build Num: 3607
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
PR_LABELS AT: RETEST;Framework tasks;PA: Framework
PULLREQUESTNUM 8114
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH cuda9c14
TRILINOS_SOURCE_REPO https://github.com/ZUUL42/Trilinos
TRILINOS_SOURCE_SHA f67907b
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 1eadcb5


CDash Test Results for PR# 8114.

@trilinos-autotester trilinos-autotester removed the AT: RETEST Causes the PR autotester to run a new round of PR tests on the next iteration label Sep 29, 2020
@trilinos-autotester
Copy link
Contributor

Status Flag 'Pre-Merge Inspection' - SUCCESS: The last commit to this Pull Request has been INSPECTED AND APPROVED by [ prwolfe bartlettroscoe ]!

@trilinos-autotester
Copy link
Contributor

Status Flag 'Pull Request AutoTester' - AutoMerge IS ENABLED, but the Label AT: AUTOMERGE is not set. Either set Label AT: AUTOMERGE or manually merge the PR...

@ZUUL42 ZUUL42 added the AT: AUTOMERGE Causes the PR autotester to automatically merge the PR branch once approvals are completed label Sep 29, 2020
@trilinos-autotester
Copy link
Contributor

Status Flag 'Pull Request AutoTester' - Pull Request will be Automerged

1 similar comment
@trilinos-autotester
Copy link
Contributor

Status Flag 'Pull Request AutoTester' - Pull Request will be Automerged

@ZUUL42 ZUUL42 dismissed jjwilke’s stale review September 30, 2020 15:24

Requested change made and tested.

@trilinos-autotester trilinos-autotester merged commit b1ba3b5 into trilinos:develop Sep 30, 2020
@trilinos-autotester
Copy link
Contributor

Merge on Pull Request# 8114: IS A SUCCESS - Pull Request successfully merged

@trilinos-autotester trilinos-autotester removed the AT: AUTOMERGE Causes the PR autotester to automatically merge the PR branch once approvals are completed label Sep 30, 2020
@ZUUL42 ZUUL42 deleted the cuda9c14 branch October 5, 2020 16:08
@ZUUL42 ZUUL42 mentioned this pull request Oct 6, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Framework tasks Framework tasks (used internally by Framework team) PA: Framework Issues that fall under the Trilinos Framework Product Area
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants