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

Provide a single file MpiReleaseDebugSharedPtSerial.cmake that can be read in with cmake -C (#2462) #2609

Merged

Conversation

bartlettroscoe
Copy link
Member

@bartlettroscoe bartlettroscoe commented Apr 20, 2018

CC: @trilinos/framework, @fryeguy52

Description

This is the CI build that has been running for the last 1.5+ years described at:

and this is the exact build used by the checkin-test-sems.sh script. This PR just aggregates this into a single file that can be included with -C <abs-bas-dir>/Trilinos/cmake/std/MpiReleaseDebugSharedPtSerial.cmake.

This new file Trilinos/cmake/std/MpiReleaseDebugSharedPtSerial.cmake is now a good candidate for the GCC 4.8.4 auto PR build in #2462. That build satisfies all of the requirements specified in #2462 and #2317, except for using OpenMP, which we can't until we can address some of #2422.

I also provided the file MpiReleaseSharedPtSerial.cmake that could be used for the Intel build in #2463. This improve consistency and reduces duplication.

This PR also removes the Xpetra and MueLu Experimental enables in commit 7481c76.

How Has This Been Tested?

I tested all of this manually locally. I run the checkin-test-sems.sh script locally and I ran ctest -S with the ctest driver script locally as per step 5 "Test CTest -S driver scripts" in:

The auto PR tester will fire off and test everything but nothing I have changed here impacts those builds (yet).

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.

These options were removed from the EMPIRE configuration of Trilinos in the
EM-Plamsa/BulidScripts repo as of commit:

  commit 285a5a7cad924a4419ede6eccaaefe687f958fa3
  Author: Jason M. Gates <jmgate@sandia.gov>
  Date:   Thu Mar 29 16:41:22 2018 -0600

      Remove Experimental Flags

      See trilinos#2467.

Therefore, we can hopefully safely assume these are not needed to help protect
EMPIRE's usage of Trilinos anymore.
@bartlettroscoe bartlettroscoe added Framework tasks Framework tasks (used internally by Framework team) client: ATDM Any issue primarily impacting the ATDM project labels Apr 20, 2018
@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.9.3

  • Build Num: 530
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
COMPILER_MODULE sems-gcc/4.9.3
JENKINS_BUILD_TYPE Release
JENKINS_COMM_TYPE MPI
JENKINS_DO_COMPLEX OFF
JENKINS_JOB_TYPE Experimental
MPI_MODULE sems-openmpi/1.8.7
PULLREQUESTNUM 2609
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH 2462-single-cmake-file
TRILINOS_SOURCE_REPO https://github.com/bartlettroscoe/Trilinos
TRILINOS_SOURCE_SHA ec01280
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA f5de06a

Build Information

Test Name: Trilinos_pullrequest_gcc_4.8.4

  • Build Num: 247
  • 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 2609
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH 2462-single-cmake-file
TRILINOS_SOURCE_REPO https://github.com/bartlettroscoe/Trilinos
TRILINOS_SOURCE_SHA ec01280
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA f5de06a

Using Repos:

Repo: TRILINOS (bartlettroscoe/Trilinos)
  • Branch: 2462-single-cmake-file
  • SHA: ec01280
  • Mode: TEST_REPO

Pull Request Author: bartlettroscoe

@bartlettroscoe bartlettroscoe force-pushed the 2462-single-cmake-file branch from ec01280 to 950fe4f Compare April 21, 2018 00:35
@bartlettroscoe bartlettroscoe changed the title Provide a single file MpiReleaseDebugSharedPtPthreads.cmake that can be read in with cmake -C (#2462) Provide a single file MpiReleaseDebugSharedPtPthread.cmake that can be read in with cmake -C (#2462) Apr 21, 2018
@trilinos-autotester
Copy link
Contributor

Status Flag 'Pull Request AutoTester' - ERROR: A user has commited a change to the PR before testing completed. The testing SHA = ec01280 Does not match the current commit SHA = 950fe4f. Testing of this PR must occur again.

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

  • Build Num: 531
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
COMPILER_MODULE sems-gcc/4.9.3
JENKINS_BUILD_TYPE Release
JENKINS_COMM_TYPE MPI
JENKINS_DO_COMPLEX OFF
JENKINS_JOB_TYPE Experimental
MPI_MODULE sems-openmpi/1.8.7
PULLREQUESTNUM 2609
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH 2462-single-cmake-file
TRILINOS_SOURCE_REPO https://github.com/bartlettroscoe/Trilinos
TRILINOS_SOURCE_SHA 950fe4f
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA f5de06a

Build Information

Test Name: Trilinos_pullrequest_gcc_4.8.4

  • Build Num: 248
  • 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 2609
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH 2462-single-cmake-file
TRILINOS_SOURCE_REPO https://github.com/bartlettroscoe/Trilinos
TRILINOS_SOURCE_SHA 950fe4f
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA f5de06a

Using Repos:

Repo: TRILINOS (bartlettroscoe/Trilinos)
  • Branch: 2462-single-cmake-file
  • SHA: 950fe4f
  • Mode: TEST_REPO

Pull Request Author: bartlettroscoe

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

  • Build Num: 531
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
COMPILER_MODULE sems-gcc/4.9.3
JENKINS_BUILD_TYPE Release
JENKINS_COMM_TYPE MPI
JENKINS_DO_COMPLEX OFF
JENKINS_JOB_TYPE Experimental
MPI_MODULE sems-openmpi/1.8.7
PULLREQUESTNUM 2609
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH 2462-single-cmake-file
TRILINOS_SOURCE_REPO https://github.com/bartlettroscoe/Trilinos
TRILINOS_SOURCE_SHA 950fe4f
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA f5de06a

Build Information

Test Name: Trilinos_pullrequest_gcc_4.8.4

  • Build Num: 248
  • 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 2609
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH 2462-single-cmake-file
TRILINOS_SOURCE_REPO https://github.com/bartlettroscoe/Trilinos
TRILINOS_SOURCE_SHA 950fe4f
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA f5de06a


CDash Test Results for PR# 2609.

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

2 similar comments
@trilinos-autotester
Copy link
Contributor

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

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

  • Build Num: 536
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
COMPILER_MODULE sems-gcc/4.9.3
JENKINS_BUILD_TYPE Release
JENKINS_COMM_TYPE MPI
JENKINS_DO_COMPLEX OFF
JENKINS_JOB_TYPE Experimental
MPI_MODULE sems-openmpi/1.8.7
PULLREQUESTNUM 2609
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH 2462-single-cmake-file
TRILINOS_SOURCE_REPO https://github.com/bartlettroscoe/Trilinos
TRILINOS_SOURCE_SHA b3a59be
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA f5de06a

Build Information

Test Name: Trilinos_pullrequest_gcc_4.8.4

  • Build Num: 253
  • 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 2609
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH 2462-single-cmake-file
TRILINOS_SOURCE_REPO https://github.com/bartlettroscoe/Trilinos
TRILINOS_SOURCE_SHA b3a59be
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA f5de06a

Using Repos:

Repo: TRILINOS (bartlettroscoe/Trilinos)
  • Branch: 2462-single-cmake-file
  • SHA: b3a59be
  • Mode: TEST_REPO

Pull Request Author: bartlettroscoe

@bartlettroscoe bartlettroscoe changed the title Provide a single file MpiReleaseDebugSharedPtPthread.cmake that can be read in with cmake -C (#2462) Provide a single file MpiReleaseDebugSharedPtSerial.cmake that can be read in with cmake -C (#2462) Apr 23, 2018
trilinos#2462)

Now this makes it stupid easy to reproduce this particular build.  You just
do:

  source <trilinos-base-dir>/cmake/load_sems_dev_env.sh
  cmake -C <trilinos-base-dir>/cmake/std/MpiReleaseDebugSharedPtSerial.cmake \
    -DTrilinos_ENABLE_TESTS=ON -DTrilinos_ENABLE_<PACKAGE>=ON \
    <trilinos-base-dir>
This could be used, for example, for the Intel 17 build in trilinos#2463.
@bartlettroscoe bartlettroscoe force-pushed the 2462-single-cmake-file branch from b3a59be to 579a77b Compare April 23, 2018 14:22
@bartlettroscoe
Copy link
Member Author

@fryeguy52, could you please give this PR a quick review? I need someone to review this in order to merge it.

@trilinos-autotester
Copy link
Contributor

Status Flag 'Pull Request AutoTester' - ERROR: A user has commited a change to the PR before testing completed. The testing SHA = b3a59be Does not match the current commit SHA = 579a77b. Testing of this PR must occur again.

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

  • Build Num: 540
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
COMPILER_MODULE sems-gcc/4.9.3
JENKINS_BUILD_TYPE Release
JENKINS_COMM_TYPE MPI
JENKINS_DO_COMPLEX OFF
JENKINS_JOB_TYPE Experimental
MPI_MODULE sems-openmpi/1.8.7
PULLREQUESTNUM 2609
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH 2462-single-cmake-file
TRILINOS_SOURCE_REPO https://github.com/bartlettroscoe/Trilinos
TRILINOS_SOURCE_SHA 579a77b
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 6768939

Build Information

Test Name: Trilinos_pullrequest_gcc_4.8.4

  • Build Num: 257
  • 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 2609
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH 2462-single-cmake-file
TRILINOS_SOURCE_REPO https://github.com/bartlettroscoe/Trilinos
TRILINOS_SOURCE_SHA 579a77b
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 6768939

Using Repos:

Repo: TRILINOS (bartlettroscoe/Trilinos)
  • Branch: 2462-single-cmake-file
  • SHA: 579a77b
  • Mode: TEST_REPO

Pull Request Author: bartlettroscoe

Copy link
Contributor

@fryeguy52 fryeguy52 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 to me

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

  • Build Num: 540
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
COMPILER_MODULE sems-gcc/4.9.3
JENKINS_BUILD_TYPE Release
JENKINS_COMM_TYPE MPI
JENKINS_DO_COMPLEX OFF
JENKINS_JOB_TYPE Experimental
MPI_MODULE sems-openmpi/1.8.7
PULLREQUESTNUM 2609
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH 2462-single-cmake-file
TRILINOS_SOURCE_REPO https://github.com/bartlettroscoe/Trilinos
TRILINOS_SOURCE_SHA 579a77b
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 6768939

Build Information

Test Name: Trilinos_pullrequest_gcc_4.8.4

  • Build Num: 257
  • 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 2609
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH 2462-single-cmake-file
TRILINOS_SOURCE_REPO https://github.com/bartlettroscoe/Trilinos
TRILINOS_SOURCE_SHA 579a77b
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 6768939


CDash Test Results for PR# 2609.

@trilinos-autotester
Copy link
Contributor

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

@trilinos-autotester
Copy link
Contributor

Status Flag 'Pull Request AutoTester' - Pull Request MUST BE MERGED MANUALLY BY Project Team - Master Automerge is disabled (in .cfg file)

@bartlettroscoe bartlettroscoe merged commit fee1941 into trilinos:develop Apr 23, 2018
@bartlettroscoe
Copy link
Member Author

@fryeguy52, thanks for the review!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
client: ATDM Any issue primarily impacting the ATDM project Framework tasks Framework tasks (used internally by Framework team)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants