Merge Pull Request #7909 from trilinos/Trilinos/master_merge_20200826…

…_000611

Automatically Merged using Trilinos Master Merge AutoTester
PR Title: Trilinos Master Merge PR Generator: Auto PR created to promote from master_merge_20200826_000611 branch to master
PR Author: trilinos-autotester

cmake/std/atdm/apps/empire/EMPIRETrilinosEnables.cmake

@@ -12,6 +12,9 @@ ATDM_SET_CACHE(Gtest_SKIP_INSTALL TRUE CACHE BOOL)
 
 ATDM_SET_CACHE(Trilinos_ENABLE_Gtest FALSE CACHE BOOL)
 
+# Always build EMPIRE with -fPIC
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC" CACHE STRING "" FORCE)
+
 INCLUDE("${CMAKE_CURRENT_LIST_DIR}/EMPIRETrilinosPackagesList.cmake")
 FOREACH(TRIBITS_PACKAGE ${EMPIRE_Trilinos_Packages})
   SET(${PROJECT_NAME}_ENABLE_${TRIBITS_PACKAGE} ON)

packages/intrepid2/src/Projection/Intrepid2_ProjectionTools.hpp

@@ -610,7 +610,7 @@ class ProjectionTools {
           auto b = Kokkos::subview(elemRhs, ic, Kokkos::ALL());
 
           //b'*Q0 -> b
-          KokkosBatched::SerialApplyQ_RightNoTransForwardInternal::invoke(
+          KokkosBatched::SerialApplyQ_RightForwardInternal::invoke(
               1, A0.extent(0), A0.extent(1),
               A0.data(),  A0.stride_0(), A0.stride_1(),
               tau0.data(), tau0.stride_0(),
@@ -651,7 +651,7 @@ class ProjectionTools {
           auto b = Kokkos::subview(elemRhs, ic, Kokkos::ALL());
 
           //b'*Q -> b
-          KokkosBatched::SerialApplyQ_RightNoTransForwardInternal::invoke(
+          KokkosBatched::SerialApplyQ_RightForwardInternal::invoke(
               1, A.extent(0), A.extent(1),
               A.data(),  A.stride_0(), A.stride_1(),
               tau.data(), tau.stride_0(),

packages/kokkos-kernels/.clang-format

@@ -0,0 +1,6 @@
+#Official Tool: clang-format version 8.0.0
+BasedOnStyle: google
+SortIncludes: false
+AlignConsecutiveAssignments: true
+AllowShortCaseLabelsOnASingleLine: true
+AllowShortIfStatementsOnASingleLine: true

packages/kokkos-kernels/CHANGELOG.md

@@ -1,5 +1,25 @@
 # Change Log
 
+## [3.2.00](https://github.com/kokkos/kokkos-kernels/tree/3.2.00) (2020-08-19)
+[Full Changelog](https://github.com/kokkos/kokkos-kernels/compare/3.1.01...3.2.00)
+
+**Implemented enhancements:**
+
+- Add CudaUVMSpace specializations for cuBLAS IAMAX and SCAL [\#758](https://github.com/kokkos/kokkos-kernels/issues/758)
+- Add wiki examples [\#735](https://github.com/kokkos/kokkos-kernels/issues/735)
+- Support complex\_float, complex\_double in cuSPARSE SPMV wrapper [\#726](https://github.com/kokkos/kokkos-kernels/issues/726)
+- Add performance tests for trmm and trtri [\#711](https://github.com/kokkos/kokkos-kernels/issues/711)
+- SpAdd requires output values to be zero-initialized, but this shouldnt be needed [\#694](https://github.com/kokkos/kokkos-kernels/issues/694)
+- SpAdd doesnt merge entries correctly [\#685](https://github.com/kokkos/kokkos-kernels/issues/685)
+- cusparse SpMV merge algorithm [\#670](https://github.com/kokkos/kokkos-kernels/issues/670)
+- TPL support for SpMV [\#614](https://github.com/kokkos/kokkos-kernels/issues/614)
+- Add two BLAS/LAPACK calls needed by: Sptrsv supernode \#552 [\#589](https://github.com/kokkos/kokkos-kernels/issues/589)
+- HashmapAccumulator has several unused members, misnamed parameters [\#508](https://github.com/kokkos/kokkos-kernels/issues/508)
+
+**Fixed bugs:**
+
+- Nightly test failure: spgemm unit tests failing on White \(Power8\) [\#780](https://github.com/kokkos/kokkos-kernels/issues/780)
+- supernodal does not build with UVM enabled [\#633](https://github.com/kokkos/kokkos-kernels/issues/633)
 
 ## [3.1.1](https://github.com/kokkos/kokkos-kernels/tree/3.1.1) (2020-05-04)
 [Full Changelog](https://github.com/kokkos/kokkos-kernels/compare/3.1.00...3.1.1)