-
Notifications
You must be signed in to change notification settings - Fork 578
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
FROSch: Some fixes from ALCF Workshop #9218
Conversation
…f-workshop * 'develop' of ssh://github.com/trilinos/Trilinos: Disable tests listed in ticket trilinos#9077 Change name of UVM build to UVM Off Remove load of superlu module Change ini file to 32 bit to match my testing. Change from 64bit superlu_dist to 32bit Add SuperLUDist to the Intel 17 PR build/test
…f-workshop * 'develop' of ssh://github.com/trilinos/Trilinos: Ifpack2 Chebyshev: Add options for power method PIRO: add accessors to the underlying loca steppers Tacho LDL for symmetric indefinite problems. (trilinos#9091) Geminga: Run on Tesla K40 only MueLu Ifpack2Smoother: Use Ifpack2 methods to set zero starting solution Ifpack2: Add methods `supportsZeroStartingSolution` and `setZeroStartingSolution` Add space in CMAKE_CXX_FLAGS to be safe (trilinos#8449) Set non-cache vars for CMAKE_<LANG>_FLAGS with user override (trilinos#8449) Xpetra: regionMG matvec function definition added to EpetraCrsMatrix tpetra: fixing downstream compiler errors shown in trilinos#9084 MueLu Ifpack2: Add tests for reuse and Jacobi MueLu: Reuse Chebyshev smoother tpetra: adding back and deprecating getLocalRowView and getGlobalRowView in Tpetra_BlockMultiVector and Tpetra_BlockVector These functions were inadvertantly removed without deprecation during UVM removal. The functions are, however, deprecated. Users should use getLocalBlockHost with access flags instead of these functions Adding xpetra shortnames header to Xpetra_TpetraCrsMatrix Add further documentation for region matvec in xpetra added small comments and removed unused lines MueLu: regionMG add a region matvec to xpetra for use with the muelu region mg
…f-workshop * 'develop' of ssh://github.com/trilinos/Trilinos: (106 commits) MueLu: Additional coarsening options (trilinos#9191) SEACAS: Add fortran settings for cray fortran Tempus: ParameterList Constructor for IntegratorBasic. Ifpack2: Adding unit tests Ifpack2: Adding unit tests Tacho - remove debug output overriding Tacho - specialization for cuda 11 Tempus: ParameterList Constructor for IntegratorBasic. CMakeLists.txt: Fix for Trilinos_CXX_COMPILER_FLAGS KokkosKernels: Fixed kernel labels in GS apply Ifpack2: check Relaxation settings are compatible KokkosKernels: fix name lookup issue in non-ETI build KokkosKernels: fix maybe-uninitialized warning KokkosKernels/Ifpack2: MTGS long row kernel Percept: sync from Sierra repo MueLu: interpolation order input changes for GeometricInterpolation Fixes MINRES solver to perform correctly for right-hand preconditioning Automatic snapshot commit from tribits at b420835 klu2_ordinaltraits.h: Various calls here have long int as the arg, then delegate to a method for which the arg is UF_long. This fails to compile on Windows, for which long int is 32 bits. Instead do ptrdiff_t, which is correct on all platforms. CreateDirectory is defined in Winbase.h as a macro, so it must be undef'd before being declared as a method in Epetra_*Comm.h. Otherwise, an error arises because some files seem to include Winbase.h and others not. ...
Status Flag 'Pre-Test Inspection' - Auto Inspected - Inspection Is Not Necessary for this Pull Request. |
Status Flag 'Pull Request AutoTester' - Testing Jenkins Projects: Pull Request Auto Testing STARTING (click to expand)Build InformationTest Name: Trilinos_pullrequest_gcc_8.3.0
Jenkins Parameters
Build InformationTest Name: Trilinos_pullrequest_gcc_7.2.0_serial
Jenkins Parameters
Build InformationTest Name: Trilinos_pullrequest_gcc_7.2.0_debug
Jenkins Parameters
Build InformationTest Name: Trilinos_pullrequest_intel_17.0.1
Jenkins Parameters
Build InformationTest Name: Trilinos_pullrequest_cuda_10.1.105
Jenkins Parameters
Build InformationTest Name: Trilinos_pullrequest_cuda_10.1.105_uvm_off
Jenkins Parameters
Build InformationTest Name: Trilinos_pullrequest_clang_10.0.0
Jenkins Parameters
Build InformationTest Name: Trilinos_pullrequest_python_3
Jenkins Parameters
Using Repos:
Pull Request Author: searhein |
Status Flag 'Pull Request AutoTester' - Jenkins Testing: 1 or more Jobs FAILED Note: Testing will normally be attempted again in approx. 2 Hrs 30 Mins. If a change to the PR source branch occurs, the testing will be attempted again on next available autotester run. Pull Request Auto Testing has FAILED (click to expand)Build InformationTest Name: Trilinos_pullrequest_gcc_8.3.0
Jenkins Parameters
Build InformationTest Name: Trilinos_pullrequest_gcc_7.2.0_serial
Jenkins Parameters
Build InformationTest Name: Trilinos_pullrequest_gcc_7.2.0_debug
Jenkins Parameters
Build InformationTest Name: Trilinos_pullrequest_intel_17.0.1
Jenkins Parameters
Build InformationTest Name: Trilinos_pullrequest_cuda_10.1.105
Jenkins Parameters
Build InformationTest Name: Trilinos_pullrequest_cuda_10.1.105_uvm_off
Jenkins Parameters
Build InformationTest Name: Trilinos_pullrequest_clang_10.0.0
Jenkins Parameters
Build InformationTest Name: Trilinos_pullrequest_python_3
Jenkins Parameters
Console Output (last 100 lines) : Trilinos_pullrequest_gcc_8.3.0 # 4582 (click to expand)
Console Output (last 100 lines) : Trilinos_pullrequest_gcc_7.2.0_serial # 2113 (click to expand)
Console Output (last 100 lines) : Trilinos_pullrequest_gcc_7.2.0_debug # 2594 (click to expand)
Console Output (last 100 lines) : Trilinos_pullrequest_intel_17.0.1 # 9915 (click to expand)
Console Output (last 100 lines) : Trilinos_pullrequest_cuda_10.1.105 # 1329 (click to expand)
Console Output (last 100 lines) : Trilinos_pullrequest_cuda_10.1.105_uvm_off # 326 (click to expand)
Console Output (last 100 lines) : Trilinos_pullrequest_clang_10.0.0 # 2693 (click to expand)
Console Output (last 100 lines) : Trilinos_pullrequest_python_3 # 5269 (click to expand)
|
Status Flag 'Pull Request AutoTester' - User Requested Retest - Label AT: RETEST will be reset after testing. |
Status Flag 'Pull Request AutoTester' - Testing Jenkins Projects: Pull Request Auto Testing STARTING (click to expand)Build InformationTest Name: Trilinos_pullrequest_gcc_8.3.0
Jenkins Parameters
Build InformationTest Name: Trilinos_pullrequest_gcc_7.2.0_serial
Jenkins Parameters
Build InformationTest Name: Trilinos_pullrequest_gcc_7.2.0_debug
Jenkins Parameters
Build InformationTest Name: Trilinos_pullrequest_intel_17.0.1
Jenkins Parameters
Build InformationTest Name: Trilinos_pullrequest_cuda_10.1.105
Jenkins Parameters
Build InformationTest Name: Trilinos_pullrequest_cuda_10.1.105_uvm_off
Jenkins Parameters
Build InformationTest Name: Trilinos_pullrequest_clang_10.0.0
Jenkins Parameters
Build InformationTest Name: Trilinos_pullrequest_python_3
Jenkins Parameters
Using Repos:
Pull Request Author: searhein |
Status Flag 'Pull Request AutoTester' - Jenkins Testing: 1 or more Jobs FAILED Note: Testing will normally be attempted again in approx. 2 Hrs 30 Mins. If a change to the PR source branch occurs, the testing will be attempted again on next available autotester run. Pull Request Auto Testing has FAILED (click to expand)Build InformationTest Name: Trilinos_pullrequest_gcc_8.3.0
Jenkins Parameters
Build InformationTest Name: Trilinos_pullrequest_gcc_7.2.0_serial
Jenkins Parameters
Build InformationTest Name: Trilinos_pullrequest_gcc_7.2.0_debug
Jenkins Parameters
Build InformationTest Name: Trilinos_pullrequest_intel_17.0.1
Jenkins Parameters
Build InformationTest Name: Trilinos_pullrequest_cuda_10.1.105
Jenkins Parameters
Build InformationTest Name: Trilinos_pullrequest_cuda_10.1.105_uvm_off
Jenkins Parameters
Build InformationTest Name: Trilinos_pullrequest_clang_10.0.0
Jenkins Parameters
Build InformationTest Name: Trilinos_pullrequest_python_3
Jenkins Parameters
Console Output (last 100 lines) : Trilinos_pullrequest_gcc_8.3.0 # 4584 (click to expand)
Console Output (last 100 lines) : Trilinos_pullrequest_gcc_7.2.0_serial # 2115 (click to expand)
Console Output (last 100 lines) : Trilinos_pullrequest_gcc_7.2.0_debug # 2596 (click to expand)
Console Output (last 100 lines) : Trilinos_pullrequest_intel_17.0.1 # 9917 (click to expand)
Console Output (last 100 lines) : Trilinos_pullrequest_cuda_10.1.105 # 1331 (click to expand)
Console Output (last 100 lines) : Trilinos_pullrequest_cuda_10.1.105_uvm_off # 328 (click to expand)
Console Output (last 100 lines) : Trilinos_pullrequest_clang_10.0.0 # 2695 (click to expand)
Console Output (last 100 lines) : Trilinos_pullrequest_python_3 # 5270 (click to expand)
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Left some small comments. Thanks @searhein !
@iyamazaki you might want to keep the OLCF changes in mind.
// Store current Coarse Matrix in ParameterList_ | ||
if ( this->ParameterList_->get("Store Coarse Matrix",false) ) { | ||
FROSCH_NOTIFICATION("FROSch::CoarseOperator",this->Verbose_,"Storing current Coarse Matrix in Parameterlist."); | ||
this->ParameterList_->set("RCP(Coarse Matrix)", CoarseMatrix_); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Does this work correctly when you store a matrix in the parameterlist? I always thought it has to be serializable, may be the matrix is serializable?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We also store parallel multivectors (coordinate list, null space) in the parameter list. Therefore, I was assuming that this works for matrices as well.
Thank you for the comment. I will keep an eye on this.
double gatheringFactor = pow(double(this->MpiComm_->getSize())/double(NumProcsCoarseSolve_),1.0/double(gatheringSteps)); | ||
|
||
// | ||
// double gatheringFactor = pow(double(this->MpiComm_->getSize())/double(NumProcsCoarseSolve_),1.0/double(gatheringSteps)); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Delete this?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Since I put the auto merge flag for the PR, it already got merged before I could react to your comments. I should remove these commented code snippets in my next PR.
normRow += (*r)(i,j)*(*r)(i,j); | ||
} | ||
if (sqrt(normRow)<treshold) { | ||
// SC normRow = 0.0; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Delete this?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for these changes!
Status Flag 'Pre-Test Inspection' - Auto Inspected - Inspection Is Not Necessary for this Pull Request. |
Status Flag 'Pull Request AutoTester' - Testing Jenkins Projects: Pull Request Auto Testing STARTING (click to expand)Build InformationTest Name: Trilinos_pullrequest_gcc_8.3.0
Jenkins Parameters
Build InformationTest Name: Trilinos_pullrequest_gcc_7.2.0_serial
Jenkins Parameters
Build InformationTest Name: Trilinos_pullrequest_gcc_7.2.0_debug
Jenkins Parameters
Build InformationTest Name: Trilinos_pullrequest_intel_17.0.1
Jenkins Parameters
Build InformationTest Name: Trilinos_pullrequest_cuda_10.1.105
Jenkins Parameters
Build InformationTest Name: Trilinos_pullrequest_cuda_10.1.105_uvm_off
Jenkins Parameters
Build InformationTest Name: Trilinos_pullrequest_clang_10.0.0
Jenkins Parameters
Build InformationTest Name: Trilinos_pullrequest_python_3
Jenkins Parameters
Using Repos:
Pull Request Author: searhein |
Status Flag 'Pull Request AutoTester' - Jenkins Testing: all Jobs PASSED Pull Request Auto Testing has PASSED (click to expand)Build InformationTest Name: Trilinos_pullrequest_gcc_8.3.0
Jenkins Parameters
Build InformationTest Name: Trilinos_pullrequest_gcc_7.2.0_serial
Jenkins Parameters
Build InformationTest Name: Trilinos_pullrequest_gcc_7.2.0_debug
Jenkins Parameters
Build InformationTest Name: Trilinos_pullrequest_intel_17.0.1
Jenkins Parameters
Build InformationTest Name: Trilinos_pullrequest_cuda_10.1.105
Jenkins Parameters
Build InformationTest Name: Trilinos_pullrequest_cuda_10.1.105_uvm_off
Jenkins Parameters
Build InformationTest Name: Trilinos_pullrequest_clang_10.0.0
Jenkins Parameters
Build InformationTest Name: Trilinos_pullrequest_python_3
Jenkins Parameters
|
Status Flag 'Pre-Merge Inspection' - SUCCESS: The last commit to this Pull Request has been INSPECTED AND APPROVED by [ srajama1 roeverf ]! |
Status Flag 'Pull Request AutoTester' - Pull Request will be Automerged |
Merge on Pull Request# 9218: IS A SUCCESS - Pull Request successfully merged |
@trilinos/shylu
Description
This PR contains some small changes / fixes implemented during the 2021 ALCF Performance Workshop. Mostly related to setting certain parameters via the
Teuchos::ParameterList
, a small bug in the coarse map when using Zoltan2 to repartition the coarse problem, and some minor bugs in the output.Testing
The changes have successfully been tested locally as well as on Theta during the workshop.