From e5b630adbf5b8f50cc6a583ad07af8d2db2d650b Mon Sep 17 00:00:00 2001 From: Martin Kronbichler Date: Tue, 2 Feb 2016 20:20:48 +0100 Subject: [PATCH] Fix bug in matrix multiplication --- doc/news/changes.h | 7 +++ include/deal.II/lac/full_matrix.templates.h | 2 +- tests/lac/full_matrix_09.cc | 64 +++++++++++++++++++++ tests/lac/full_matrix_09.output | 7 +++ tests/lac/full_matrix_10.cc | 55 ++++++++++++++++++ tests/lac/full_matrix_10.output | 4 ++ tests/lac/full_matrix_11.cc | 55 ++++++++++++++++++ tests/lac/full_matrix_11.output | 4 ++ 8 files changed, 197 insertions(+), 1 deletion(-) create mode 100644 tests/lac/full_matrix_09.cc create mode 100644 tests/lac/full_matrix_09.output create mode 100644 tests/lac/full_matrix_10.cc create mode 100644 tests/lac/full_matrix_10.output create mode 100644 tests/lac/full_matrix_11.cc create mode 100644 tests/lac/full_matrix_11.output diff --git a/doc/news/changes.h b/doc/news/changes.h index 2d9235768a..4ee4086d67 100644 --- a/doc/news/changes.h +++ b/doc/news/changes.h @@ -500,6 +500,13 @@ inconvenience this causes.
    +
  1. Fixed: FullMatrix::TmTmult for matrix multiplication used to compute + wrong results for larger matrix sizes where external BLAS is called. This + has been fixed. +
    + (Martin Kronbichler, 2016/02/02) +
    2. +
  2. Fixed: parallel::distributed::Triangulation with periodic boundary conditions did not respect 2:1 balance over vertices on periodic boundaries. This lead to incomplete ghost layers on multigrid levels. This diff --git a/include/deal.II/lac/full_matrix.templates.h b/include/deal.II/lac/full_matrix.templates.h index 1fbd74528d..bc6ea88fea 100644 --- a/include/deal.II/lac/full_matrix.templates.h +++ b/include/deal.II/lac/full_matrix.templates.h @@ -809,7 +809,7 @@ void FullMatrix::TmTmult (FullMatrix &dst, // transpose matrices, and read the result as if it were row-wise // again. In other words, we calculate (B A)^T, which is A^T B^T. - const int m = src.n(); + const int m = src.m(); const int n = this->n(); const int k = this->m(); const char *trans = "t"; diff --git a/tests/lac/full_matrix_09.cc b/tests/lac/full_matrix_09.cc new file mode 100644 index 0000000000..cf98582b6e --- /dev/null +++ b/tests/lac/full_matrix_09.cc @@ -0,0 +1,64 @@ +// --------------------------------------------------------------------- +// +// Copyright (C) 2016 - 2016 by the deal.II authors +// +// This file is part of the deal.II library. +// +// The deal.II library is free software; you can use it, redistribute +// it, and/or modify it under the terms of the GNU Lesser General +// Public License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// The full text of the license can be found in the file LICENSE at +// the top level of the deal.II distribution. +// +// --------------------------------------------------------------------- + + +//check method TmTmult of FullMatrix on larger size than full_matrix_03 where +//we interface to the external BLAS by comparison to mmult of the transpose +//matrix + +#include "../tests.h" + +#include + + +template +void test() +{ + FullMatrix A(2, 76), B(76, 3), C(2, 3), D(3, 2), E(2, 3); + for (unsigned int i=0; i(); + test(); + test(); +} diff --git a/tests/lac/full_matrix_09.output b/tests/lac/full_matrix_09.output new file mode 100644 index 0000000000..8d3ce8fd61 --- /dev/null +++ b/tests/lac/full_matrix_09.output @@ -0,0 +1,7 @@ + +DEAL::Difference 1: 0 +DEAL::Difference 2: 0 +DEAL::Difference 1: 0 +DEAL::Difference 2: 0 +DEAL::Difference 1: 0 +DEAL::Difference 2: 0 diff --git a/tests/lac/full_matrix_10.cc b/tests/lac/full_matrix_10.cc new file mode 100644 index 0000000000..314f6e7788 --- /dev/null +++ b/tests/lac/full_matrix_10.cc @@ -0,0 +1,55 @@ +// --------------------------------------------------------------------- +// +// Copyright (C) 2016 - 2016 by the deal.II authors +// +// This file is part of the deal.II library. +// +// The deal.II library is free software; you can use it, redistribute +// it, and/or modify it under the terms of the GNU Lesser General +// Public License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// The full text of the license can be found in the file LICENSE at +// the top level of the deal.II distribution. +// +// --------------------------------------------------------------------- + + +//check method mTmult of FullMatrix on larger size than full_matrix_02 where +//we interface to the external BLAS + +#include "../tests.h" + +#include + + +template +void test() +{ + FullMatrix A(2, 76), B(3, 76), C(2, 3), D(2, 3); + for (unsigned int i=0; i(); + test(); + test(); +} diff --git a/tests/lac/full_matrix_10.output b/tests/lac/full_matrix_10.output new file mode 100644 index 0000000000..75bb1cfa81 --- /dev/null +++ b/tests/lac/full_matrix_10.output @@ -0,0 +1,4 @@ + +DEAL::Difference: 0 +DEAL::Difference: 0 +DEAL::Difference: 0 diff --git a/tests/lac/full_matrix_11.cc b/tests/lac/full_matrix_11.cc new file mode 100644 index 0000000000..4635662fb0 --- /dev/null +++ b/tests/lac/full_matrix_11.cc @@ -0,0 +1,55 @@ +// --------------------------------------------------------------------- +// +// Copyright (C) 2016 - 2016 by the deal.II authors +// +// This file is part of the deal.II library. +// +// The deal.II library is free software; you can use it, redistribute +// it, and/or modify it under the terms of the GNU Lesser General +// Public License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// The full text of the license can be found in the file LICENSE at +// the top level of the deal.II distribution. +// +// --------------------------------------------------------------------- + + +//check method Tmmult of FullMatrix on larger size than full_matrix_02 where +//we interface to the external BLAS + +#include "../tests.h" + +#include + + +template +void test() +{ + FullMatrix A(76, 2), B(76, 3), C(2, 3), D(2, 3); + for (unsigned int i=0; i(); + test(); + test(); +} diff --git a/tests/lac/full_matrix_11.output b/tests/lac/full_matrix_11.output new file mode 100644 index 0000000000..75bb1cfa81 --- /dev/null +++ b/tests/lac/full_matrix_11.output @@ -0,0 +1,4 @@ + +DEAL::Difference: 0 +DEAL::Difference: 0 +DEAL::Difference: 0 -- 2.39.5