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

Fix TPL usage in Amesos2 (#7536) #7562

Merged

Conversation

bartlettroscoe
Copy link
Member

@bartlettroscoe bartlettroscoe commented Jun 19, 2020

This now is closer to following instructions outlined at:

I can't test all of this because I don't have all of these TPLs installed and
there is no PR tseting for some of them like MUMPS.

This was motivated by #7536.

How was this tested?

On my SNL RHEL6 machine using ATDM and SEMS, I first set up a configure directory with:

$ cd ~/Trilinos.base/BUILDS/ATDM/SEMS-RHEL6/CHECKIN/

$ ./checkin-test-atdm.sh gnu-openmp-dbg-pt --enable-packages=Amesos2 --configure

$ cd gnu-openmp-dbg-pt

$ . load-env.sh 
Hostname 'crf450.srn.sandia.gov' matches known ATDM host 'crf450.srn.sandia.gov' and system 'sems-rhel6'
Setting compiler and build options for build-name 'gnu-openmp-dbg-pt'
Using SEMS RHEL6 compiler stack GNU-7.2.0 to build DEBUG code with Kokkos node type OPENMP

Then I tested the enabling just -DTrilinos_ENABLE_Amesos2=ON -DTPL_ENABLE_MUMPS=ON as @modkin in #7536 with:

$  rm -r CMake* *.out 

$ ./do-configure.base -DTrilinos_ENABLE_Amesos2=ON -DTPL_ENABLE_MUMPS=ON \
  -DTPL_MUMPS_INCLUDE_DIRS=/usr/include -DTPL_MUMPS_LIBRARIES=/usr/lib64/libblas.so \
  &> configure.out

$ grep MUMPS configure.out 
Explicitly enabled TPLs on input (by user):  MPI BLAS LAPACK Boost HDF5 Netcdf MUMPS BoostLib DLlib 9
-- Setting Amesos2_ENABLE_MUMPS=ON since TPL_ENABLE_MUMPS=ON
Final set of enabled TPLs:  MPI BLAS LAPACK Boost HDF5 Netcdf MUMPS BoostLib DLlib 9
Processing enabled TPL: MUMPS (enabled explicitly, disable with -DTPL_ENABLE_MUMPS=OFF)
-- MUMPS_LIBRARY_NAMES='dmumps;libmumps_common;pord'
-- TPL_MUMPS_LIBRARIES='/usr/lib64/libblas.so'
-- TPL_MUMPS_INCLUDE_DIRS='/usr/include'
  *****Amesos2 will not provide MUMPS Support with Tpetra_INST_INT_INT

$ grep MUMPS packages/amesos2/src/Amesos2_config.h 
/* Defined if you want to enable amesos2-MUMPS */
/* #undef HAVE_AMESOS2_MUMPS */

Then I configured with -DTrilinos_ENABLE_Amesos2=ON -DTpetra_INST_INT_INT=ON -DTPL_ENABLE_MUMPS=ON with:

$ rm -r CMake* *.out

$ ./do-configure.base -DTrilinos_ENABLE_Amesos2=ON -DTpetra_INST_INT_INT=ON \
  -DTPL_ENABLE_MUMPS=ON \
  -DTPL_MUMPS_INCLUDE_DIRS=/usr/include -DTPL_MUMPS_LIBRARIES=/usr/lib64/libblas.so \
  &> configure.out

$ grep MUMPS configure.out
 MPI BLAS LAPACK Boost HDF5 Netcdf MUMPS BoostLib DLlib 9
-- Setting Amesos2_ENABLE_MUMPS=ON since TPL_ENABLE_MUMPS=ON
Final set of enabled TPLs:  MPI BLAS LAPACK Boost HDF5 Netcdf MUMPS BoostLib DLlib 9
Processing enabled TPL: MUMPS (enabled explicitly, disable with -DTPL_ENABLE_MUMPS=OFF)
-- MUMPS_LIBRARY_NAMES='dmumps;libmumps_common;pord'
-- TPL_MUMPS_LIBRARIES='/usr/lib64/libblas.so'
-- TPL_MUMPS_INCLUDE_DIRS='/usr/include'
-- Amesos2_MUMPS_UnitTests_MPI_4: Added test (BASIC, NUM_MPI_PROCS=4, PROCESSORS=4)!

$ grep MUMPS packages/amesos2/src/Amesos2_config.h 
/* Defined if you want to enable amesos2-MUMPS */
#define HAVE_AMESOS2_MUMPS

That looks correct to me.


NOTE: Setting TPL_MUMPS_INCLUDE_DIRS and TPL_MUMPS_LIBRARIES to some dummy value bypasses checking and allows you to complete the configure stage even if you don't have MUMPS installed on your system (which I don't).

