Changeset 4abdff3 in tol

Timestamp:

Nov 20, 2008, 5:15:12 PM (18 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

1941-docker-image-to-test, devel, master

Children:

00c2c9f

Parents:

f9ee626

Message:

Reallocation and zero assigantion of returning argument of cblas_dgemm and cblas_dsyrk must be done just when beta==0 and dimensions in order to not hide posible previous errors

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@205 be4846ae-f051-483a-831f-b64e7d08527f

File:

• tol/bmath/blinalg/tol_blas.cpp (modified) (4 diffs)

tol/bmath/blinalg/tol_blas.cpp

@@ -71 +71 @@
   int Ar = A.Rows();
   int Br = B.Rows();
+  int Cr = C.Rows();
   int Ac = A.Columns();
   int Bc = B.Columns();
+  int Cc = C.Columns();
   if (TransA==CblasNoTrans) {
     M = Ar;
@@ -81 +83 @@
   }
   N = TransB==CblasNoTrans ? Bc : Br;
-  C.Alloc(M,N);
-  C.SetAllValuesTo(0);
+  if((beta==0.0)&&(!Cr|!Cc))
+  {
+    C.Alloc(M,N);
+    C.SetAllValuesTo(0);
+  }
   const double* A_ = A.Data().Buffer();
   const double* B_ = B.Data().Buffer();
@@ -132 +137 @@
 {
   int N,K;
+  int Ar = A.Rows();
+  int Cr = C.Rows();
+  int Ac = A.Columns();
+  int Cc = C.Columns();
   if (Trans==CblasNoTrans) {
-    N = A.Rows();
-    K = A.Columns();
+    N = Ar;
+    K = Ac;
   } else {
-    N = A.Columns();
-    K = A.Rows();
-  }
-  C.Alloc(N,N);
-  C.SetAllValuesTo(0);
+    N = Ac;
+    K = Ar;
+  }
+  if((beta==0.0)&&(!Cr|!Cc))
+  {
+    C.Alloc(N,N);
+    C.SetAllValuesTo(0);
+  }
   cblas_dsyrk
   (
@@ -146 +158 @@
     N, K,
     alpha,
-    A.Data().Buffer(), A.Columns(),
+    A.Data().Buffer(), Ac,
     beta,
-    C.GetData().GetBuffer(), C.Columns()
+    C.GetData().GetBuffer(), Cc
   );
 //VBR: Comprobar si hay error