Skip to content

Commit

Permalink
Merge pull request #697 from e10harvey/issue-589-2
Browse files Browse the repository at this point in the history 
Initial TRMM & TRTRI eti specializations as serial batched routines
  • Loading branch information
@srajama1
srajama1 authored May 1, 2020
2 parents 5821692 + ff42e48 commit 8bcf415
Show file tree
Hide file tree
Showing 48 changed files with 3,066 additions and 75 deletions.
12 changes: 12 additions & 0 deletions src/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,18 @@ KOKKOSKERNELS_GENERATE_ETI(Blas3_trsm trsm
TYPE_LISTS FLOATS LAYOUTS DEVICES
)

KOKKOSKERNELS_GENERATE_ETI(Blas3_trmm trmm
HEADER_LIST HEADERS
SOURCE_LIST SOURCES
TYPE_LISTS FLOATS LAYOUTS DEVICES
)

KOKKOSKERNELS_GENERATE_ETI(Blas_trtri trtri
HEADER_LIST HEADERS
SOURCE_LIST SOURCES
TYPE_LISTS FLOATS LAYOUTS DEVICES
)

KOKKOSKERNELS_GENERATE_ETI(Sparse_sptrsv_solve sptrsv_solve
HEADER_LIST ETI_HEADERS
SOURCE_LIST SOURCES
Expand Down
69 changes: 69 additions & 0 deletions src/batched/KokkosBatched_Trmm_Decl.hpp
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
/*
//@HEADER
// ************************************************************************
//
// Kokkos v. 3.0
// Copyright (2020) National Technology & Engineering
// Solutions of Sandia, LLC (NTESS).
//
// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are
// met:
//
// 1. Redistributions of source code must retain the above copyright
// notice, this list of conditions and the following disclaimer.
//
// 2. Redistributions in binary form must reproduce the above copyright
// notice, this list of conditions and the following disclaimer in the
// documentation and/or other materials provided with the distribution.
//
// 3. Neither the name of the Corporation nor the names of the
// contributors may be used to endorse or promote products derived from
// this software without specific prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY NTESS "AS IS" AND ANY
// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
//
// Questions? Contact Siva Rajamanickam ([email protected])
//
// ************************************************************************
//@HEADER
*/

#ifndef __KOKKOSBATCHED_TRMM_DECL_HPP__
#define __KOKKOSBATCHED_TRMM_DECL_HPP__

#include "KokkosBatched_Util.hpp"
#include "KokkosBatched_Vector.hpp"

namespace KokkosBatched {

template<typename ArgSide,
typename ArgUplo,
typename ArgTrans,
typename ArgDiag,
typename ArgAlgo>
struct SerialTrmm {
template<typename ScalarType,
typename AViewType,
typename BViewType>
KOKKOS_INLINE_FUNCTION
static int
invoke(const ScalarType alpha,
const AViewType &A,
const BViewType &B);
};
} // namespace KokkosBatched
#endif // __KOKKOSBATCHED_TRMM_DECL_HPP__
288 changes: 288 additions & 0 deletions src/batched/KokkosBatched_Trmm_Serial_Impl.hpp
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,288 @@
/*
//@HEADER
// ************************************************************************
//
// Kokkos v. 3.0
// Copyright (2020) National Technology & Engineering
// Solutions of Sandia, LLC (NTESS).
//
// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are
// met:
//
// 1. Redistributions of source code must retain the above copyright
// notice, this list of conditions and the following disclaimer.
//
// 2. Redistributions in binary form must reproduce the above copyright
// notice, this list of conditions and the following disclaimer in the
// documentation and/or other materials provided with the distribution.
//
// 3. Neither the name of the Corporation nor the names of the
// contributors may be used to endorse or promote products derived from
// this software without specific prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY NTESS "AS IS" AND ANY
// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
//
// Questions? Contact Siva Rajamanickam ([email protected])
//
// ************************************************************************
//@HEADER
*/

#ifndef __KOKKOSBATCHED_TRMM_SERIAL_IMPL_HPP__
#define __KOKKOSBATCHED_TRMM_SERIAL_IMPL_HPP__

#include "KokkosBatched_Util.hpp"
#include "KokkosBatched_Trmm_Serial_Internal.hpp"

namespace KokkosBatched {
//// Lower non-transpose ////
template<typename ArgDiag>
struct SerialTrmm<Side::Left,Uplo::Lower,Trans::NoTranspose,ArgDiag,Algo::Trmm::Unblocked> {
template<typename ScalarType,
typename AViewType,
typename BViewType>
KOKKOS_INLINE_FUNCTION
static int
invoke(const ScalarType alpha,
const AViewType &A,
const BViewType &B) {
return SerialTrmmInternalLeftLower<Algo::Trmm::Unblocked>::invoke(ArgDiag::use_unit_diag,
false,
A.extent(0), A.extent(1),
B.extent(0), B.extent(1),
alpha,
A.data(), A.stride_0(), A.stride_1(),
B.data(), B.stride_0(), B.stride_1());
}
};
template<typename ArgDiag>
struct SerialTrmm<Side::Right,Uplo::Lower,Trans::NoTranspose,ArgDiag,Algo::Trmm::Unblocked> {
template<typename ScalarType,
typename AViewType,
typename BViewType>
KOKKOS_INLINE_FUNCTION
static int
invoke(const ScalarType alpha,
const AViewType &A,
const BViewType &B) {
return SerialTrmmInternalRightLower<Algo::Trmm::Unblocked>::invoke(ArgDiag::use_unit_diag,
false,
A.extent(0), A.extent(1),
B.extent(0), B.extent(1),
alpha,
A.data(), A.stride_0(), A.stride_1(),
B.data(), B.stride_0(), B.stride_1());
}
};
//// Lower transpose /////
template<typename ArgDiag>
struct SerialTrmm<Side::Left,Uplo::Lower,Trans::Transpose,ArgDiag,Algo::Trmm::Unblocked> {
template<typename ScalarType,
typename AViewType,
typename BViewType>
KOKKOS_INLINE_FUNCTION
static int
invoke(const ScalarType alpha,
const AViewType &A,
const BViewType &B) {
return SerialTrmmInternalLeftUpper<Algo::Trmm::Unblocked>::invoke(ArgDiag::use_unit_diag,
false,
A.extent(1), A.extent(0),
B.extent(0), B.extent(1),
alpha,
A.data(), A.stride_1(), A.stride_0(),
B.data(), B.stride_0(), B.stride_1());
}
};
template<typename ArgDiag>
struct SerialTrmm<Side::Right,Uplo::Lower,Trans::Transpose,ArgDiag,Algo::Trmm::Unblocked> {
template<typename ScalarType,
typename AViewType,
typename BViewType>
KOKKOS_INLINE_FUNCTION
static int
invoke(const ScalarType alpha,
const AViewType &A,
const BViewType &B) {
return SerialTrmmInternalRightUpper<Algo::Trmm::Unblocked>::invoke(ArgDiag::use_unit_diag,
false,
A.extent(1), A.extent(0),
B.extent(0), B.extent(1),
alpha,
A.data(), A.stride_1(), A.stride_0(),
B.data(), B.stride_0(), B.stride_1());
}
};
//// Lower conjugate-transpose ////
template<typename ArgDiag>
struct SerialTrmm<Side::Left,Uplo::Lower,Trans::ConjTranspose,ArgDiag,Algo::Trmm::Unblocked> {
template<typename ScalarType,
typename AViewType,
typename BViewType>
KOKKOS_INLINE_FUNCTION
static int
invoke(const ScalarType alpha,
const AViewType &A,
const BViewType &B) {
return SerialTrmmInternalLeftUpper<Algo::Trmm::Unblocked>::invoke(ArgDiag::use_unit_diag,
true,
A.extent(1), A.extent(0),
B.extent(0), B.extent(1),
alpha,
A.data(), A.stride_1(), A.stride_0(),
B.data(), B.stride_0(), B.stride_1());
}
};
template<typename ArgDiag>
struct SerialTrmm<Side::Right,Uplo::Lower,Trans::ConjTranspose,ArgDiag,Algo::Trmm::Unblocked> {
template<typename ScalarType,
typename AViewType,
typename BViewType>
KOKKOS_INLINE_FUNCTION
static int
invoke(const ScalarType alpha,
const AViewType &A,
const BViewType &B) {
return SerialTrmmInternalRightUpper<Algo::Trmm::Unblocked>::invoke(ArgDiag::use_unit_diag,
true,
A.extent(1), A.extent(0),
B.extent(0), B.extent(1),
alpha,
A.data(), A.stride_1(), A.stride_0(),
B.data(), B.stride_0(), B.stride_1());
}
};
//// Upper non-transpose ////
template<typename ArgDiag>
struct SerialTrmm<Side::Left,Uplo::Upper,Trans::NoTranspose,ArgDiag,Algo::Trmm::Unblocked> {
template<typename ScalarType,
typename AViewType,
typename BViewType>
KOKKOS_INLINE_FUNCTION
static int
invoke(const ScalarType alpha,
const AViewType &A,
const BViewType &B) {
return SerialTrmmInternalLeftUpper<Algo::Trmm::Unblocked>::invoke(ArgDiag::use_unit_diag,
false,
A.extent(0), A.extent(1),
B.extent(0), B.extent(1),
alpha,
A.data(), A.stride_0(), A.stride_1(),
B.data(), B.stride_0(), B.stride_1());
}
};
template<typename ArgDiag>
struct SerialTrmm<Side::Right,Uplo::Upper,Trans::NoTranspose,ArgDiag,Algo::Trmm::Unblocked> {
template<typename ScalarType,
typename AViewType,
typename BViewType>
KOKKOS_INLINE_FUNCTION
static int
invoke(const ScalarType alpha,
const AViewType &A,
const BViewType &B) {
return SerialTrmmInternalRightUpper<Algo::Trmm::Unblocked>::invoke(ArgDiag::use_unit_diag,
false,
A.extent(0), A.extent(1),
B.extent(0), B.extent(1),
alpha,
A.data(), A.stride_0(), A.stride_1(),
B.data(), B.stride_0(), B.stride_1());
}
};
//// Upper transpose /////
template<typename ArgDiag>
struct SerialTrmm<Side::Left,Uplo::Upper,Trans::Transpose,ArgDiag,Algo::Trmm::Unblocked> {
template<typename ScalarType,
typename AViewType,
typename BViewType>
KOKKOS_INLINE_FUNCTION
static int
invoke(const ScalarType alpha,
const AViewType &A,
const BViewType &B) {
return SerialTrmmInternalLeftLower<Algo::Trmm::Unblocked>::invoke(ArgDiag::use_unit_diag,
false,
A.extent(1), A.extent(0),
B.extent(0), B.extent(1),
alpha,
A.data(), A.stride_1(), A.stride_0(),
B.data(), B.stride_0(), B.stride_1());
}
};
template<typename ArgDiag>
struct SerialTrmm<Side::Right,Uplo::Upper,Trans::Transpose,ArgDiag,Algo::Trmm::Unblocked> {
template<typename ScalarType,
typename AViewType,
typename BViewType>
KOKKOS_INLINE_FUNCTION
static int
invoke(const ScalarType alpha,
const AViewType &A,
const BViewType &B) {
return SerialTrmmInternalRightLower<Algo::Trmm::Unblocked>::invoke(ArgDiag::use_unit_diag,
false,
A.extent(1), A.extent(0),
B.extent(0), B.extent(1),
alpha,
A.data(), A.stride_1(), A.stride_0(),
B.data(), B.stride_0(), B.stride_1());
}
};
//// Upper conjugate-transpose ////
template<typename ArgDiag>
struct SerialTrmm<Side::Left,Uplo::Upper,Trans::ConjTranspose,ArgDiag,Algo::Trmm::Unblocked> {
template<typename ScalarType,
typename AViewType,
typename BViewType>
KOKKOS_INLINE_FUNCTION
static int
invoke(const ScalarType alpha,
const AViewType &A,
const BViewType &B) {
return SerialTrmmInternalLeftLower<Algo::Trmm::Unblocked>::invoke(ArgDiag::use_unit_diag,
true,
A.extent(1), A.extent(0),
B.extent(0), B.extent(1),
alpha,
A.data(), A.stride_1(), A.stride_0(),
B.data(), B.stride_0(), B.stride_1());
}
};
template<typename ArgDiag>
struct SerialTrmm<Side::Right,Uplo::Upper,Trans::ConjTranspose,ArgDiag,Algo::Trmm::Unblocked> {
template<typename ScalarType,
typename AViewType,
typename BViewType>
KOKKOS_INLINE_FUNCTION
static int
invoke(const ScalarType alpha,
const AViewType &A,
const BViewType &B) {
return SerialTrmmInternalRightLower<Algo::Trmm::Unblocked>::invoke(ArgDiag::use_unit_diag,
true,
A.extent(1), A.extent(0),
B.extent(0), B.extent(1),
alpha,
A.data(), A.stride_1(), A.stride_0(),
B.data(), B.stride_0(), B.stride_1());
}
};
} // namespace KokkosBatched

#endif // __KOKKOSBATCHED_TRMM_SERIAL_IMPL_HPP__
Loading

0 comments on commit 8bcf415

Please sign in to comment.