This now is closer to following instructions outlined at:

  https://tribits.org/doc/TribitsDevelopersGuide.html#how-to-add-a-new-tribits-tpl-dependency

I can't test all of this because I don't have all of these TPLs installed and
there is no PR tseting for some of them like MUMPS.
@bartlettroscoe bartlettroscoe added type: bug The primary issue is a bug in Trilinos code or tests impacting: tests The defect (bug) is primarily a test failure (vs. a build failure) impacting: configure or build The issue is primarily related to configuring or building labels Jun 19, 2020
@bartlettroscoe bartlettroscoe requested a review from srajama1 June 19, 2020 19:43
@bartlettroscoe bartlettroscoe requested a review from a team as a code owner June 19, 2020 19:43
@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: 7100
  • 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
PR_LABELS impacting: build;impacting: tests;type: bug
PULLREQUESTNUM 7562
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH 7536-amesos2-fix-tpl-usage
TRILINOS_SOURCE_REPO https://github.com/bartlettroscoe/Trilinos
TRILINOS_SOURCE_SHA da0dfcd
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 568a4b7

Build Information

Test Name: Trilinos_pullrequest_intel_17.0.1

  • Build Num: 6910
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
PR_LABELS impacting: build;impacting: tests;type: bug
PULLREQUESTNUM 7562
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH 7536-amesos2-fix-tpl-usage
TRILINOS_SOURCE_REPO https://github.com/bartlettroscoe/Trilinos
TRILINOS_SOURCE_SHA da0dfcd
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 568a4b7

Build Information

Test Name: Trilinos_pullrequest_gcc_4.9.3_SERIAL

  • Build Num: 5335
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
PR_LABELS impacting: build;impacting: tests;type: bug
PULLREQUESTNUM 7562
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH 7536-amesos2-fix-tpl-usage
TRILINOS_SOURCE_REPO https://github.com/bartlettroscoe/Trilinos
TRILINOS_SOURCE_SHA da0dfcd
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 568a4b7

Build Information

Test Name: Trilinos_pullrequest_gcc_7.2.0

  • Build Num: 5182
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
PR_LABELS impacting: build;impacting: tests;type: bug
PULLREQUESTNUM 7562
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH 7536-amesos2-fix-tpl-usage
TRILINOS_SOURCE_REPO https://github.com/bartlettroscoe/Trilinos
TRILINOS_SOURCE_SHA da0dfcd
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 568a4b7

Build Information

Test Name: Trilinos_pullrequest_gcc_8.3.0

  • Build Num: 1371
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
PR_LABELS impacting: build;impacting: tests;type: bug
PULLREQUESTNUM 7562
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH 7536-amesos2-fix-tpl-usage
TRILINOS_SOURCE_REPO https://github.com/bartlettroscoe/Trilinos
TRILINOS_SOURCE_SHA da0dfcd
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 568a4b7

Build Information

Test Name: Trilinos_pullrequest_cuda_9.2

  • Build Num: 4666
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
PR_LABELS impacting: build;impacting: tests;type: bug
PULLREQUESTNUM 7562
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH 7536-amesos2-fix-tpl-usage
TRILINOS_SOURCE_REPO https://github.com/bartlettroscoe/Trilinos
TRILINOS_SOURCE_SHA da0dfcd
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 568a4b7

Build Information

