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.

Sign up for GitHub

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

Jump to bottom

cleanup Tile namespace #162

Merged
merged 3 commits into from
May 27, 2024
Merged

cleanup Tile namespace #162

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
576fe05
remove utilities provided by std or BLAS++
mgates3 Feb 10, 2024
19e3858
Put Tile LAPACK routines in namespace tile. Improve style.
mgates3 Feb 10, 2024
d58dd94
remove extra #include Tile_*.hh
mgates3 Feb 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions examples/util.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,9 @@ void random_matrix( int64_t m, int64_t n, scalar_type* A, int64_t lda )
{
for (int64_t j = 0; j < n; ++j) {
for (int64_t i = 0; i < m; ++i) {
A[ i + j*lda ] = make<scalar_type>( rand() / double(RAND_MAX),
rand() / double(RAND_MAX) );
A[ i + j*lda ] = blas::make_scalar<scalar_type>(
rand() / double(RAND_MAX),
rand() / double(RAND_MAX) );
}
}
}
Expand All @@ -56,8 +57,9 @@ void random_matrix_diag_dominant( int64_t m, int64_t n, scalar_type* A, int64_t
int64_t max_mn = std::max( m, n );
for (int64_t j = 0; j < n; ++j) {
for (int64_t i = 0; i < m; ++i) {
A[ i + j*lda ] = make<scalar_type>( rand() / double(RAND_MAX),
rand() / double(RAND_MAX) );
A[ i + j*lda ] = blas::make_scalar<scalar_type>(
rand() / double(RAND_MAX),
rand() / double(RAND_MAX) );
}
if (j < m) {
// make diagonal real & dominant
Expand Down
1 change: 0 additions & 1 deletion old/src/internal/internal_gemm_split.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@

#include "slate/Matrix.hh"
#include "slate/types.hh"
#include "slate/Tile_blas.hh"
#include "internal/internal.hh"
#include "internal/internal_batch.hh"

Expand Down
1 change: 0 additions & 1 deletion src/bdsqr.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@

#include "slate/slate.hh"
// #include "auxiliary/Debug.hh"
#include "slate/Tile_blas.hh"
#include "slate/TriangularBandMatrix.hh"
#include "internal/internal.hh"
#include "internal/internal_util.hh"
Expand Down
1 change: 0 additions & 1 deletion src/gbsv.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
#include "slate/slate.hh"
#include "auxiliary/Debug.hh"
#include "slate/Matrix.hh"
#include "slate/Tile_blas.hh"
#include "slate/TriangularMatrix.hh"
#include "internal/internal.hh"

Expand Down
1 change: 0 additions & 1 deletion src/gbtrf.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
#include "slate/slate.hh"
#include "auxiliary/Debug.hh"
#include "slate/BandMatrix.hh"
#include "slate/Tile_blas.hh"
#include "slate/TriangularMatrix.hh"
#include "internal/internal.hh"

Expand Down
1 change: 0 additions & 1 deletion src/gbtrs.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
#include "slate/slate.hh"
#include "auxiliary/Debug.hh"
#include "slate/Matrix.hh"
#include "slate/Tile_blas.hh"
#include "slate/TriangularBandMatrix.hh"
#include "internal/internal.hh"

Expand Down
1 change: 0 additions & 1 deletion src/gels.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
#include "slate/slate.hh"
#include "auxiliary/Debug.hh"
#include "slate/Matrix.hh"
#include "slate/Tile_blas.hh"
#include "slate/TriangularMatrix.hh"
#include "internal/internal.hh"

Expand Down
1 change: 0 additions & 1 deletion src/gels_cholqr.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
#include "slate/slate.hh"
#include "auxiliary/Debug.hh"
#include "slate/Matrix.hh"
#include "slate/Tile_blas.hh"
#include "slate/TriangularMatrix.hh"
#include "internal/internal.hh"

Expand Down
1 change: 0 additions & 1 deletion src/gels_qr.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
#include "slate/slate.hh"
#include "auxiliary/Debug.hh"
#include "slate/Matrix.hh"
#include "slate/Tile_blas.hh"
#include "slate/TriangularMatrix.hh"
#include "internal/internal.hh"

Expand Down
1 change: 0 additions & 1 deletion src/gesv.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
#include "slate/slate.hh"
#include "auxiliary/Debug.hh"
#include "slate/Matrix.hh"
#include "slate/Tile_blas.hh"
#include "slate/TriangularMatrix.hh"
#include "internal/internal.hh"

Expand Down
1 change: 0 additions & 1 deletion src/gesv_mixed.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
#include "slate/slate.hh"
#include "auxiliary/Debug.hh"
#include "slate/Matrix.hh"
#include "slate/Tile_blas.hh"
#include "internal/internal.hh"
#include "internal/internal_util.hh"

Expand Down
1 change: 0 additions & 1 deletion src/gesv_mixed_gmres.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
#include "slate/slate.hh"
#include "auxiliary/Debug.hh"
#include "slate/Matrix.hh"
#include "slate/Tile_blas.hh"
#include "internal/internal.hh"
#include "internal/internal_util.hh"

Expand Down
1 change: 0 additions & 1 deletion src/gesv_nopiv.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
#include "slate/slate.hh"
#include "auxiliary/Debug.hh"
#include "slate/Matrix.hh"
#include "slate/Tile_blas.hh"
#include "slate/TriangularMatrix.hh"
#include "internal/internal.hh"

Expand Down
1 change: 0 additions & 1 deletion src/getrf.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
#include "slate/slate.hh"
#include "auxiliary/Debug.hh"
#include "slate/Matrix.hh"
#include "slate/Tile_blas.hh"
#include "slate/TriangularMatrix.hh"
#include "internal/internal.hh"

Expand Down
1 change: 0 additions & 1 deletion src/getrf_nopiv.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
#include "slate/slate.hh"
#include "auxiliary/Debug.hh"
#include "slate/Matrix.hh"
#include "slate/Tile_blas.hh"
#include "slate/TriangularMatrix.hh"
#include "internal/internal.hh"

Expand Down
1 change: 0 additions & 1 deletion src/getrf_tntpiv.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
#include "slate/slate.hh"
#include "auxiliary/Debug.hh"
#include "slate/Matrix.hh"
#include "slate/Tile_blas.hh"
#include "slate/TriangularMatrix.hh"
#include "internal/internal.hh"

Expand Down
1 change: 0 additions & 1 deletion src/getriOOP.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
#include "slate/slate.hh"
#include "auxiliary/Debug.hh"
#include "slate/Matrix.hh"
#include "slate/Tile_blas.hh"
#include "slate/TriangularMatrix.hh"
#include "internal/internal.hh"

Expand Down
1 change: 0 additions & 1 deletion src/getrs.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
#include "slate/slate.hh"
#include "auxiliary/Debug.hh"
#include "slate/Matrix.hh"
#include "slate/Tile_blas.hh"
#include "slate/TriangularMatrix.hh"
#include "internal/internal.hh"

Expand Down
1 change: 0 additions & 1 deletion src/getrs_nopiv.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
#include "slate/slate.hh"
#include "auxiliary/Debug.hh"
#include "slate/Matrix.hh"
#include "slate/Tile_blas.hh"
#include "slate/TriangularMatrix.hh"
#include "internal/internal.hh"

Expand Down
1 change: 0 additions & 1 deletion src/heev.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
#include "slate/slate.hh"
#include "auxiliary/Debug.hh"
#include "slate/HermitianMatrix.hh"
#include "slate/Tile_blas.hh"
#include "slate/HermitianBandMatrix.hh"
#include "internal/internal.hh"

Expand Down
1 change: 0 additions & 1 deletion src/hegv.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
#include "slate/slate.hh"
#include "auxiliary/Debug.hh"
#include "slate/HermitianMatrix.hh"
#include "slate/Tile_blas.hh"
#include "slate/HermitianBandMatrix.hh"
#include "internal/internal.hh"

Expand Down
1 change: 0 additions & 1 deletion src/hesv.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
#include "auxiliary/Debug.hh"
#include "slate/Matrix.hh"
#include "slate/HermitianMatrix.hh"
#include "slate/Tile_blas.hh"
#include "slate/TriangularMatrix.hh"
#include "internal/internal.hh"

Expand Down
1 change: 0 additions & 1 deletion src/hetrs.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
#include "auxiliary/Debug.hh"
#include "slate/Matrix.hh"
#include "slate/HermitianMatrix.hh"
#include "slate/Tile_blas.hh"
#include "slate/TriangularMatrix.hh"
#include "internal/internal.hh"

Expand Down
11 changes: 6 additions & 5 deletions src/internal/Tile_geqrf.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@

#include "internal/internal_util.hh"
#include "slate/Tile.hh"
#include "slate/Tile_blas.hh"
#include "internal/Tile_lapack.hh"
#include "slate/types.hh"
#include "slate/internal/util.hh"

Expand All @@ -21,7 +19,7 @@
#include <lapack.hh>

namespace slate {
namespace internal {
namespace tile {

//------------------------------------------------------------------------------
/// Compute the QR factorization of a panel.
Expand Down Expand Up @@ -78,6 +76,8 @@ void geqrf(
{
trace::Block trace_block("lapack::geqrf");

using std::real;
using std::imag;
using blas::conj;
using real_t = blas::real_type<scalar_t>;

Expand Down Expand Up @@ -221,7 +221,8 @@ void geqrf(
}

// todo: Use overflow-safe division (see CLADIV/ZLADIV)
scalar_t tau = make<scalar_t>((beta-alphr)/beta, -alphi/beta);
scalar_t tau = blas::make_scalar<scalar_t>(
(beta - alphr) / beta, -alphi / beta );
scalar_t scal_alpha = one / (alpha-beta);
scalar_t ger_alpha = -conj(tau);
betas.at(j) = beta;
Expand Down Expand Up @@ -484,7 +485,7 @@ void geqrf(
}
}

} // namespace internal
} // namespace tile
} // namespace slate

#endif // SLATE_TILE_GEQRF_HH
4 changes: 2 additions & 2 deletions src/internal/Tile_gerbt.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

namespace slate {

namespace internal {
namespace tile {

//------------------------------------------------------------------------------
/// Applies a single butterfly matrix to each side of A.
Expand Down Expand Up @@ -266,7 +266,7 @@ void gerbt_right_trans(Tile<scalar_t> B1,
}
}

} // namespace internal
} // namespace tile

} // namespace slate

2 changes: 0 additions & 2 deletions src/internal/Tile_getrf.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@
#include "internal/internal.hh"
#include "internal/internal_swap.hh"
#include "slate/Tile.hh"
#include "slate/Tile_blas.hh"
#include "internal/Tile_lapack.hh"
#include "slate/types.hh"
#include "slate/internal/util.hh"

Expand Down
4 changes: 4 additions & 0 deletions src/internal/Tile_henorm.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@

namespace slate {

namespace tile {

//------------------------------------------------------------------------------
/// Hermitian matrix norm.
/// The only difference from symmetric matrix norm is the diagonal is assumed
Expand Down Expand Up @@ -106,6 +108,8 @@ void henorm(Norm norm, Tile<scalar_t> const&& A,
return henorm(norm, A, values);
}

} // namespace tile

} // namespace slate

#endif // SLATE_TILE_HENORM_HH
10 changes: 5 additions & 5 deletions src/internal/Tile_householder_reflection_generator.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@

#include "internal/internal_util.hh"
#include "slate/Tile.hh"
#include "slate/Tile_blas.hh"
#include "internal/Tile_lapack.hh"
#include "slate/types.hh"
#include "slate/internal/util.hh"

Expand All @@ -21,7 +19,7 @@
#include <lapack.hh>

namespace slate {
namespace internal {
namespace tile {

//--------------------------------------------------------------------------------
/// Compute at the qr2 level, Householder reflections of a panel, with tau scalars.
Expand Down Expand Up @@ -134,7 +132,8 @@ void householder_reflection_generator(
-std::copysign(lapack::lapy3(alphr, alphi, xnorm), alphr);

scalar_t scal_alpha = one / (alpha-beta);
scalar_t tau = make<scalar_t>((beta-alphr)/beta, -alphi/beta);
scalar_t tau = blas::make_scalar<scalar_t>(
(beta - alphr) / beta, -alphi / beta );
betas.at(k) = beta; // only need beta for correct QR-factorization
taus.at(k) = tau;

Expand Down Expand Up @@ -307,7 +306,8 @@ void householder_reflection_generator(
}
}
}
} // namespace internal

} // namespace tile
} // namespace slate

#endif // SLATE_TILE_HOUSEHOLDER_REFLECTION_GENERATOR
4 changes: 4 additions & 0 deletions src/internal/Tile_lapack.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@

namespace slate {

namespace tile {

//------------------------------------------------------------------------------
/// General matrix norm.
/// @ingroup norm_tile
Expand Down Expand Up @@ -411,6 +413,8 @@ int64_t scale(scalar_t value, Tile<scalar_t>&& A)
return scale(value, A);
}

} // namespace tile

} // namespace slate

#endif // SLATE_TILE_LAPACK_HH
20 changes: 13 additions & 7 deletions src/internal/Tile_synorm.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@

namespace slate {

namespace tile {

//------------------------------------------------------------------------------
/// Symmetric matrix norm.
/// @ingroup norm_tile
Expand Down Expand Up @@ -105,9 +107,10 @@ void synorm(Norm norm, Tile<scalar_t> const&& A,
/// @ingroup norm_tile
///
template <typename scalar_t>
void synormOffdiag(Norm norm, Tile<scalar_t> const& A,
blas::real_type<scalar_t>* col_sums,
blas::real_type<scalar_t>* row_sums)
void synorm_offdiag(
Norm norm, Tile<scalar_t> const& A,
blas::real_type<scalar_t>* col_sums,
blas::real_type<scalar_t>* row_sums )
{
using real_t = blas::real_type<scalar_t>;

Expand Down Expand Up @@ -142,13 +145,16 @@ void synormOffdiag(Norm norm, Tile<scalar_t> const& A,
/// @ingroup norm_tile
///
template <typename scalar_t>
void synormOffdiag(Norm norm, Tile<scalar_t> const&& A,
blas::real_type<scalar_t>* col_sums,
blas::real_type<scalar_t>* row_sums)
void synorm_offdiag(
Norm norm, Tile<scalar_t> const&& A,
blas::real_type<scalar_t>* col_sums,
blas::real_type<scalar_t>* row_sums )
{
return synormOffdiag(norm, A, col_sums, row_sums);
return synorm_offdiag( norm, A, col_sums, row_sums );
}

} // namespace tile

} // namespace slate

#endif // SLATE_TILE_SYNORM_HH
Loading
Loading