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

Galeri: fix for issue #5593, protecting Epetra only examples in CMakeLists.txt #5600

Merged
merged 1 commit into from
Jul 31, 2019
Merged

Galeri: fix for issue #5593, protecting Epetra only examples in CMakeLists.txt #5600

merged 1 commit into from
Jul 31, 2019

Conversation

lucbv
Copy link
Contributor

@lucbv lucbv commented Jul 30, 2019 •
edited
Loading

I am adding appropriate checks in CMakeLists.txt to ensure that builds of galeri do not fail if Epetra is OFF but examples of galeri are ON.

@trilinos/galeri

Description

Galeri fails to compile its examples if Epetra is OFF

Motivation and Context

This is part of on-going work to remove deprecated code in Tpetra

Related Issues

How Has This Been Tested?

I performed a local build with Galeri and its examples ON while Epetra is OFF

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.

@lucbv lucbv added type: bug The primary issue is a bug in Trilinos code or tests pkg: Galeri AT: AUTOMERGE Causes the PR autotester to automatically merge the PR branch once approvals are completed labels Jul 30, 2019
@lucbv lucbv requested review from tjfulle and jhux2 July 30, 2019 20:40
@lucbv lucbv self-assigned this Jul 30, 2019
@lucbv
Galeri: fix for issue trilinos#5593, protecting Epetra only examples …
cbf8dea 
…in CMakeLists.txt

I am adding appropriate checks in CMakeLists.txt to ensure that builds of galeri do not fail if Epetra is OFF but examples of galeri are ON.
@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: 4102
  • 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 5600
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH Galeri_examples_fix
TRILINOS_SOURCE_REPO https://github.com/lucbv/Trilinos
TRILINOS_SOURCE_SHA cbf8dea
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 7f130b7

Build Information

Test Name: Trilinos_pullrequest_intel_17.0.1

  • Build Num: 3918
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
PULLREQUESTNUM 5600
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH Galeri_examples_fix
TRILINOS_SOURCE_REPO https://github.com/lucbv/Trilinos
TRILINOS_SOURCE_SHA cbf8dea
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 7f130b7

Build Information

Test Name: Trilinos_pullrequest_gcc_4.9.3_SERIAL

  • Build Num: 2363
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
PULLREQUESTNUM 5600
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH Galeri_examples_fix
TRILINOS_SOURCE_REPO https://github.com/lucbv/Trilinos
TRILINOS_SOURCE_SHA cbf8dea
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 7f130b7

Build Information

Test Name: Trilinos_pullrequest_gcc_7.2.0

  • Build Num: 2179
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
PULLREQUESTNUM 5600
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH Galeri_examples_fix
TRILINOS_SOURCE_REPO https://github.com/lucbv/Trilinos
TRILINOS_SOURCE_SHA cbf8dea
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 7f130b7

Build Information

Test Name: Trilinos_pullrequest_cuda_9.2

  • Build Num: 1764
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
JENKINS_JOB_TYPE Experimental
PULLREQUESTNUM 5600
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH Galeri_examples_fix
TRILINOS_SOURCE_REPO https://github.com/lucbv/Trilinos
TRILINOS_SOURCE_SHA cbf8dea
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 7f130b7

Build Information

Test Name: Trilinos_pullrequest_python_2

  • Build Num: 245
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
PULLREQUESTNUM 5600
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH Galeri_examples_fix
TRILINOS_SOURCE_REPO https://github.com/lucbv/Trilinos
TRILINOS_SOURCE_SHA cbf8dea
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 7f130b7

Build Information

Test Name: Trilinos_pullrequest_python_3

  • Build Num: 245
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
PULLREQUESTNUM 5600
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH Galeri_examples_fix
TRILINOS_SOURCE_REPO https://github.com/lucbv/Trilinos
TRILINOS_SOURCE_SHA cbf8dea
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 7f130b7

Using Repos:

Repo: TRILINOS (lucbv/Trilinos)
  • Branch: Galeri_examples_fix
  • SHA: cbf8dea
  • Mode: TEST_REPO

Pull Request Author: lucbv

@tjfulle
Copy link
Contributor

tjfulle commented Jul 30, 2019

@lucbv, it looks good to me. I'll let @jhux2 have the final say.

@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: 4102
  • 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 5600
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH Galeri_examples_fix
TRILINOS_SOURCE_REPO https://github.com/lucbv/Trilinos
TRILINOS_SOURCE_SHA cbf8dea
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 7f130b7

Build Information

Test Name: Trilinos_pullrequest_intel_17.0.1

  • Build Num: 3918
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
PULLREQUESTNUM 5600
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH Galeri_examples_fix
TRILINOS_SOURCE_REPO https://github.com/lucbv/Trilinos
TRILINOS_SOURCE_SHA cbf8dea
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 7f130b7

Build Information

Test Name: Trilinos_pullrequest_gcc_4.9.3_SERIAL

  • Build Num: 2363
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
PULLREQUESTNUM 5600
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH Galeri_examples_fix
TRILINOS_SOURCE_REPO https://github.com/lucbv/Trilinos
TRILINOS_SOURCE_SHA cbf8dea
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 7f130b7

Build Information

Test Name: Trilinos_pullrequest_gcc_7.2.0

  • Build Num: 2179
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
PULLREQUESTNUM 5600
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH Galeri_examples_fix
TRILINOS_SOURCE_REPO https://github.com/lucbv/Trilinos
TRILINOS_SOURCE_SHA cbf8dea
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 7f130b7

Build Information

Test Name: Trilinos_pullrequest_cuda_9.2

  • Build Num: 1764
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
JENKINS_JOB_TYPE Experimental
PULLREQUESTNUM 5600
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH Galeri_examples_fix
TRILINOS_SOURCE_REPO https://github.com/lucbv/Trilinos
TRILINOS_SOURCE_SHA cbf8dea
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 7f130b7

Build Information

Test Name: Trilinos_pullrequest_python_2

  • Build Num: 245
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
PULLREQUESTNUM 5600
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH Galeri_examples_fix
TRILINOS_SOURCE_REPO https://github.com/lucbv/Trilinos
TRILINOS_SOURCE_SHA cbf8dea
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 7f130b7

Build Information

Test Name: Trilinos_pullrequest_python_3

  • Build Num: 245
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
PULLREQUESTNUM 5600
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH Galeri_examples_fix
TRILINOS_SOURCE_REPO https://github.com/lucbv/Trilinos
TRILINOS_SOURCE_SHA cbf8dea
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 7f130b7


CDash Test Results for PR# 5600.

@trilinos-autotester
Copy link
Contributor

Status Flag 'Pre-Merge Inspection' - - This Pull Request Requires Inspection... The code must be inspected by a member of the Team before Testing/Merging
NO REVIEWS HAVE BEEN PERFORMED ON THIS PULL REQUEST!

@trilinos-autotester
Copy link
Contributor

All Jobs Finished; status = PASSED, However Inspection must be performed before merge can occur...

@trilinos-autotester
Copy link
Contributor

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

@trilinos-autotester
Copy link
Contributor

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

@trilinos-autotester trilinos-autotester merged commit 282537b into trilinos:develop Jul 31, 2019
@trilinos-autotester
Copy link
Contributor

Merge on Pull Request# 5600: 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 Jul 31, 2019
@lucbv lucbv deleted the Galeri_examples_fix branch July 31, 2019 14:33
@tjfulle
Copy link
Contributor

tjfulle commented Jul 31, 2019

Thanks @lucbv, it looks like this fixed it!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tjfulle tjfulle tjfulle approved these changes

@jhux2 jhux2 Awaiting requested review from jhux2

Assignees

@lucbv lucbv

Labels
pkg: Galeri type: bug The primary issue is a bug in Trilinos code or tests
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@lucbv @trilinos-autotester @tjfulle