Changeset a5b9608 in tol

Timestamp:

Jul 29, 2015, 8:03:06 PM (11 years ago)

Author:

Jorge Pérez <josp.jorge@…>

Branches:

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

Children:

b44a3b0

Parents:

4e57976

Message:

refs #1865, conversión de tipo erronea, ahora compila en linux tanto con clapack como lapacke

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

Location:

tol

Files:

• bmath/blinalg/tol_lapack.cpp (modified) (2 diffs)
• bmath/blinalg/tol_lapack.h (modified) (2 diffs)
• btol/vmatrix_type/vmat_chol.cpp (modified) (1 diff)

tol/bmath/blinalg/tol_lapack.cpp

@@ -68 +68 @@
   int n = S.Columns();
   double* X_ = X.GetData().GetBuffer();
-  int res = clapack_dpotrf(int(CblasRowMajor), LAPACK_UPLO(Uplo), n, X_, n);
+  int res = clapack_dpotrf( CblasRowMajor, LAPACK_UPLO(Uplo), n, X_, n );
   replicateTriang(X,Uplo,false);
   return(res);
@@ -103 +103 @@
   int n = A.Columns();
   double* X_ = X.GetData().GetBuffer();
-  int res = clapack_dpotri( int(CblasRowMajor), LAPACK_UPLO(Uplo), n, X_, n);
+  int res = clapack_dpotri( CblasRowMajor, LAPACK_UPLO(Uplo), n, X_, n );
   replicateTriang(X,Uplo,true);
   return(res);

tol/bmath/blinalg/tol_lapack.h

@@ -32 +32 @@
 #undef I
 #define LAPACK_UPLO(UpLo) (UpLo==CblasLower?'L':'U')
+#define LAPACK_ORDER(Order) (int)(order)
 #define clapack_dpotrf LAPACKE_dpotrf
 #define clapack_dpotri LAPACKE_dpotri
@@ -38 +39 @@
 #include <clapack.h>
 #define LAPACK_UPLO(UpLo) UpLo
+#define LAPACK_ORDER(Order) Order
 END_DECLS
 #endif

tol/btol/vmatrix_type/vmat_chol.cpp

@@ -39 +39 @@
   double* x = (double*)L.s_.blasRdense_->x;
   memcpy(x, y, n*n*sizeof(double));
-  res = clapack_dpotrf(CblasColMajor, LAPACK_UPLO(CblasLower), n, x, n);
+  res = clapack_dpotrf( CblasColMajor, LAPACK_UPLO(CblasLower), n, x, n );
   for(i=0; i<n; i++) for(j=i+1; j<n; j++) x[j*n+i] = 0;
   isOk = (res==0);