Test Name: Trilinos_pullrequest_clang_9.0.0

  • Build Num: 1041
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
PR_LABELS impacting: build;impacting: tests;type: bug
PULLREQUESTNUM 7562
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH 7536-amesos2-fix-tpl-usage
TRILINOS_SOURCE_REPO https://github.com/bartlettroscoe/Trilinos
TRILINOS_SOURCE_SHA da0dfcd
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 568a4b7

Build Information

Test Name: Trilinos_pullrequest_python_2

  • Build Num: 2763
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
PR_LABELS impacting: build;impacting: tests;type: bug
PULLREQUESTNUM 7562
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH 7536-amesos2-fix-tpl-usage
TRILINOS_SOURCE_REPO https://github.com/bartlettroscoe/Trilinos
TRILINOS_SOURCE_SHA da0dfcd
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 568a4b7

Build Information

Test Name: Trilinos_pullrequest_python_3

  • Build Num: 2772
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
PR_LABELS impacting: build;impacting: tests;type: bug
PULLREQUESTNUM 7562
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH 7536-amesos2-fix-tpl-usage
TRILINOS_SOURCE_REPO https://github.com/bartlettroscoe/Trilinos
TRILINOS_SOURCE_SHA da0dfcd
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 568a4b7

Using Repos:

Repo: TRILINOS (bartlettroscoe/Trilinos)
  • Branch: 7536-amesos2-fix-tpl-usage
  • SHA: da0dfcd
  • 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.8.4

  • Build Num: 7100
  • 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
PR_LABELS impacting: build;impacting: tests;type: bug
PULLREQUESTNUM 7562
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH 7536-amesos2-fix-tpl-usage
TRILINOS_SOURCE_REPO https://github.com/bartlettroscoe/Trilinos
TRILINOS_SOURCE_SHA da0dfcd
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 568a4b7

Build Information

Test Name: Trilinos_pullrequest_intel_17.0.1

  • Build Num: 6910
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
PR_LABELS impacting: build;impacting: tests;type: bug
PULLREQUESTNUM 7562
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH 7536-amesos2-fix-tpl-usage
TRILINOS_SOURCE_REPO https://github.com/bartlettroscoe/Trilinos
TRILINOS_SOURCE_SHA da0dfcd
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 568a4b7

Build Information

Test Name: Trilinos_pullrequest_gcc_4.9.3_SERIAL

  • Build Num: 5335
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
PR_LABELS impacting: build;impacting: tests;type: bug
PULLREQUESTNUM 7562
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH 7536-amesos2-fix-tpl-usage
TRILINOS_SOURCE_REPO https://github.com/bartlettroscoe/Trilinos
TRILINOS_SOURCE_SHA da0dfcd
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 568a4b7

Build Information

Test Name: Trilinos_pullrequest_gcc_7.2.0

  • Build Num: 5182
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
PR_LABELS impacting: build;impacting: tests;type: bug
PULLREQUESTNUM 7562
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH 7536-amesos2-fix-tpl-usage
TRILINOS_SOURCE_REPO https://github.com/bartlettroscoe/Trilinos
TRILINOS_SOURCE_SHA da0dfcd
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 568a4b7

Build Information

Test Name: Trilinos_pullrequest_gcc_8.3.0

  • Build Num: 1371
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
PR_LABELS impacting: build;impacting: tests;type: bug
PULLREQUESTNUM 7562
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH 7536-amesos2-fix-tpl-usage
TRILINOS_SOURCE_REPO https://github.com/bartlettroscoe/Trilinos
TRILINOS_SOURCE_SHA da0dfcd
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 568a4b7

Build Information

Test Name: Trilinos_pullrequest_cuda_9.2

  • Build Num: 4666
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
PR_LABELS impacting: build;impacting: tests;type: bug
PULLREQUESTNUM 7562
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH 7536-amesos2-fix-tpl-usage
TRILINOS_SOURCE_REPO https://github.com/bartlettroscoe/Trilinos
TRILINOS_SOURCE_SHA da0dfcd
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 568a4b7

Build Information

