Skip to content

Commit

Permalink
Merge pull request #199 from tdehoff/master
Browse files Browse the repository at this point in the history 
New matrix generators
  • Loading branch information
@mgates3
mgates3 authored Oct 29, 2024
2 parents 071f0dd + 8963a42 commit bf8f24b
Show file tree
Hide file tree
Showing 35 changed files with 1,383 additions and 2 deletions.
1 change: 1 addition & 0 deletions GNUmakefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -723,6 +723,7 @@ tester_src += \
test/test_her2k.cc \
test/test_herk.cc \
test/test_hesv.cc \
test/test_matgen.cc \
test/test_norm.cc \
test/test_pbsv.cc \
test/test_pocondest.cc \
Expand Down
177 changes: 175 additions & 2 deletions matgen/generate_matrix_ge.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
#include <cstdio>
#include <cstdlib>
#include <utility>
#include <numeric> // std::gcd

namespace slate {

Expand Down Expand Up @@ -203,7 +204,7 @@ void generate_matrix(
const scalar_t inner_const = pi/scalar_t(max_mn+1);

entry_type orthog_entry = [ outer_const, inner_const ]( int64_t i, int64_t j) {
scalar_t a = scalar_t(i) * scalar_t(j) * inner_const;
scalar_t a = scalar_t(i+1) * scalar_t(j+1) * inner_const;
return outer_const * sin(a);
};
set( orthog_entry, A, opts );
Expand All @@ -228,7 +229,8 @@ void generate_matrix(
case TestMatrixType::ris: {
const int64_t max_mn = std::max(n, m);
entry_type ris_entry = [max_mn]( int64_t i, int64_t j ) {
return 0.5 / ( max_mn - j - i + 1.5 );
// n-(j + 1)-(i + 1)+1.5 = n-j-i-0.5
return 0.5 / ( max_mn - j - i - 0.5);
};
set( ris_entry, A, opts );
break;
Expand Down Expand Up @@ -289,6 +291,177 @@ void generate_matrix(
generate_geevx( params, dist, cond, sigma_max, A, Sigma, seed, opts );
break;
}

case TestMatrixType::minij: {
entry_type minij_entry = []( int64_t i, int64_t j ) {
return std::min(i + 1, j + 1);
};
set( minij_entry, A, opts );
break;
}

case TestMatrixType::hilb: {
entry_type hilb_entry = []( int64_t i, int64_t j ) {
return 1.0 / (i + j + 1);
};
set( hilb_entry, A, opts );
break;
}

case TestMatrixType::frank: {
const int64_t max_mn = std::max(n, m);
entry_type frank_entry = [max_mn]( int64_t i, int64_t j ) {
if ((i - j) > 1) {
return int64_t( 0 );
}
else if ((i - j) == 1) {
return max_mn - j - 1;
}
else {
return max_mn - j;
}
};
set( frank_entry, A, opts );
break;
}

case TestMatrixType::lehmer: {
entry_type lehmer_entry = []( int64_t i, int64_t j ) {
return double (std::min(i, j) + 1) / (std::max(i, j) + 1);
};
set( lehmer_entry, A, opts );
break;
}

case TestMatrixType::lotkin: {
entry_type lotkin_entry = []( int64_t i, int64_t j ) {
return (i == 0 ? 1.0 : (1.0 / (i + j + 1)));
};
set( lotkin_entry, A, opts );
break;
}

case TestMatrixType::redheff: {
entry_type redheff_entry = []( int64_t i, int64_t j ) {
return ((j+1) % (i+1) == 0 || j == 0 ? 1 : 0);
};
set( redheff_entry, A, opts );
break;
}

case TestMatrixType::triw: {
entry_type triw_entry = []( int64_t i, int64_t j ) {
if (i == j) {
return 1;
}
else if (i > j) {
return 0;
}
else {
return -1;
}
};
set( triw_entry, A, opts );
break;
}

case TestMatrixType::pei: {
entry_type pei_entry = []( int64_t i, int64_t j ) {
return (i == j ? 2 : 1);
};
set( pei_entry, A, opts);
break;
}

case TestMatrixType::tridiag: {
entry_type tridiag_entry = []( int64_t i, int64_t j ) {
if (i == j) {
return 2;
}
else if (std::abs(i - j) == 1) {
return -1;
}
else {
return 0;
}
};
set( tridiag_entry, A, opts );
break;
}

case TestMatrixType::toeppen: {
entry_type toeppen_entry = []( int64_t i, int64_t j ) {
if (std::abs(j - i) == 1) {
return int ((j - i) * 10);
}
else if (std::abs(i - j) == 2) {
return 1;
}
else {
return 0;
}
};
set( toeppen_entry, A, opts );
break;
}

case TestMatrixType::parter: {
entry_type parter_entry = []( int64_t i, int64_t j ) {
return 1 / (i - j + 0.5);
};
set( parter_entry, A, opts );
break;
}

case TestMatrixType::moler: {
entry_type moler_entry = []( int64_t i, int64_t j ) {
return (i == j ? i + 1 : std::min(i, j) - 1);
};
set( moler_entry, A, opts );
break;
}

case TestMatrixType::cauchy: {
entry_type cauchy_entry = []( int64_t i, int64_t j ) {
return 1.0 / ( i + j + 2);
};
set( cauchy_entry, A, opts );
break;
}

case TestMatrixType::chow: {
entry_type chow_entry = []( int64_t i, int64_t j ) {
return ((i - j) < -1 ? 0 : 1);
};
set( chow_entry, A, opts );
break;
}

case TestMatrixType::clement: {
const int64_t max_mn = std::max(n, m);
entry_type clement_entry = [max_mn]( int64_t i, int64_t j ) {
if ((i - j) == 1) {
return max_mn - j - 1;
}
else if ((i - j) == -1) {
return j;
}
else {
return (int64_t)0;
}
};
set( clement_entry, A, opts );
break;
}

case TestMatrixType::gcdmat: {
entry_type gcdmat_entry = []( int64_t i, int64_t j ) {
return std::gcd(i + 1, j + 1);
};
set( gcdmat_entry, A, opts );
break;
}

}

// rand types have already been made diagonally dominant.
Expand Down
32 changes: 32 additions & 0 deletions matgen/generate_matrix_utils.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,22 @@ void generate_matrix_usage()
"riemann | matrix entry i,j equal to i+1 if j+2 divides i+2 else -1\n"
"ris | matrix entry i,j equal to 0.5/(n-i-j+1.5)\n"
"zielkeNS | nonsymmetric matrix of Zielke\n"
"minij | matrix entry i,j equal to min(i,j)\n"
"hilb | matrix entry i,j equal to 1/(i+j-1)\n"
"frank | square upper Hessenberg matrix with determinant 1\n"
"lehmer | matrix entry i,j equal to i/j if j>=i else j/i \n"
"lotkin | Hilbert matrix with 1's in its first row"
"redheff | matrix entry i,j equal to 1 if j==1 or i divides j, else 0\n"
"triw | upper triangular matrix with 1's on the diagonal and -1's above the diagonal\n"
"pei | 2's on diagonal, rest 1's\n"
"tridiag | 2's on diagonal, -1's on sub- and superdiagonal, rest zero\n"
"toeppen | 1's on second subdiagonal and second superdiagonal, -10's on subdiagonal, 10's on superdiagonal, rest zero\n"
"parter | matrix entry i,j equal to 1/(i-j+0.5)\n"
"moler | matrix entry i,j equal to i on diagonal, rest min(i,j)\n"
"cauchy | matrix entry i,j equal to 1/(i + j)\n"
"chow | matrix with 1's on the diagonal, superdiagonal, and all elements below them, and 0's above the superdiagonal\n"
"clement | matrix with decreasing values [n-1 : 1] on subdiagonal, and increasing values [1 : n-1] on superdiagonal\n"
"gcdmat | matrix entry i,j equal to gcd(i,j)\n"
" | \n"
"rand@ | matrix entries random uniform on (0, 1)\n"
"rands@ | matrix entries random uniform on (-1, 1)\n"
Expand Down Expand Up @@ -230,6 +246,22 @@ void decode_matrix(
base == "syev" ) { type = TestMatrixType::heev; }
else if (base == "geevx" ) { type = TestMatrixType::geevx; }
else if (base == "geev" ) { type = TestMatrixType::geev; }
else if (base == "minij" ) { type = TestMatrixType::minij; }
else if (base == "hilb" ) { type = TestMatrixType::hilb; }
else if (base == "frank" ) { type = TestMatrixType::frank; }
else if (base == "lehmer" ) { type = TestMatrixType::lehmer; }
else if (base == "lotkin" ) { type = TestMatrixType::lotkin; }
else if (base == "redheff" ) { type = TestMatrixType::redheff; }
else if (base == "triw" ) { type = TestMatrixType::triw; }
else if (base == "tridiag" ) { type = TestMatrixType::tridiag; }
else if (base == "toeppen" ) { type = TestMatrixType::toeppen; }
else if (base == "pei" ) { type = TestMatrixType::pei; }
else if (base == "parter" ) { type = TestMatrixType::parter; }
else if (base == "moler" ) { type = TestMatrixType::moler; }
else if (base == "cauchy" ) { type = TestMatrixType::cauchy; }
else if (base == "chow" ) { type = TestMatrixType::chow; }
else if (base == "clement" ) { type = TestMatrixType::clement; }
else if (base == "gcdmat" ) { type = TestMatrixType::gcdmat; }
else {
snprintf( msg, sizeof( msg ), "in '%s': unknown matrix '%s'",
kind.c_str(), base.c_str() );
Expand Down
16 changes: 16 additions & 0 deletions matgen/generate_matrix_utils.hh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,22 @@ enum class TestMatrixType {
heev,
geev,
geevx,
minij,
hilb,
frank,
lehmer,
lotkin,
redheff,
triw,
tridiag,
toeppen,
pei,
parter,
moler,
cauchy,
chow,
clement,
gcdmat,
};

enum class TestMatrixDist {
Expand Down
38 changes: 38 additions & 0 deletions test/ref/cauchy.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
% SLATE version 2024.05.31, id e62172c3
% input: ./tester --nb 4 --dim 20 --matrix cauchy --verbose 4 matgen
% 2024-10-27 11:17:59, 1 MPI ranks, CPU-only MPI, 22 OpenMP threads per MPI rank

type origin target go do A trans m n nb p q error time (s) status
% A: Matrix 20-by-20, 5-by-5 tiles, tileSize 4-by-4
A = [
0.5000 0.3333 0.2500 0.2000 0.1667 0.1429 0.1250 0.1111 0.1000 0.0909 0.0833 0.0769 0.0714 0.0667 0.0625 0.0588 0.0556 0.0526 0.0500 0.0476
0.3333 0.2500 0.2000 0.1667 0.1429 0.1250 0.1111 0.1000 0.0909 0.0833 0.0769 0.0714 0.0667 0.0625 0.0588 0.0556 0.0526 0.0500 0.0476 0.0455
0.2500 0.2000 0.1667 0.1429 0.1250 0.1111 0.1000 0.0909 0.0833 0.0769 0.0714 0.0667 0.0625 0.0588 0.0556 0.0526 0.0500 0.0476 0.0455 0.0435
0.2000 0.1667 0.1429 0.1250 0.1111 0.1000 0.0909 0.0833 0.0769 0.0714 0.0667 0.0625 0.0588 0.0556 0.0526 0.0500 0.0476 0.0455 0.0435 0.0417

0.1667 0.1429 0.1250 0.1111 0.1000 0.0909 0.0833 0.0769 0.0714 0.0667 0.0625 0.0588 0.0556 0.0526 0.0500 0.0476 0.0455 0.0435 0.0417 0.0400
0.1429 0.1250 0.1111 0.1000 0.0909 0.0833 0.0769 0.0714 0.0667 0.0625 0.0588 0.0556 0.0526 0.0500 0.0476 0.0455 0.0435 0.0417 0.0400 0.0385
0.1250 0.1111 0.1000 0.0909 0.0833 0.0769 0.0714 0.0667 0.0625 0.0588 0.0556 0.0526 0.0500 0.0476 0.0455 0.0435 0.0417 0.0400 0.0385 0.0370
0.1111 0.1000 0.0909 0.0833 0.0769 0.0714 0.0667 0.0625 0.0588 0.0556 0.0526 0.0500 0.0476 0.0455 0.0435 0.0417 0.0400 0.0385 0.0370 0.0357

0.1000 0.0909 0.0833 0.0769 0.0714 0.0667 0.0625 0.0588 0.0556 0.0526 0.0500 0.0476 0.0455 0.0435 0.0417 0.0400 0.0385 0.0370 0.0357 0.0345
0.0909 0.0833 0.0769 0.0714 0.0667 0.0625 0.0588 0.0556 0.0526 0.0500 0.0476 0.0455 0.0435 0.0417 0.0400 0.0385 0.0370 0.0357 0.0345 0.0333
0.0833 0.0769 0.0714 0.0667 0.0625 0.0588 0.0556 0.0526 0.0500 0.0476 0.0455 0.0435 0.0417 0.0400 0.0385 0.0370 0.0357 0.0345 0.0333 0.0323
0.0769 0.0714 0.0667 0.0625 0.0588 0.0556 0.0526 0.0500 0.0476 0.0455 0.0435 0.0417 0.0400 0.0385 0.0370 0.0357 0.0345 0.0333 0.0323 0.0312

0.0714 0.0667 0.0625 0.0588 0.0556 0.0526 0.0500 0.0476 0.0455 0.0435 0.0417 0.0400 0.0385 0.0370 0.0357 0.0345 0.0333 0.0323 0.0312 0.0303
0.0667 0.0625 0.0588 0.0556 0.0526 0.0500 0.0476 0.0455 0.0435 0.0417 0.0400 0.0385 0.0370 0.0357 0.0345 0.0333 0.0323 0.0312 0.0303 0.0294
0.0625 0.0588 0.0556 0.0526 0.0500 0.0476 0.0455 0.0435 0.0417 0.0400 0.0385 0.0370 0.0357 0.0345 0.0333 0.0323 0.0312 0.0303 0.0294 0.0286
0.0588 0.0556 0.0526 0.0500 0.0476 0.0455 0.0435 0.0417 0.0400 0.0385 0.0370 0.0357 0.0345 0.0333 0.0323 0.0312 0.0303 0.0294 0.0286 0.0278

0.0556 0.0526 0.0500 0.0476 0.0455 0.0435 0.0417 0.0400 0.0385 0.0370 0.0357 0.0345 0.0333 0.0323 0.0312 0.0303 0.0294 0.0286 0.0278 0.0270
0.0526 0.0500 0.0476 0.0455 0.0435 0.0417 0.0400 0.0385 0.0370 0.0357 0.0345 0.0333 0.0323 0.0312 0.0303 0.0294 0.0286 0.0278 0.0270 0.0263
0.0500 0.0476 0.0455 0.0435 0.0417 0.0400 0.0385 0.0370 0.0357 0.0345 0.0333 0.0323 0.0312 0.0303 0.0294 0.0286 0.0278 0.0270 0.0263 0.0256
0.0476 0.0455 0.0435 0.0417 0.0400 0.0385 0.0370 0.0357 0.0345 0.0333 0.0323 0.0312 0.0303 0.0294 0.0286 0.0278 0.0270 0.0263 0.0256 0.0250
];
d host task col row 1 notrans 20 20 4 1 1 NA NA no check

% Matrix kinds:
% 1: cauchy, cond unknown

% All tests passed: matgen
Loading

0 comments on commit bf8f24b

Please sign in to comment.