-
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
Trilinos Master Merge PR Generator: Auto PR created to promote from master_merge_20191128_000626 branch to master #6375
Conversation
While I'm at it, fix other weird formatting.
Instead of using Teuchos::LAPACK directly, TSQR now uses it through a lowest-level interface TSQR::Impl::Lapack. This is a subclass of a new interface TSQR::Impl::RawQR. The point of this interface is to encapsulate any third-party local QR implementations that run on host, with either host or device data represented as raw pointers. We have cuSOLVER specifically in mind, but it might also help build times to hide large header files like Teuchos_LAPACK.hpp.
The goal is to decouple TSQR from Teuchos::BLAS. There's nothing wrong with Teuchos::BLAS, but we want options to call other TPLs besides the system BLAS.
This should help with porting to use Kokkos::View (and mdspan and mdarray in the future).
The goal is to replace MatView etc. with Kokkos::View.
Replace the nrows and ncols methods in Matrix, MatView, and ConstMatView with extent (as in Kokkos::View and mdspan). The goal is to replace these classes (or at least the nonowning MatView and ConstMatView) with Kokkos::View.
…ne-to-one * 'develop' of https://github.com/trilinos/Trilinos: (38 commits) MueLu RefMaxwell: Fix bug in ParameterList interface tpetra: converted constant to scalar_type; needed to enable compilation when scalar_type = std::complex<float> (as noted in #6314) tpetra: loosened tolerance that was too tight when scalar=float MueLu PerfUtils: Show ranks with min/max MueLu RefMaxwell: More fine grained control over sub-solve placement MueLu: fixing the count of aggregated nodes in refactored Phase2a of aggregation, see #6325 Teuchos StackedTimer: add unit test for 'proc_minmax' Teuchos StackedTimer: Print min time over all ranks that are active only Teuchos StackedTimer: add option to print rank with min/max time SEACAS: Bug fix since snapshot Reduce to ctest -j4 in all documentation (#6052) MueLu RefMaxwell: Print more matrix stats MueLu: gold file rebase and change of logic for issue #6269 MueLu: refactor of Dirichlet conditions handling and changes in UncoupledAggregation see issue #6269 Intrepid2: tweaks to OrientationTools::modifyBasisByOrientation() to allow reference-space inputs. Tempus: Add Cleanup of Error Tolerances. SEACAS: kluge to get new lib::fmt maybe working with nvcc Intrepid2: fixing issues with hierarchical parallelism policies, revealed when Trilinos is built with KOKKOS_ENABLE_DEPRECATED_CODE=OFF. (#6310) SEACAS: Another try at fixing nvcc build MueLu: fix type handling in regionMG unit test ...
The goal is to replace MatView and ConstMatView with Kokkos::View. Towards that end, I've started making MatView and ConstMatView have the same interface. I still need to replace member functions like fill with nonmember functions.
A debug build of trilinos reveals that a potentially wrong map is used when importing into a composite vector inside function: regionalToComposite(). This is fixed by using the maps stored in the import object instead of input arguments to regionalToComposite(). Further interface simplifications could be done in regionalToComposite() and compositeToRegional().
The goal is eventual replacement of (at least) MatView and ConstMatView with Kokkos::View. I also added a constexpr stride method in imitation of Kokkos::View.
1. Replace ConstMatView<LO, SC> with MatView<LO, const SC>. 2. Replace scalar_type typedef in MatView and Matrix with non_const_value_type and const_value_type, as in Kokkos::View. The goal is to replace MatView with Kokkos::View.
Add new partition_2x1 function to help with a particular use case.
We now test both the contiguous cache blocks and noncontiguous cache blocks cases.
Automatically Merged using Trilinos Pull Request AutoTester PR Title: Tpetra TAFC: Do not set importer when not needed PR Author: cgcgcg
…failure Automatically Merged using Trilinos Pull Request AutoTester PR Title: MueLu: fixing regionalToComposite() for region vectors PR Author: lucbv
Automatically Merged using Trilinos Pull Request AutoTester PR Title: MueLu: Refactoring Utilities_kokkos to avoid use of UVM, see issue #6161 PR Author: lucbv
Automatically Merged using Trilinos Pull Request AutoTester PR Title: ML: More experimental coarsening stuff PR Author: csiefer2
Using 1.0 in TEUCHOS_FLOATING_EQUALITY fails in a std::complex<> build because of template type deduction.
Automatically Merged using Trilinos Pull Request AutoTester PR Title: ML: A kinder, gentler version of the Amesos MPI_Comm_split fix DO NOT MERGE PR Author: csiefer2
…_fix Automatically Merged using Trilinos Pull Request AutoTester PR Title: MueLu: region vector test fix PR Author: lucbv
Status Flag 'Pre-Test Inspection' - Auto Inspected - Inspection Is Not Necessary for this Pull Request. |
Status Flag 'Master Merge AutoTester' - Testing Jenkins Projects: Pull Request Auto Testing STARTING (click to expand)Build InformationTest Name: Trilinos_pullrequest_gcc_4.8.4
Jenkins Parameters
Build InformationTest Name: Trilinos_pullrequest_intel_17.0.1
Jenkins Parameters
Build InformationTest Name: Trilinos_pullrequest_gcc_4.9.3_SERIAL
Jenkins Parameters
Build InformationTest Name: Trilinos_pullrequest_gcc_7.2.0
Jenkins Parameters
Build InformationTest Name: Trilinos_pullrequest_cuda_9.2
Jenkins Parameters
Using Repos:
Pull Request Author: trilinos-autotester |
Status Flag 'Master Merge AutoTester' - Jenkins Testing: 1 or more Jobs FAILED Note: Testing will normally be attempted again in approx. 15 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_4.8.4
Jenkins Parameters
Build InformationTest Name: Trilinos_pullrequest_intel_17.0.1
Jenkins Parameters
Build InformationTest Name: Trilinos_pullrequest_gcc_4.9.3_SERIAL
Jenkins Parameters
Build InformationTest Name: Trilinos_pullrequest_gcc_7.2.0
Jenkins Parameters
Build InformationTest Name: Trilinos_pullrequest_cuda_9.2
Jenkins Parameters
Console Output (last 100 lines) : Trilinos_pullrequest_gcc_4.8.4 # 5046 (click to expand)
Console Output (last 100 lines) : Trilinos_pullrequest_intel_17.0.1 # 4873 (click to expand)
Console Output (last 100 lines) : Trilinos_pullrequest_gcc_4.9.3_SERIAL # 3302 (click to expand)
Console Output (last 100 lines) : Trilinos_pullrequest_gcc_7.2.0 # 3147 (click to expand)
Console Output (last 100 lines) : Trilinos_pullrequest_cuda_9.2 # 2703 (click to expand)
|
Status Flag 'Master Merge AutoTester' - Testing Jenkins Projects: Pull Request Auto Testing STARTING (click to expand)Build InformationTest Name: Trilinos_pullrequest_gcc_4.8.4
Jenkins Parameters
Build InformationTest Name: Trilinos_pullrequest_intel_17.0.1
Jenkins Parameters
Build InformationTest Name: Trilinos_pullrequest_gcc_4.9.3_SERIAL
Jenkins Parameters
Build InformationTest Name: Trilinos_pullrequest_gcc_7.2.0
Jenkins Parameters
Build InformationTest Name: Trilinos_pullrequest_cuda_9.2
Jenkins Parameters
Using Repos:
Pull Request Author: trilinos-autotester |
Status Flag 'Master Merge AutoTester' - Jenkins Testing: all Jobs PASSED Pull Request Auto Testing has PASSED (click to expand)Build InformationTest Name: Trilinos_pullrequest_gcc_4.8.4
Jenkins Parameters
Build InformationTest Name: Trilinos_pullrequest_intel_17.0.1
Jenkins Parameters
Build InformationTest Name: Trilinos_pullrequest_gcc_4.9.3_SERIAL
Jenkins Parameters
Build InformationTest Name: Trilinos_pullrequest_gcc_7.2.0
Jenkins Parameters
Build InformationTest Name: Trilinos_pullrequest_cuda_9.2
Jenkins Parameters
|
Status Flag 'Pre-Merge Inspection' - Auto Inspected - Inspection Is Not Necessary for this Pull Request. |
Status Flag 'Master Merge AutoTester' - Pull Request will be Automerged |
Merge on Pull Request# 6375: IS A SUCCESS - Pull Request successfully merged |
…s:develop' (2bfd2c7). * trilinos-develop: (186 commits) zoltan2: upgrading testing for issues fixed in trilinos#6375 tpetra: disable kokkos warnings in initialize tests Tacho - disable matrix market reader/writer test to improve PR test stability. kokkos: cmake fixes for clang +/- cuda kokkos/cmake/kokkos_arch.cmake: Fix for clang + NO cuda Fix some scopes in nlnml_nonlinearlevel.cpp Zoltan2: fix reversal of Cuthill McKee ordering Add a fix for a stk cmake file Promote atdm ats2 gnu+dbg and cuda+gnu+dbg to 'Specialized' (CDOFA-72) Intrepid2: remove unnecessary finalize calls in unit tests Disable STEQR() LAPACK test on ats2 deug builds (trilinos#2410, trilinos#6166) Disable some timing out ROL tests (trilinos#6124) Disable timing out Tempus tests on ats2 (trilinos#6009) Intrepid2: reenabling JacobiLegendrePolynomial_Tests and Hierarchical_Basis_Tests. fixed some broken teuchos unit tests and removed missed deprecated methods Promoting ats2+gnu+opt build which is 100% clean (CDOFA-27) removed deprecated overload of << in SerialDenseMatrix, SerialBandDenseMatrix, SerialSymDenseMatrix, and SerialDenseVector removed deprecated Teuchos::Comm helpers reduceAll and scan that take pointers to return arguments removed deprecated MPITraits class removed deprecated ArrayArg class ...
…s:develop' (2bfd2c7). * trilinos-develop: (186 commits) zoltan2: upgrading testing for issues fixed in trilinos#6375 tpetra: disable kokkos warnings in initialize tests Tacho - disable matrix market reader/writer test to improve PR test stability. kokkos: cmake fixes for clang +/- cuda kokkos/cmake/kokkos_arch.cmake: Fix for clang + NO cuda Fix some scopes in nlnml_nonlinearlevel.cpp Zoltan2: fix reversal of Cuthill McKee ordering Add a fix for a stk cmake file Promote atdm ats2 gnu+dbg and cuda+gnu+dbg to 'Specialized' (CDOFA-72) Intrepid2: remove unnecessary finalize calls in unit tests Disable STEQR() LAPACK test on ats2 deug builds (trilinos#2410, trilinos#6166) Disable some timing out ROL tests (trilinos#6124) Disable timing out Tempus tests on ats2 (trilinos#6009) Intrepid2: reenabling JacobiLegendrePolynomial_Tests and Hierarchical_Basis_Tests. fixed some broken teuchos unit tests and removed missed deprecated methods Promoting ats2+gnu+opt build which is 100% clean (CDOFA-27) removed deprecated overload of << in SerialDenseMatrix, SerialBandDenseMatrix, SerialSymDenseMatrix, and SerialDenseVector removed deprecated Teuchos::Comm helpers reduceAll and scan that take pointers to return arguments removed deprecated MPITraits class removed deprecated ArrayArg class ...
…s:develop' (2bfd2c7). * trilinos-develop: (186 commits) zoltan2: upgrading testing for issues fixed in trilinos#6375 tpetra: disable kokkos warnings in initialize tests Tacho - disable matrix market reader/writer test to improve PR test stability. kokkos: cmake fixes for clang +/- cuda kokkos/cmake/kokkos_arch.cmake: Fix for clang + NO cuda Fix some scopes in nlnml_nonlinearlevel.cpp Zoltan2: fix reversal of Cuthill McKee ordering Add a fix for a stk cmake file Promote atdm ats2 gnu+dbg and cuda+gnu+dbg to 'Specialized' (CDOFA-72) Intrepid2: remove unnecessary finalize calls in unit tests Disable STEQR() LAPACK test on ats2 deug builds (trilinos#2410, trilinos#6166) Disable some timing out ROL tests (trilinos#6124) Disable timing out Tempus tests on ats2 (trilinos#6009) Intrepid2: reenabling JacobiLegendrePolynomial_Tests and Hierarchical_Basis_Tests. fixed some broken teuchos unit tests and removed missed deprecated methods Promoting ats2+gnu+opt build which is 100% clean (CDOFA-27) removed deprecated overload of << in SerialDenseMatrix, SerialBandDenseMatrix, SerialSymDenseMatrix, and SerialDenseVector removed deprecated Teuchos::Comm helpers reduceAll and scan that take pointers to return arguments removed deprecated MPITraits class removed deprecated ArrayArg class ...
…s:develop' (2bfd2c7). * trilinos-develop: (219 commits) Intrepid: Remove all Kokkos related code (trilinos#6712) Fix taper calculation. ATDM mutrino: switch from camke 3.11.4 to 3.14.6 removed the Epetra_MpiSmpCommData class kokkos-kernels: remove include of nonexistent directory Ifpack2: Fix test for Scalar=float Ifpack2::Relaxation: Make sure pointImporter_ gets rebuild if needed Tacho - example code for interfacing cusparse trisolve to evalute performance MueLu: Disabling flaky test MueLu: Removing eigenvalue check MueLu: Remove unused variable zoltan2: upgrading testing for issues fixed in trilinos#6375 MueLu: Fixing AggregateQuality MueLu: Build cleanups MueLu: Build cleanups tpetra: disable kokkos warnings in initialize tests MueLu: Build cleanups Tacho - disable matrix market reader/writer test to improve PR test stability. kokkos: cmake fixes for clang +/- cuda kokkos/cmake/kokkos_arch.cmake: Fix for clang + NO cuda ...
Auto PR created to promote from master_merge_20191128_000626 branch to master