Changeset 9f675bb in tol

Timestamp:

Feb 1, 2013, 9:41:44 AM (14 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

f8c0837

Parents:

1f41e156

Message:

Refs #1636
BDat version of dtrsm must call to double version

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

File:

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

tol/bmath/blinalg/tol_blas.cpp

@@ -118 +118 @@
 //Multiplies two generic matrices
 // C = A*B
-//http://www.netlib.org/blas/dtrsm.f
+//http://www.netlib.org/blas/dgemm.f
 /////////////////////////////////////////////////////////////////////////////
 {
@@ -298 +298 @@
   int ldb = N;
   if(N&&M&&(
-    (Side==CblasLeft  && TransA==CblasNoTrans && A.Columns()==M) ||
-    (Side==CblasRight && TransA==CblasNoTrans && A.Rows   ()==N) ||
-    (Side==CblasLeft  && TransA==CblasTrans   && A.Rows   ()==M) ||
-    (Side==CblasRight && TransA==CblasTrans   && A.Columns()==N) ))
+     //(Side==CblasLeft  && TransA==CblasNoTrans && A.Columns()==M) ||
+     (Side==CblasLeft  && TransA==CblasNoTrans && A.Rows()==M) ||
+     //(Side==CblasRight && TransA==CblasNoTrans && A.Rows   ()==N) ||
+     (Side==CblasRight && TransA==CblasNoTrans && A.Columns   ()==N) ||
+     //(Side==CblasLeft  && TransA==CblasTrans   && A.Rows   ()==M) ||
+     (Side==CblasLeft  && TransA==CblasTrans   && A.Columns   ()==M) ||
+     //(Side==CblasRight && TransA==CblasTrans   && A.Columns()==N) ))
+     (Side==CblasRight && TransA==CblasTrans   && A.Rows()==N) ))
   {
     cblas_dtrsm(CblasRowMajor,Side,Uplo,TransA,Diag,M,N,alpha, 
@@ -343 +347 @@
 /////////////////////////////////////////////////////////////////////////////
 {
-  int M   = B.Rows   ();
-  int N   = B.Columns();
-  if(N&&M&&(
-     //(Side==CblasLeft  && TransA==CblasNoTrans && A.Columns()==M) ||
-     (Side==CblasLeft  && TransA==CblasNoTrans && A.Rows()==M) ||
-     //(Side==CblasRight && TransA==CblasNoTrans && A.Rows   ()==N) ||
-     (Side==CblasRight && TransA==CblasNoTrans && A.Columns   ()==N) ||
-     //(Side==CblasLeft  && TransA==CblasTrans   && A.Rows   ()==M) ||
-     (Side==CblasLeft  && TransA==CblasTrans   && A.Columns   ()==M) ||
-     //(Side==CblasRight && TransA==CblasTrans   && A.Columns()==N) ))
-     (Side==CblasRight && TransA==CblasTrans   && A.Rows()==N) ))
-  {
-    return(dtrsm(Side,Uplo,TransA,Diag,alpha.Value(),
-                 cb2dMat(A),cb2dMat(B),b2dMat(X)));
-  }
-  else
-  {
-    if(Side==CblasLeft)
-    {
-      Error(BText("[dtrmm] Cannot multiply matrices with dimensions ")+
-      "("+(TransA==CblasNoTrans?A.Rows():A.Columns())+"x"+(TransA==CblasNoTrans?A.Columns():A.Rows())+") * "
-      "("+B.Rows()+"x"+B.Columns()+")\n");
-    }
-    else
-    {
-      Error(BText("[dtrmm] Cannot multiply matrices with dimensions ")+
-      "("+B.Rows()+"x"+B.Columns()+") * "
-      "("+(TransA==CblasNoTrans?A.Rows():A.Columns())+"x"+(TransA==CblasNoTrans?A.Columns():A.Rows())+")\n");
-    }
-    return(-1);
-  }
-};
-
-};
-
-
+  return(dtrsm(Side,Uplo,TransA,Diag,alpha.Value(),
+               cb2dMat(A),cb2dMat(B),b2dMat(X)));
+};
+
+};
+
+