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.

Sign up for GitHub

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

Jump to bottom

Xpetra: cmake logic to solve GlobalOrdinal conflict #6019

Merged
merged 1 commit into from
Oct 3, 2019
Merged

Xpetra: cmake logic to solve GlobalOrdinal conflict #6019

merged 1 commit into from
Oct 3, 2019

Conversation

brian-kelley
Copy link
Contributor

When Tpetra deprecated code is removed, its default GO will be long
long. Epetra is enabled by default but with 32-bit GO. Previously if
Epetra32 was enabled and Tpetra GO=int was off, Xpetra would error out
at configure time.

This means that without deprecated code, a Trilinos build with
MueLu/Xpetra enabled and every option default would fail to configure.
This change catches the situation above. If Epetra is explicitly
enabled by the user, it errors out like before. But if Epetra is
only implicitly enabled and GO=long long, Xpetra will just warn
and disable its Epetra support, so configuration will succeed
and Xpetra+downstream will just use Tpetra and GO=long long.

@trilinos/xpetra

Description

Motivation and Context

This will fix configure when deprecated code is disabled or removed, as shown in this
nightly on rocketman: https://testing-dev.sandia.gov/cdash/viewConfigure.php?buildid=4900214

How Has This Been Tested?

Checklist

  • My commit messages mention the appropriate GitHub issue numbers.
  • My code follows the code style of the affected package(s).
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I have read the code contribution guidelines for this project.
  • I have added tests to cover my changes.
  • All new and existing tests passed.
  • No new compiler warnings were introduced.
  • These changes break backwards compatibility.

@brian-kelley
Xpetra: cmake logic to solve GlobalOrdinal conflict
28d16ce 
When Tpetra deprecated code is removed, its default GO will be long
long. Epetra is enabled by default but with 32-bit GO. Previously if
Epetra32 was enabled and Tpetra GO=int was off, Xpetra would error out
at configure time.

This means that without deprecated code, a Trilinos build with
MueLu/Xpetra enabled and every option default would fail to configure.
This change catches the situation above. If Epetra is explicitly
enabled by the user, it errors out like before. But if Epetra is
only implicitly enabled and GO=long long, Xpetra will just warn
and disable its Epetra support.
@brian-kelley brian-kelley added pkg: Xpetra impacting: configure or build The issue is primarily related to configuring or building AT: AUTOMERGE Causes the PR autotester to automatically merge the PR branch once approvals are completed MueLuReview To request that the MueLu Team nitpick this PR labels Oct 2, 2019
@brian-kelley brian-kelley self-assigned this Oct 2, 2019
@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' - Testing Jenkins Projects:

Pull Request Auto Testing STARTING (click to expand)

Build Information

Test Name: Trilinos_pullrequest_gcc_4.8.4

  • Build Num: 4654
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
COMPILER_MODULE sems-gcc/4.8.4
JENKINS_BUILD_TYPE Release
JENKINS_COMM_TYPE MPI
JENKINS_DO_COMPLEX OFF
JENKINS_JOB_TYPE Experimental
MPI_MODULE sems-openmpi/1.8.7
PULLREQUESTNUM 6019
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH XpetraCMake
TRILINOS_SOURCE_REPO https://github.com/brian-kelley/Trilinos
TRILINOS_SOURCE_SHA 28d16ce
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 7d10ea6

Build Information

Test Name: Trilinos_pullrequest_intel_17.0.1

  • Build Num: 4481
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
PULLREQUESTNUM 6019
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH XpetraCMake
TRILINOS_SOURCE_REPO https://github.com/brian-kelley/Trilinos
TRILINOS_SOURCE_SHA 28d16ce
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 7d10ea6

Build Information

Test Name: Trilinos_pullrequest_gcc_4.9.3_SERIAL

  • Build Num: 2912
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
PULLREQUESTNUM 6019
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH XpetraCMake
TRILINOS_SOURCE_REPO https://github.com/brian-kelley/Trilinos
TRILINOS_SOURCE_SHA 28d16ce
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 7d10ea6

Build Information

Test Name: Trilinos_pullrequest_gcc_7.2.0

  • Build Num: 2737
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
PULLREQUESTNUM 6019
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH XpetraCMake
TRILINOS_SOURCE_REPO https://github.com/brian-kelley/Trilinos
TRILINOS_SOURCE_SHA 28d16ce
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 7d10ea6

Build Information

Test Name: Trilinos_pullrequest_cuda_9.2

  • Build Num: 2313
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
JENKINS_JOB_TYPE Experimental
PULLREQUESTNUM 6019
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH XpetraCMake
TRILINOS_SOURCE_REPO https://github.com/brian-kelley/Trilinos
TRILINOS_SOURCE_SHA 28d16ce
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 7d10ea6

Build Information

Test Name: Trilinos_pullrequest_python_2

  • Build Num: 715
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
PULLREQUESTNUM 6019
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH XpetraCMake
TRILINOS_SOURCE_REPO https://github.com/brian-kelley/Trilinos
TRILINOS_SOURCE_SHA 28d16ce
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 7d10ea6

Build Information

Test Name: Trilinos_pullrequest_python_3

  • Build Num: 715
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
PULLREQUESTNUM 6019
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH XpetraCMake
TRILINOS_SOURCE_REPO https://github.com/brian-kelley/Trilinos
TRILINOS_SOURCE_SHA 28d16ce
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 7d10ea6

Using Repos:

Repo: TRILINOS (brian-kelley/Trilinos)
  • Branch: XpetraCMake
  • SHA: 28d16ce
  • Mode: TEST_REPO

Pull Request Author: brian-kelley

jhux2
jhux2 approved these changes Oct 2, 2019
View reviewed changes
Copy link
Member

@jhux2 jhux2 left a comment

Choose a reason for hiding this comment

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

lgtm

@brian-kelley brian-kelley added AT: WIP Causes the PR autotester to not test the PR. (Remove to allow testing to occur.) and removed AT: AUTOMERGE Causes the PR autotester to automatically merge the PR branch once approvals are completed labels Oct 2, 2019
@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_4.8.4

  • Build Num: 4654
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
COMPILER_MODULE sems-gcc/4.8.4
JENKINS_BUILD_TYPE Release
JENKINS_COMM_TYPE MPI
JENKINS_DO_COMPLEX OFF
JENKINS_JOB_TYPE Experimental
MPI_MODULE sems-openmpi/1.8.7
PULLREQUESTNUM 6019
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH XpetraCMake
TRILINOS_SOURCE_REPO https://github.com/brian-kelley/Trilinos
TRILINOS_SOURCE_SHA 28d16ce
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 7d10ea6

Build Information

Test Name: Trilinos_pullrequest_intel_17.0.1

  • Build Num: 4481
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
PULLREQUESTNUM 6019
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH XpetraCMake
TRILINOS_SOURCE_REPO https://github.com/brian-kelley/Trilinos
TRILINOS_SOURCE_SHA 28d16ce
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 7d10ea6

Build Information

Test Name: Trilinos_pullrequest_gcc_4.9.3_SERIAL

  • Build Num: 2912
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
PULLREQUESTNUM 6019
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH XpetraCMake
TRILINOS_SOURCE_REPO https://github.com/brian-kelley/Trilinos
TRILINOS_SOURCE_SHA 28d16ce
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 7d10ea6

Build Information

Test Name: Trilinos_pullrequest_gcc_7.2.0

  • Build Num: 2737
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
PULLREQUESTNUM 6019
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH XpetraCMake
TRILINOS_SOURCE_REPO https://github.com/brian-kelley/Trilinos
TRILINOS_SOURCE_SHA 28d16ce
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 7d10ea6

Build Information

Test Name: Trilinos_pullrequest_cuda_9.2

  • Build Num: 2313
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
JENKINS_JOB_TYPE Experimental
PULLREQUESTNUM 6019
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH XpetraCMake
TRILINOS_SOURCE_REPO https://github.com/brian-kelley/Trilinos
TRILINOS_SOURCE_SHA 28d16ce
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 7d10ea6

Build Information

Test Name: Trilinos_pullrequest_python_2

  • Build Num: 715
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
PULLREQUESTNUM 6019
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH XpetraCMake
TRILINOS_SOURCE_REPO https://github.com/brian-kelley/Trilinos
TRILINOS_SOURCE_SHA 28d16ce
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 7d10ea6

Build Information

Test Name: Trilinos_pullrequest_python_3

  • Build Num: 715
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
PULLREQUESTNUM 6019
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH XpetraCMake
TRILINOS_SOURCE_REPO https://github.com/brian-kelley/Trilinos
TRILINOS_SOURCE_SHA 28d16ce
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 7d10ea6


CDash Test Results for PR# 6019.

@trilinos-autotester
Copy link
Contributor

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

@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...

@jhux2 jhux2 merged commit ea134c8 into trilinos:develop Oct 3, 2019
@brian-kelley brian-kelley mentioned this pull request Oct 4, 2019
Merged
@trilinos-autotester trilinos-autotester mentioned this pull request Apr 5, 2020
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mhoemmen mhoemmen mhoemmen approved these changes

@jhux2 jhux2 jhux2 approved these changes

@william76 william76 Awaiting requested review from william76

@csiefer2 csiefer2 Awaiting requested review from csiefer2

Assignees

@brian-kelley brian-kelley

Labels
AT: WIP Causes the PR autotester to not test the PR. (Remove to allow testing to occur.) impacting: configure or build The issue is primarily related to configuring or building MueLuReview To request that the MueLu Team nitpick this PR pkg: Xpetra
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@brian-kelley @trilinos-autotester @mhoemmen @jhux2