Test Name: Trilinos_pullrequest_clang_9.0.0

  • Build Num: 1041
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
PR_LABELS impacting: build;impacting: tests;type: bug
PULLREQUESTNUM 7562
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH 7536-amesos2-fix-tpl-usage
TRILINOS_SOURCE_REPO https://github.com/bartlettroscoe/Trilinos
TRILINOS_SOURCE_SHA da0dfcd
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 568a4b7

Build Information

Test Name: Trilinos_pullrequest_python_2

  • Build Num: 2763
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
PR_LABELS impacting: build;impacting: tests;type: bug
PULLREQUESTNUM 7562
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH 7536-amesos2-fix-tpl-usage
TRILINOS_SOURCE_REPO https://github.com/bartlettroscoe/Trilinos
TRILINOS_SOURCE_SHA da0dfcd
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 568a4b7

Build Information

Test Name: Trilinos_pullrequest_python_3

  • Build Num: 2772
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
PR_LABELS impacting: build;impacting: tests;type: bug
PULLREQUESTNUM 7562
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH 7536-amesos2-fix-tpl-usage
TRILINOS_SOURCE_REPO https://github.com/bartlettroscoe/Trilinos
TRILINOS_SOURCE_SHA da0dfcd
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA 568a4b7


CDash Test Results for PR# 7562.

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

5 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

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

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

@trilinos-autotester trilinos-autotester added the AT: STALE Added by the PR autotester if too much time has elapsed since the last successful PR test iteration label Jun 25, 2020
@trilinos-autotester
Copy link
Contributor

All Jobs Finished; status = PASSED, However PR is now STALE, and must be retested. Set the AT: RETEST Label to force retest....

10 similar comments
@trilinos-autotester
Copy link
Contributor

All Jobs Finished; status = PASSED, However PR is now STALE, and must be retested. Set the AT: RETEST Label to force retest....

@trilinos-autotester
Copy link
Contributor

All Jobs Finished; status = PASSED, However PR is now STALE, and must be retested. Set the AT: RETEST Label to force retest....

@trilinos-autotester
Copy link
Contributor

All Jobs Finished; status = PASSED, However PR is now STALE, and must be retested. Set the AT: RETEST Label to force retest....

@trilinos-autotester
Copy link
Contributor

All Jobs Finished; status = PASSED, However PR is now STALE, and must be retested. Set the AT: RETEST Label to force retest....

@trilinos-autotester
Copy link
Contributor

All Jobs Finished; status = PASSED, However PR is now STALE, and must be retested. Set the AT: RETEST Label to force retest....

@trilinos-autotester
Copy link
Contributor

All Jobs Finished; status = PASSED, However PR is now STALE, and must be retested. Set the AT: RETEST Label to force retest....

@trilinos-autotester
Copy link
Contributor

All Jobs Finished; status = PASSED, However PR is now STALE, and must be retested. Set the AT: RETEST Label to force retest....

@trilinos-autotester
Copy link
Contributor

All Jobs Finished; status = PASSED, However PR is now STALE, and must be retested. Set the AT: RETEST Label to force retest....

@trilinos-autotester
Copy link
Contributor

All Jobs Finished; status = PASSED, However PR is now STALE, and must be retested. Set the AT: RETEST Label to force retest....

@trilinos-autotester
Copy link
Contributor

All Jobs Finished; status = PASSED, However PR is now STALE, and must be retested. Set the AT: RETEST Label to force retest....

@ndellingwood
Copy link
Contributor

@MicheldeMessieres when you have a moment can you test changes in this PR with your configurations for enabling the triangular solvers using cholmod, cusparse, with metis (where relevant)? There is some cleanup and fixes for mumps, but it may remove configuration options that need to be explicitly set for some of the triangular solver capabilities you have worked on recently.

@trilinos-autotester
Copy link
Contributor

All Jobs Finished; status = PASSED, However PR is now STALE, and must be retested. Set the AT: RETEST Label to force retest....

1 similar comment
@trilinos-autotester
Copy link
Contributor

All Jobs Finished; status = PASSED, However PR is now STALE, and must be retested. Set the AT: RETEST Label to force retest....

