From 53ecb4abf20aa508c14c9af262156302077f8c52 Mon Sep 17 00:00:00 2001 From: ulrikeyang Date: Thu, 12 Oct 2023 15:09:46 -0700 Subject: [PATCH] replaced results for Problem 1 with corrected FOM. --- doc/sphinx/02_amg/amg.rst | 32 ++++++++++++++++---------------- doc/sphinx/02_amg/gpu1.csv | 32 ++++++++++++++++---------------- doc/sphinx/02_amg/roci_1_120.csv | 14 +++++++------- doc/sphinx/02_amg/roci_1_160.csv | 14 +++++++------- doc/sphinx/02_amg/roci_1_200.csv | 14 +++++++------- doc/sphinx/02_amg/roci_mem.csv | 8 ++++---- 6 files changed, 57 insertions(+), 57 deletions(-) diff --git a/doc/sphinx/02_amg/amg.rst b/doc/sphinx/02_amg/amg.rst index 64ab75c3..8a4d74f4 100644 --- a/doc/sphinx/02_amg/amg.rst +++ b/doc/sphinx/02_amg/amg.rst @@ -350,37 +350,37 @@ In addition, aggressive coarsening is used on the first level, significantly dec +---------+-----------+-----------+-----------+------------+------------+------------+ | n | FOM | FOM_setup | FOM_solve | setup time | solve time | iterations | +---------+-----------+-----------+-----------+------------+------------+------------+ - | 50 | 2.652E+09 | 9.708E+07 | 5.304E+09 | 0.068 | 0.024 | 19 | + | 50 | 2.701E+09 | 9.708E+07 | 5.304E+09 | 0.068 | 0.024 | 19 | +---------+-----------+-----------+-----------+------------+------------+------------+ - | 60 | 3.586E+09 | 1.348E+08 | 7.172E+09 | 0.086 | 0.031 | 19 | + | 60 | 3.654E+09 | 1.348E+08 | 7.172E+09 | 0.086 | 0.031 | 19 | +---------+-----------+-----------+-----------+------------+------------+------------+ - | 70 | 4.670E+09 | 1.504E+08 | 9.340E+09 | 0.123 | 0.038 | 19 | + | 70 | 4.745E+09 | 1.504E+08 | 9.340E+09 | 0.123 | 0.038 | 19 | +---------+-----------+-----------+-----------+------------+------------+------------+ - | 80 | 4.482E+09 | 2.000E+08 | 8.964E+09 | 0.139 | 0.059 | 19 | + | 80 | 4.582E+09 | 2.000E+08 | 8.964E+09 | 0.139 | 0.059 | 19 | +---------+-----------+-----------+-----------+------------+------------+------------+ - | 90 | 5.878E+09 | 2.190E+08 | 1.176E+10 | 0.181 | 0.064 | 19 | + | 90 | 5.987E+09 | 2.190E+08 | 1.176E+10 | 0.181 | 0.064 | 19 | +---------+-----------+-----------+-----------+------------+------------+------------+ - | 100 | 6.439E+09 | 2.702E+08 | 1.288E+10 | 0.202 | 0.080 | 19 | + | 100 | 6.574E+09 | 2.702E+08 | 1.288E+10 | 0.202 | 0.080 | 19 | +---------+-----------+-----------+-----------+------------+------------+------------+ - | 110 | 6.704E+09 | 3.026E+08 | 1.341E+10 | 0.240 | 0.103 | 19 | + | 110 | 6.856E+09 | 3.026E+08 | 1.341E+10 | 0.240 | 0.103 | 19 | +---------+-----------+-----------+-----------+------------+------------+------------+ - | 120 | 7.013E+09 | 3.359E+08 | 1.403E+10 | 0.281 | 0.128 | 19 | + | 120 | 7.181E+09 | 3.359E+08 | 1.403E+10 | 0.281 | 0.128 | 19 | +---------+-----------+-----------+-----------+------------+------------+------------+ - | 130 | 7.192E+09 | 3.709E+08 | 1.438E+10 | 0.324 | 0.159 | 19 | + | 130 | 7.377E+09 | 3.709E+08 | 1.438E+10 | 0.324 | 0.159 | 19 | +---------+-----------+-----------+-----------+------------+------------+------------+ - | 140 | 7.230E+09 | 3.907E+08 | 1.446E+10 | 0.385 | 0.198 | 19 | + | 140 | 7.425E+09 | 3.907E+08 | 1.446E+10 | 0.385 | 0.198 | 19 | +---------+-----------+-----------+-----------+------------+------------+------------+ - | 150 | 7.425E+09 | 4.108E+08 | 1.485E+10 | 0.451 | 0.237 | 19 | + | 150 | 7.630E+09 | 4.108E+08 | 1.485E+10 | 0.451 | 0.237 | 19 | +---------+-----------+-----------+-----------+------------+------------+------------+ - | 160 | 7.525E+09 | 4.255E+08 | 1.505E+10 | 0.528 | 0.284 | 19 | + | 160 | 7.738E+09 | 4.255E+08 | 1.505E+10 | 0.528 | 0.284 | 19 | +---------+-----------+-----------+-----------+------------+------------+------------+ - | 170 | 7.593E+09 | 4.372E+08 | 1.519E+10 | 0.617 | 0.338 | 19 | + | 170 | 7.812E+09 | 4.372E+08 | 1.519E+10 | 0.617 | 0.338 | 19 | +---------+-----------+-----------+-----------+------------+------------+------------+ - | 180 | 7.656E+09 | 4.429E+08 | 1.531E+10 | 0.724 | 0.398 | 19 | + | 180 | 7.878E+09 | 4.429E+08 | 1.531E+10 | 0.724 | 0.398 | 19 | +---------+-----------+-----------+-----------+------------+------------+------------+ - | 190 | 7.669E+09 | 4.526E+08 | 1.534E+10 | 0.834 | 0.468 | 19 | + | 190 | 7.895E+09 | 4.526E+08 | 1.534E+10 | 0.834 | 0.468 | 19 | +---------+-----------+-----------+-----------+------------+------------+------------+ - | 200 | 7.728E+09 | 4.593E+08 | 1.546E+10 | 0.959 | 0.542 | 19 | + | 200 | 7.957E+09 | 4.593E+08 | 1.546E+10 | 0.959 | 0.542 | 19 | +---------+-----------+-----------+-----------+------------+------------+------------+ diff --git a/doc/sphinx/02_amg/gpu1.csv b/doc/sphinx/02_amg/gpu1.csv index 80bbc632..67011e19 100644 --- a/doc/sphinx/02_amg/gpu1.csv +++ b/doc/sphinx/02_amg/gpu1.csv @@ -1,17 +1,17 @@ n,FOM -50,2.652E+09 -60,3.586E+09 -70,4.670E+09 -80,4.482E+09 -90,5.878E+09 -100,6.439E+09 -110,6.704E+09 -120,7.013E+09 -130,7.192E+09 -140,7.230E+09 -150,7.425E+09 -160,7.525E+09 -170,7.593E+09 -180,7.656E+09 -190,7.669E+09 -200,7.728E+09 +50,2.701E+09 +60,3.654E+09 +70,4.745E+09 +80,4.582E+09 +90,5.987E+09 +100,6.574E+09 +110,6.856E+09 +120,7.181E+09 +130,7.377E+09 +140,7.425E+09 +150,7.630E+09 +160,7.738E+09 +170,7.812E+09 +180,7.878E+09 +190,7.895E+09 +200,7.957E+09 diff --git a/doc/sphinx/02_amg/roci_1_120.csv b/doc/sphinx/02_amg/roci_1_120.csv index cacc080b..493111f6 100644 --- a/doc/sphinx/02_amg/roci_1_120.csv +++ b/doc/sphinx/02_amg/roci_1_120.csv @@ -1,8 +1,8 @@ No. cores,Actual,Ideal -1,1.5252E+08,1.5252E+08 -2,3.0361E+08,3.0504E+08 -4,5.4734E+08,6.1008E+08 -8,1.0658E+09,1.2202E+09 -16,2.0484E+09,2.4403E+09 -32,2.8732E+09,4.8806E+09 -64,4.4071E+09,9.7613E+09 +1,1.6281E+08,1.6281E+08 +2,3.1584E+08,3.2562E+08 +4,5.6892E+08,6.5124E+08 +8,1.2243E+09,1.3025E+09 +16,2.1890E+09,2.6050E+09 +32,2.9544E+09,5.2099E+09 +64,4.5612E+09,1.0420E+10 diff --git a/doc/sphinx/02_amg/roci_1_160.csv b/doc/sphinx/02_amg/roci_1_160.csv index 1f94706e..5c5e443f 100644 --- a/doc/sphinx/02_amg/roci_1_160.csv +++ b/doc/sphinx/02_amg/roci_1_160.csv @@ -1,8 +1,8 @@ No. cores,Actual,Ideal -1,1.4895E+08,1.4895E+08 -2,2.9440E+08,2.9790E+08 -4,5.8065E+08,5.9580E+08 -8,1.0599E+09,1.1916E+09 -16,2.0127E+09,2.3832E+09 -32,2.7727E+09,4.7664E+09 -64,4.5317E+09,9.5328E+09 +1,1.6000E+08,1.6000E+08 +2,3.0493E+08,3.2000E+08 +4,5.6314E+08,6.4000E+08 +8,1.1901E+09,1.2800E+09 +16,2.1349E+09,2.5600E+09 +32,2.9680E+09,5.1200E+09 +64,4.7134E+09,1.0240E+10 diff --git a/doc/sphinx/02_amg/roci_1_200.csv b/doc/sphinx/02_amg/roci_1_200.csv index 6e0a9737..92a84ffc 100644 --- a/doc/sphinx/02_amg/roci_1_200.csv +++ b/doc/sphinx/02_amg/roci_1_200.csv @@ -1,8 +1,8 @@ No. cores,Actual,Ideal -1,1.4942E+08,1.4942E+08 -2,2.9177E+08,2.9884E+08 -4,5.2627E+08,5.9768E+08 -8,1.0357E+09,1.1954E+09 -16,1.9928E+09,2.3907E+09 -32,2.6975E+09,4.7814E+09 -64,4.3845E+09,9.5629E+09 +1,1.5948E+08,1.5948E+08 +2,2.9978E+08,3.1896E+08 +4,5.4708E+08,6.3792E+08 +8,1.0820E+09,1.2758E+09 +16,2.0509E+09,2.5517E+09 +32,2.8251E+09,5.1034E+09 +64,4.6217E+09,1.0207E+10 diff --git a/doc/sphinx/02_amg/roci_mem.csv b/doc/sphinx/02_amg/roci_mem.csv index 3f71d9f6..4683ba1a 100644 --- a/doc/sphinx/02_amg/roci_mem.csv +++ b/doc/sphinx/02_amg/roci_mem.csv @@ -1,5 +1,5 @@ GB,Problem 1,Problem 2 -10,1.5369E+08,1.0889E+08 -20,1.5131E+08,1.0946E+08 -30,1.5042E+08,1.0966E+08 -40,1.4981E+08,1.0937E+08 +10,1.6469E+08,1.1119E+08 +20,1.6157E+08,1.1076E+08 +30,1.6042E+08,1.1016E+08 +40,1.5985E+08,1.1010E+08