Commit: 982324fe8f9e02772257b193a00fc2ba9d157aa4 - MolDS (git)

Commit MetaInfo

• Revisión: 982324fe8f9e02772257b193a00fc2ba9d157aa4 (tree)
• Tiempo: 2013-10-14 17:55:47
• Autor: Mikiya Fujii <mikiya.fujii@gmai...>
• Commiter: Mikiya Fujii

Log Message

trunk.r1542 is merged to branches/fx10. #32094 #32235

git-svn-id: https://svn.sourceforge.jp/svnroot/molds/branches/fx10@1543 1136aad2-a195-0410-b898-f5ea1d11b9d8

Cambiar Resumen

• modified: src/wrappers/Lapack.cpp

Diferencia incremental

--- a/src/wrappers/Lapack.cpp
+++ b/src/wrappers/Lapack.cpp
@@ -112,13 +112,7 @@ molds_lapack_int Lapack::Dsyevd(double** matrix, double* eigenValues, molds_lapa
    }
 
    // call Lapack
-#ifdef __INTEL_COMPILER
-   info = LAPACKE_dsyevd(LAPACK_ROW_MAJOR, job, uplo, size, &matrix[0][0], lda, eigenValues);
-#elif defined __FCC_VERSION
    info = LAPACKE_dsyevd(LAPACK_ROW_MAJOR, job, uplo, size, &matrix[0][0], lda, eigenValues);
-#else
-   info = LAPACKE_dsyevd(LAPACK_ROW_MAJOR, job, uplo, size, &matrix[0][0], lda, eigenValues);
-#endif
 
    // make i-th row i-the eigenvector
    double** tmpMatrix=NULL;
@@ -189,13 +183,8 @@ molds_lapack_int Lapack::Dsysv(double** matrix, double* b, molds_lapack_int size
    // malloc
    ipiv = (molds_lapack_int*)MOLDS_LAPACK_malloc( sizeof(molds_lapack_int)*2*size, 16 );
 
-#ifdef __INTEL_COMPILER
-   info = LAPACKE_dsysv(LAPACK_ROW_MAJOR, uplo, size, nrhs, &matrix[0][0], lda, ipiv, b, ldb);
-#elif defined __FCC_VERSION
-   info = LAPACKE_dsysv(LAPACK_ROW_MAJOR, uplo, size, nrhs, &matrix[0][0], lda, ipiv, b, ldb);
-#else
+   // call Lapack
    info = LAPACKE_dsysv(LAPACK_ROW_MAJOR, uplo, size, nrhs, &matrix[0][0], lda, ipiv, b, ldb);
-#endif
 
    // free
    MOLDS_LAPACK_free(ipiv);
@@ -244,13 +233,8 @@ molds_lapack_int Lapack::Dgetrs(double** matrix, double** b, molds_lapack_int si
          }
       }
       this->Dgetrf(&matrix[0][0], ipiv, size, size);
-#ifdef __INTEL_COMPILER
-      info = LAPACKE_dgetrs(LAPACK_ROW_MAJOR, trans, size, nrhs, &matrix[0][0], lda, ipiv, tmpB, ldb);
-#elif defined __FCC_VERSION
+      // call Lapack
       info = LAPACKE_dgetrs(LAPACK_ROW_MAJOR, trans, size, nrhs, &matrix[0][0], lda, ipiv, tmpB, ldb);
-#else
-      info = LAPACKE_dgetrs(LAPACK_ROW_MAJOR, trans, size, nrhs, &matrix[0][0], lda, ipiv, tmpB, ldb);
-#endif
       for(molds_lapack_int i = 0; i < nrhs; i++){
          for(molds_lapack_int j = 0; j < size; j++){
             b[i][j] = tmpB[j*nrhs+i];
@@ -299,13 +283,8 @@ molds_lapack_int Lapack::Dgetrf(double** matrix, molds_lapack_int* ipiv, molds_l
 molds_lapack_int Lapack::Dgetrf(double* matrix, molds_lapack_int* ipiv, molds_lapack_int sizeM, molds_lapack_int sizeN) const{
    molds_lapack_int info = 0;
    molds_lapack_int lda = sizeM;
-#ifdef __INTEL_COMPILER
-   info = LAPACKE_dgetrf(LAPACK_ROW_MAJOR, sizeM, sizeN, matrix, lda, ipiv);
-#elif defined __FCC_VERSION
-   info = LAPACKE_dgetrf(LAPACK_ROW_MAJOR, sizeM, sizeN, matrix, lda, ipiv);
-#else
+   // call Lapack
    info = LAPACKE_dgetrf(LAPACK_ROW_MAJOR, sizeM, sizeN, matrix, lda, ipiv);
-#endif
    if(info != 0){
       stringstream ss;
       ss << errorMessageDgetrfInfo;