@bartlettroscoe
Copy link
Member Author

bartlettroscoe commented Nov 17, 2020

@srajama1 (Trilinos Linear Solver Product Lead), @trilinos/amesos2,

FYI: It was confirmed by @modkin in #7536 (comment) that this PR fixes the problem reported in #7536. If I fix the merge conflicts, can we please merge this to the Trilinos 'develop' branch?

@ndellingwood
Copy link
Contributor

Hi @bartlettroscoe I must've missed the previous amesos2 ping on this, sorry for the delay, will take a look now

Copy link
Contributor

@ndellingwood ndellingwood left a comment

Choose a reason for hiding this comment

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

Thanks @bartlettroscoe for contributing the PR, a question I have for the common pattern of changes:
There is code in amesos2 guarded by HAVE_AMESOS2_{TPL}, TPL in {Cholmod, MUMPS, CUSPARSE, CUBLAS}, will this removal code break those code paths? None of these solvers are enabled in PR testing afaik

@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
THE LAST COMMIT TO THIS PULL REQUEST HAS BEEN REVIEWED, BUT NOT ACCEPTED OR REQUIRES CHANGES

@trilinos-autotester
Copy link
Contributor

All Jobs Finished; status = PASSED, However PR is now STALE, and must be retested. Set the AT: RETEST Label to force retest....

@bartlettroscoe
Copy link
Member Author

bartlettroscoe commented Nov 17, 2020

a question I have for the common pattern of changes:
There is code in amesos2 guarded by HAVE_AMESOS2_{TPL}, TPL in {Cholmod, MUMPS, CUSPARSE, CUBLAS}, will this removal code break those code paths?

No. As described in:

when your package lists a TPL as an optional TPL (i.e. in the list LIB_OPTIONAL_TPLS ... <newTpl> ... in Dependencies.cmake file), TriBITS automatically defines the CMake cache var <Package>_ENABLE_<newTpl> and makes sure it is set correctly and defines the non-cache var HAVE_<PACKAGE_NAME_UC>_<OPTIONAL_DEP_TPL_NAME_UC> to get picked up when you configure your <Package>_config.h file. All you have to do manually is add an entry to <Package>_config.h and use that macro in your C++ code and tests. And in CMake logic, you key off of IF (${PACKAGE_NAME}_ENABLE_${OPTIONAL_DEP_TPL_NAME}).

Please let me know if the description of this at:

is not sufficient.

I will add some more comments to the patch in this PR to make this more clear.

Copy link
Member Author

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

Just adding some comments to try to help explain the changes here to be consistent with:

@@ -61,11 +62,6 @@ TRIBITS_ADD_OPTION_AND_DEFINE(${PACKAGE_NAME}_ENABLE_TIMERS
#


IF(${PACKAGE_NAME}_ENABLE_Cholmod)
SET(HAVE_AMESOS2_CHOLMOD ON )
Copy link
Member Author

Choose a reason for hiding this comment

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

No need for this. TriBITS automatically defines and sets this var to the correct value. See:

@@ -14,6 +14,7 @@ SET(${PACKAGE_NAME_UC}_RELEASE_DATE "07/28/2011")

IF (${PACKAGE_NAME}_ENABLE_MUMPS AND NOT Tpetra_INST_INT_INT)
MESSAGE(WARNING "*****Amesos2 will not provide MUMPS Support with Tpetra_INST_INT_INT OFF.*****")
SET(HAVE_${PACKAGE_NAME_UC}_MUMPS OFF)
Copy link
Member Author

Choose a reason for hiding this comment

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

NOTE: This special logic that is not supported directly by TriBITS but it seems to be what is desired.

Comment on lines -110 to -114
TRIBITS_ADD_OPTION_AND_DEFINE(${PACKAGE_NAME}_ENABLE_MUMPS
HAVE_AMESOS2_MUMPS
"Enable MUMPS in Amesos2"
OFF
)
Copy link
Member Author

Choose a reason for hiding this comment

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

No need for for this. TriBITS already defines these vars automatically. See:

Comment on lines -116 to -128
ASSERT_DEFINED(TPL_ENABLE_METIS)
TRIBITS_ADD_OPTION_AND_DEFINE(${PACKAGE_NAME}_ENABLE_METIS
HAVE_AMESOS2_METIS
"Enable METIS in Amesos2"
"${TPL_ENABLE_METIS}"
)
ASSERT_DEFINED(${PACKAGE_NAME}_ENABLE_METIS)
Copy link
Member Author

Choose a reason for hiding this comment

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

No need for for this. TriBITS already defines these vars automatically. See:

Comment on lines -124 to -136
ASSERT_DEFINED(TPL_ENABLE_CUSPARSE)
TRIBITS_ADD_OPTION_AND_DEFINE(${PACKAGE_NAME}_ENABLE_CUSPARSE
HAVE_AMESOS2_CUSPARSE
"Enable cuSPARSE in Amesos2"
"${TPL_ENABLE_CUSPARSE}"
)
ASSERT_DEFINED(${PACKAGE_NAME}_ENABLE_CUSPARSE)
Copy link
Member Author

Choose a reason for hiding this comment

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

No need for for this. TriBITS already defines these vars automatically. See:

Comment on lines -132 to -144
ASSERT_DEFINED(TPL_ENABLE_CUSOLVER)
TRIBITS_ADD_OPTION_AND_DEFINE(${PACKAGE_NAME}_ENABLE_CUSOLVER
HAVE_AMESOS2_CUSOLVER
"Enable cuSOLVER in Amesos2"
"${TPL_ENABLE_CUSOLVER}"
)
ASSERT_DEFINED(${PACKAGE_NAME}_ENABLE_CUSOLVER)
Copy link
Member Author

Choose a reason for hiding this comment

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

No need for for this. TriBITS already defines these vars automatically. See:

@@ -8,6 +8,6 @@ SET(TEST_REQUIRED_DEP_PACKAGES)
SET(TEST_OPTIONAL_DEP_PACKAGES ShyLU_NodeBasker ShyLU_NodeTacho Kokkos TrilinosSS)
# SET(LIB_REQUIRED_DEP_TPLS SuperLU)
SET(LIB_REQUIRED_DEP_TPLS )
SET(LIB_OPTIONAL_DEP_TPLS MPI SuperLU SuperLUMT SuperLUDist UMFPACK PARDISO_MKL ParMETIS METIS Cholmod MUMPS)
SET(LIB_OPTIONAL_DEP_TPLS MPI SuperLU SuperLUMT SuperLUDist UMFPACK PARDISO_MKL ParMETIS METIS Cholmod MUMPS CUSPARSE CUSOLVER)
Copy link
Member Author

Choose a reason for hiding this comment

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

This is the key. You just need to tell TriBITS that CUSPARSE and CUSOLVER are optional TPLs for the Amesos2 package and TriBITS takes care of defining and setting the following vars before processing the file packages/amesos2/CMakeLists.txt:

  • Amesos2_ENABLE_CUSPARSE
  • HAVE_AMESOS2_CUSPARSE
  • Amesos2_ENABLE_CUSOLVER
  • HAVE_AMESOS2_CUSOLVER

and likewise for all of these other optional TPLs.

I resolved the obvious conflicts in the files:

* packages/amesos2/CMakeLists.txt
* packages/amesos2/cmake/Dependencies.cmake

See discussion in PR trilinos#7562
Copy link
Contributor

@ndellingwood ndellingwood left a comment

Choose a reason for hiding this comment

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

Thanks Ross for the explanations and the documentation link, PR and changes look good.

@bartlettroscoe bartlettroscoe added AT: AUTOMERGE Causes the PR autotester to automatically merge the PR branch once approvals are completed AT: RETEST Causes the PR autotester to run a new round of PR tests on the next iteration and removed AT: STALE Added by the PR autotester if too much time has elapsed since the last successful PR test iteration labels Nov 17, 2020
@ndellingwood
Copy link
Contributor

@bartlettroscoe I'm going to remove the STALE label and add AUTOMERGE, though we may need to monitor for retest (OHPC and SRN systems are down today for equipment updates)

@trilinos-autotester
Copy link
Contributor

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

@ndellingwood
Copy link
Contributor

Oop, you beat me to the label updates

@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_intel_17.0.1 to start: Total Wait = 603

@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 Nov 17, 2020
@bartlettroscoe bartlettroscoe added the AT: RETEST Causes the PR autotester to run a new round of PR tests on the next iteration label Nov 17, 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: 2822
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
PR_LABELS AT: AUTOMERGE;AT: RETEST;impacting: build;impacting: tests;type: bug
PULLREQUESTNUM 7562
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH 7536-amesos2-fix-tpl-usage
TRILINOS_SOURCE_REPO https://github.com/bartlettroscoe/Trilinos
TRILINOS_SOURCE_SHA 6512249
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA eac6296

Build Information

Test Name: Trilinos_pullrequest_gcc_7.2.0_serial

  • Build Num: 459
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
PR_LABELS AT: AUTOMERGE;AT: RETEST;impacting: build;impacting: tests;type: bug
PULLREQUESTNUM 7562
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH 7536-amesos2-fix-tpl-usage
TRILINOS_SOURCE_REPO https://github.com/bartlettroscoe/Trilinos
TRILINOS_SOURCE_SHA 6512249
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA eac6296

Build Information

Test Name: Trilinos_pullrequest_gcc_7.2.0_debug

  • Build Num: 956
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
PR_LABELS AT: AUTOMERGE;AT: RETEST;impacting: build;impacting: tests;type: bug
PULLREQUESTNUM 7562
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH 7536-amesos2-fix-tpl-usage
TRILINOS_SOURCE_REPO https://github.com/bartlettroscoe/Trilinos
TRILINOS_SOURCE_SHA 6512249
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA eac6296

Build Information

Test Name: Trilinos_pullrequest_intel_17.0.1

  • Build Num: 8324
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
PR_LABELS AT: AUTOMERGE;AT: RETEST;impacting: build;impacting: tests;type: bug
PULLREQUESTNUM 7562
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH 7536-amesos2-fix-tpl-usage
TRILINOS_SOURCE_REPO https://github.com/bartlettroscoe/Trilinos
TRILINOS_SOURCE_SHA 6512249
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA eac6296

Build Information

Test Name: Trilinos_pullrequest_cuda_9.2

  • Build Num: 6058
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
PR_LABELS AT: AUTOMERGE;AT: RETEST;impacting: build;impacting: tests;type: bug
PULLREQUESTNUM 7562
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH 7536-amesos2-fix-tpl-usage
TRILINOS_SOURCE_REPO https://github.com/bartlettroscoe/Trilinos
TRILINOS_SOURCE_SHA 6512249
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA eac6296

Build Information

Test Name: Trilinos_pullrequest_clang_10.0.0

  • Build Num: 1194
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
PR_LABELS AT: AUTOMERGE;AT: RETEST;impacting: build;impacting: tests;type: bug
PULLREQUESTNUM 7562
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH 7536-amesos2-fix-tpl-usage
TRILINOS_SOURCE_REPO https://github.com/bartlettroscoe/Trilinos
TRILINOS_SOURCE_SHA 6512249
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA eac6296

Build Information

Test Name: Trilinos_pullrequest_python_3

  • Build Num: 3968
  • Status: STARTED

Jenkins Parameters

Parameter Name Value
PR_LABELS AT: AUTOMERGE;AT: RETEST;impacting: build;impacting: tests;type: bug
PULLREQUESTNUM 7562
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH 7536-amesos2-fix-tpl-usage
TRILINOS_SOURCE_REPO https://github.com/bartlettroscoe/Trilinos
TRILINOS_SOURCE_SHA 6512249
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA eac6296

Using Repos:

Repo: TRILINOS (bartlettroscoe/Trilinos)
  • Branch: 7536-amesos2-fix-tpl-usage
  • SHA: 6512249
  • 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_8.3.0

  • Build Num: 2822
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
PR_LABELS AT: AUTOMERGE;AT: RETEST;impacting: build;impacting: tests;type: bug
PULLREQUESTNUM 7562
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH 7536-amesos2-fix-tpl-usage
TRILINOS_SOURCE_REPO https://github.com/bartlettroscoe/Trilinos
TRILINOS_SOURCE_SHA 6512249
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA eac6296

Build Information

Test Name: Trilinos_pullrequest_gcc_7.2.0_serial

  • Build Num: 459
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
PR_LABELS AT: AUTOMERGE;AT: RETEST;impacting: build;impacting: tests;type: bug
PULLREQUESTNUM 7562
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH 7536-amesos2-fix-tpl-usage
TRILINOS_SOURCE_REPO https://github.com/bartlettroscoe/Trilinos
TRILINOS_SOURCE_SHA 6512249
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA eac6296

Build Information

Test Name: Trilinos_pullrequest_gcc_7.2.0_debug

  • Build Num: 956
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
PR_LABELS AT: AUTOMERGE;AT: RETEST;impacting: build;impacting: tests;type: bug
PULLREQUESTNUM 7562
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH 7536-amesos2-fix-tpl-usage
TRILINOS_SOURCE_REPO https://github.com/bartlettroscoe/Trilinos
TRILINOS_SOURCE_SHA 6512249
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA eac6296

Build Information

Test Name: Trilinos_pullrequest_intel_17.0.1

  • Build Num: 8324
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
PR_LABELS AT: AUTOMERGE;AT: RETEST;impacting: build;impacting: tests;type: bug
PULLREQUESTNUM 7562
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH 7536-amesos2-fix-tpl-usage
TRILINOS_SOURCE_REPO https://github.com/bartlettroscoe/Trilinos
TRILINOS_SOURCE_SHA 6512249
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA eac6296

Build Information

Test Name: Trilinos_pullrequest_cuda_9.2

  • Build Num: 6058
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
PR_LABELS AT: AUTOMERGE;AT: RETEST;impacting: build;impacting: tests;type: bug
PULLREQUESTNUM 7562
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH 7536-amesos2-fix-tpl-usage
TRILINOS_SOURCE_REPO https://github.com/bartlettroscoe/Trilinos
TRILINOS_SOURCE_SHA 6512249
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA eac6296

Build Information

Test Name: Trilinos_pullrequest_clang_10.0.0

  • Build Num: 1194
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
PR_LABELS AT: AUTOMERGE;AT: RETEST;impacting: build;impacting: tests;type: bug
PULLREQUESTNUM 7562
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH 7536-amesos2-fix-tpl-usage
TRILINOS_SOURCE_REPO https://github.com/bartlettroscoe/Trilinos
TRILINOS_SOURCE_SHA 6512249
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA eac6296

Build Information

Test Name: Trilinos_pullrequest_python_3

  • Build Num: 3968
  • Status: PASSED

Jenkins Parameters

Parameter Name Value
PR_LABELS AT: AUTOMERGE;AT: RETEST;impacting: build;impacting: tests;type: bug
PULLREQUESTNUM 7562
TEST_REPO_ALIAS TRILINOS
TRILINOS_SOURCE_BRANCH 7536-amesos2-fix-tpl-usage
TRILINOS_SOURCE_REPO https://github.com/bartlettroscoe/Trilinos
TRILINOS_SOURCE_SHA 6512249
TRILINOS_TARGET_BRANCH develop
TRILINOS_TARGET_REPO https://github.com/trilinos/Trilinos
TRILINOS_TARGET_SHA eac6296


CDash Test Results for PR# 7562.

@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 Nov 18, 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 [ ndellingwood ]!

@trilinos-autotester
Copy link
Contributor

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

@trilinos-autotester trilinos-autotester merged commit 7ba0323 into trilinos:develop Nov 18, 2020
@trilinos-autotester
Copy link
Contributor

Merge on Pull Request# 7562: 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 Nov 18, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
impacting: configure or build The issue is primarily related to configuring or building impacting: tests The defect (bug) is primarily a test failure (vs. a build failure) type: bug The primary issue is a bug in Trilinos code or tests
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants