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

Piro: remove deprecated tests with OptiPack and GlobiPack #6128

Merged
merged 2 commits into from
Oct 22, 2019
Merged

Piro: remove deprecated tests with OptiPack and GlobiPack #6128

merged 2 commits into from
Oct 22, 2019

Conversation

kddevin
Copy link
Contributor

@kddevin kddevin commented Oct 21, 2019

@trilinos/piro

Corrected the ifdef guards for testing whether OptiPack deprecated code should be included or hidden. The old version did not really exclude the OptiPack calls, because include files were not handled correctly. Now the Optipack calls and tests are excluded correctly (verified during testing with C++-preprocessor warning directives).

This branch also pulls in branch #6117 (rythmos) in order to compile correctly with all deprecated code hidden.

Motivation

Optipack and GlobiPack are deprecated packages, slated to be removed from Trilinos. #4957

Stakeholder Feedback

Confirmed removal of tests with @mperego

Testing

cee-lan linux workstation with OptiPack_HIDE_DEPRECATED_CODE=ON

cmake \
  -GNinja \
 -DMPI_EXEC=${MPI_EXEC} \
 -DTrilinos_CONFIGURE_OPTIONS_FILE:STRING=cmake/std/atdm/ATDMDevEnv.cmake \
 -DTrilinos_ENABLE_TESTS=ON \
 -DTrilinos_ENABLE_Domi:BOOL=OFF \
 -DTrilinos_ENABLE_PyTrilinos:BOOL=OFF \
 -DTrilinos_ENABLE_Moertel:BOOL=OFF \
 -DTrilinos_ENABLE_COMPLEX:BOOL=OFF \
 -DTrilinos_ENABLE_TriKota:BOOL=OFF \
 -DTrilinos_ENABLE_Optika:BOOL=OFF \
 -DTrilinos_ENABLE_Tpetra:BOOL=ON \
 -DTrilinos_ENABLE_Belos:BOOL=ON \
 -DTrilinos_ENABLE_Epetra:BOOL=ON \
 -DTrilinos_ENABLE_Ifpack2:BOOL=ON \
 -DTrilinos_ENABLE_MueLu:BOOL=ON \
 -DTrilinos_ENABLE_Panzer:BOOL=ON \
 -DTrilinos_ENABLE_Phalanx:BOOL=ON \
 -DTrilinos_ENABLE_Piro:BOOL=ON \
 -DTrilinos_ENABLE_RTop:BOOL=ON \
 -DTrilinos_ENABLE_STK:BOOL=ON \
 -DTrilinos_ENABLE_Thyra:BOOL=ON \
 -DTrilinos_ENABLE_GlobiPack:BOOL=ON \
 -DTrilinos_ENABLE_OptiPack:BOOL=ON \
 -DTrilinos_ENABLE_Claps:BOOL=ON \
 -D Kokkos_ENABLE_DEPRECATED_CODE=OFF \
 -D Tpetra_ENABLE_DEPRECATED_CODE=OFF  \
 -D Belos_HIDE_DEPRECATED_CODE=ON  \
 -D Epetra_HIDE_DEPRECATED_CODE=ON  \
 -D Ifpack2_HIDE_DEPRECATED_CODE=ON \
 -D Ifpack2_ENABLE_DEPRECATED_CODE=OFF \
 -D MueLu_ENABLE_DEPRECATED_CODE=OFF \
 -D Panzer_HIDE_DEPRECATED_CODE=ON  \
 -D Phalanx_HIDE_DEPRECATED_CODE=ON \
 -D RTop_HIDE_DEPRECATED_CODE=ON \
 -D STK_HIDE_DEPRECATED_CODE=ON \
 -D Teuchos_HIDE_DEPRECATED_CODE=ON\
 -D Thyra_HIDE_DEPRECATED_CODE=ON \
 -D Claps_HIDE_DEPRECATED_CODE=ON \
 -D GlobiPack_HIDE_DEPRECATED_CODE=ON \
 -D OptiPack_HIDE_DEPRECATED_CODE=ON \
 -D Trios_HIDE_DEPRECATED_CODE=ON \
 -DTrilinos_ENABLE_ALL_OPTIONAL_PACKAGES:BOOL=ON \
 -DTrilinos_ENABLE_SECONDARY_TESTED_CODE:BOOL=ON \
 -DTPL_ENABLE_METIS=ON \
 -DMETIS_LIBRARY_DIRS=${SEMS_METIS_LIBRARY_PATH} \
 -DMETIS_INCLUDE_DIRS=${SEMS_METIS_INCLUDE_PATH} \
 -DTPL_ENABLE_Matio=OFF \
 -DTPL_ENABLE_X11=OFF \
/home/tmp/code/Trilinos |& tee OUTPUT.CMAKE

@kddevin kddevin added pkg: Piro AT: AUTOMERGE Causes the PR autotester to automatically merge the PR branch once approvals are completed labels Oct 21, 2019
@kddevin kddevin requested a review from mperego October 21, 2019 15:28
@kddevin kddevin self-assigned this Oct 21, 2019
mperego
mperego approved these changes Oct 21, 2019
View reviewed changes
Copy link
Contributor

@mperego mperego left a comment

Choose a reason for hiding this comment

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

Looks good! Thanks.

@kddevin kddevin added the AT: RETEST Causes the PR autotester to run a new round of PR tests on the next iteration label Oct 22, 2019
@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 '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: 4746
  • 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 6128
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH piro_remove_deprecated_tests
TRILINOS_SOURCE_REPO https://github.com/trilinos/Trilinos
TRILINOS_SOURCE_SHA a4acafa
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 96f63b1

Build Information

Test Name: Trilinos_pullrequest_intel_17.0.1

  • Build Num: 4573
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
PULLREQUESTNUM 6128
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH piro_remove_deprecated_tests
TRILINOS_SOURCE_REPO https://github.com/trilinos/Trilinos
TRILINOS_SOURCE_SHA a4acafa
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 96f63b1

Build Information

Test Name: Trilinos_pullrequest_gcc_4.9.3_SERIAL

  • Build Num: 3004
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
PULLREQUESTNUM 6128
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH piro_remove_deprecated_tests
TRILINOS_SOURCE_REPO https://github.com/trilinos/Trilinos
TRILINOS_SOURCE_SHA a4acafa
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 96f63b1

Build Information

Test Name: Trilinos_pullrequest_gcc_7.2.0

  • Build Num: 2829
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
PULLREQUESTNUM 6128
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH piro_remove_deprecated_tests
TRILINOS_SOURCE_REPO https://github.com/trilinos/Trilinos
TRILINOS_SOURCE_SHA a4acafa
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 96f63b1

Build Information

Test Name: Trilinos_pullrequest_cuda_9.2

  • Build Num: 2405
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
JENKINS_JOB_TYPE Experimental
PULLREQUESTNUM 6128
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH piro_remove_deprecated_tests
TRILINOS_SOURCE_REPO https://github.com/trilinos/Trilinos
TRILINOS_SOURCE_SHA a4acafa
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 96f63b1

Build Information

Test Name: Trilinos_pullrequest_python_2

  • Build Num: 797
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
PULLREQUESTNUM 6128
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH piro_remove_deprecated_tests
TRILINOS_SOURCE_REPO https://github.com/trilinos/Trilinos
TRILINOS_SOURCE_SHA a4acafa
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 96f63b1

Build Information

Test Name: Trilinos_pullrequest_python_3

  • Build Num: 797
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
PULLREQUESTNUM 6128
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH piro_remove_deprecated_tests
TRILINOS_SOURCE_REPO https://github.com/trilinos/Trilinos
TRILINOS_SOURCE_SHA a4acafa
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 96f63b1

Using Repos:

Repo: TRILINOS (trilinos/Trilinos)
  • Branch: piro_remove_deprecated_tests
  • SHA: a4acafa
  • Mode: TEST_REPO

Pull Request Author: kddevin

@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: 4746
  • 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 6128
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH piro_remove_deprecated_tests
TRILINOS_SOURCE_REPO https://github.com/trilinos/Trilinos
TRILINOS_SOURCE_SHA a4acafa
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 96f63b1

Build Information

Test Name: Trilinos_pullrequest_intel_17.0.1

  • Build Num: 4573
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
PULLREQUESTNUM 6128
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH piro_remove_deprecated_tests
TRILINOS_SOURCE_REPO https://github.com/trilinos/Trilinos
TRILINOS_SOURCE_SHA a4acafa
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 96f63b1

Build Information

Test Name: Trilinos_pullrequest_gcc_4.9.3_SERIAL

  • Build Num: 3004
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
PULLREQUESTNUM 6128
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH piro_remove_deprecated_tests
TRILINOS_SOURCE_REPO https://github.com/trilinos/Trilinos
TRILINOS_SOURCE_SHA a4acafa
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 96f63b1

Build Information

Test Name: Trilinos_pullrequest_gcc_7.2.0

  • Build Num: 2829
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
PULLREQUESTNUM 6128
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH piro_remove_deprecated_tests
TRILINOS_SOURCE_REPO https://github.com/trilinos/Trilinos
TRILINOS_SOURCE_SHA a4acafa
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 96f63b1

Build Information

Test Name: Trilinos_pullrequest_cuda_9.2

  • Build Num: 2405
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
JENKINS_JOB_TYPE Experimental
PULLREQUESTNUM 6128
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH piro_remove_deprecated_tests
TRILINOS_SOURCE_REPO https://github.com/trilinos/Trilinos
TRILINOS_SOURCE_SHA a4acafa
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 96f63b1

Build Information

Test Name: Trilinos_pullrequest_python_2

  • Build Num: 797
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
PULLREQUESTNUM 6128
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH piro_remove_deprecated_tests
TRILINOS_SOURCE_REPO https://github.com/trilinos/Trilinos
TRILINOS_SOURCE_SHA a4acafa
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 96f63b1

Build Information

Test Name: Trilinos_pullrequest_python_3

  • Build Num: 797
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
PULLREQUESTNUM 6128
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH piro_remove_deprecated_tests
TRILINOS_SOURCE_REPO https://github.com/trilinos/Trilinos
TRILINOS_SOURCE_SHA a4acafa
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 96f63b1


CDash Test Results for PR# 6128.

@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 Oct 22, 2019
@trilinos-autotester
Copy link
Contributor

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

@trilinos-autotester
Copy link
Contributor

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

@trilinos-autotester trilinos-autotester merged commit a6a597f into develop Oct 22, 2019
@trilinos-autotester
Copy link
Contributor

Merge on Pull Request# 6128: 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 Oct 22, 2019
@kddevin kddevin deleted the piro_remove_deprecated_tests branch October 23, 2019 21:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mperego mperego mperego approved these changes

Assignees

@kddevin kddevin

Labels
pkg: Piro
Projects
None yet
Milestone
No milestone
Development

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