A Main.dox page has been added, to be filled later, and the C Headers for...

A Main.dox page has been added, to be filled later, and the C Headers for lapack and blas ave been added to the ditribution in order for the user to build ib-bgmres-dr with blas and lapack only

doc/Doxyfile.in

@@ -771,7 +771,7 @@ WARN_LOGFILE           =
 # spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
 # Note: If this tag is empty the current directory is searched.
 
-INPUT                  = @CMAKE_CURRENT_SOURCE_DIR@/../src/ @CMAKE_CURRENT_SOURCE_DIR@/../Api/src
+INPUT                  = @CMAKE_CURRENT_SOURCE_DIR@/../src/ @CMAKE_CURRENT_SOURCE_DIR@/../Api/src @CMAKE_CURRENT_SOURCE_DIR@/src_dox
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses

doc/src_dox/Main.dox

+/**
+\mainpage Ib-BGMRes-Dr : Inexact Breakdown - Block GMRes - Deflated Restarting.
+
+This library is an implementation of the Multi Right Hand Side GMRes,
+with <b>Inexact Breakdown</b> and <b>Deflated Restarting</b>.
+
+*/
\ No newline at end of file

ext_inc/cblas_mangling.h

+#ifndef F77_HEADER_INCLUDED
+#define F77_HEADER_INCLUDED
+
+#ifndef F77_GLOBAL
+#if defined(F77_GLOBAL_PATTERN_LC) || defined(ADD_)
+#define F77_GLOBAL(lcname,UCNAME)  lcname##_
+#elif defined(F77_GLOBAL_PATTERN_UC) || defined(UPPER)
+#define F77_GLOBAL(lcname,UCNAME)  UCNAME
+#elif defined(F77_GLOBAL_PATTERN_MC) || defined(NOCHANGE)
+#define F77_GLOBAL(lcname,UCNAME)  lcname
+#else
+#define F77_GLOBAL(lcname,UCNAME)  lcname##_
+#endif
+#endif
+
+#endif
+

ext_inc/lapacke_config.h

+/*****************************************************************************
+  Copyright (c) 2010, Intel Corp.
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of Intel Corporation nor the names of its contributors
+      may be used to endorse or promote products derived from this software
+      without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+  ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+  LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+  THE POSSIBILITY OF SUCH DAMAGE.
+******************************************************************************
+* Contents: Native C interface to LAPACK
+* Author: Intel Corporation
+* Generated May, 2011
+*****************************************************************************/
+
+#ifndef _LAPACKE_CONFIG_H_
+#define _LAPACKE_CONFIG_H_
+
+#ifdef __cplusplus
+#if defined(LAPACK_COMPLEX_CPP)
+#include <complex>
+#endif
+extern "C" {
+#endif /* __cplusplus */
+
+#include <stdlib.h>
+
+#ifndef lapack_int
+#if defined(LAPACK_ILP64)
+#define lapack_int              long
+#else
+#define lapack_int              int
+#endif
+#endif
+
+#ifndef lapack_logical
+#define lapack_logical          lapack_int
+#endif
+
+#ifndef LAPACK_COMPLEX_CUSTOM
+
+#if defined(LAPACK_COMPLEX_STRUCTURE)
+
+typedef struct { float real, imag; } _lapack_complex_float;
+typedef struct { double real, imag; } _lapack_complex_double;
+#define lapack_complex_float  _lapack_complex_float
+#define lapack_complex_double _lapack_complex_double
+#define lapack_complex_float_real(z)  ((z).real)
+#define lapack_complex_float_imag(z)  ((z).imag)
+#define lapack_complex_double_real(z)  ((z).real)
+#define lapack_complex_double_imag(z)  ((z).imag)
+
+#elif defined(LAPACK_COMPLEX_C99)
+
+#include <complex.h>
+#define lapack_complex_float    float _Complex
+#define lapack_complex_double   double _Complex
+#define lapack_complex_float_real(z)       (creal(z))
+#define lapack_complex_float_imag(z)       (cimag(z))
+#define lapack_complex_double_real(z)       (creal(z))
+#define lapack_complex_double_imag(z)       (cimag(z))
+
+#elif defined(LAPACK_COMPLEX_CPP)
+
+#define lapack_complex_float std::complex<float>
+#define lapack_complex_double std::complex<double>
+#define lapack_complex_float_real(z)       ((z).real())
+#define lapack_complex_float_imag(z)       ((z).imag())
+#define lapack_complex_double_real(z)       ((z).real())
+#define lapack_complex_double_imag(z)       ((z).imag())
+
+#else
+
+#include <complex.h>
+#define lapack_complex_float    float _Complex
+#define lapack_complex_double   double _Complex
+#define lapack_complex_float_real(z)       (creal(z))
+#define lapack_complex_float_imag(z)       (cimag(z))
+#define lapack_complex_double_real(z)       (creal(z))
+#define lapack_complex_double_imag(z)       (cimag(z))
+
+#endif
+
+lapack_complex_float lapack_make_complex_float( float re, float im );
+lapack_complex_double lapack_make_complex_double( double re, double im );
+
+#endif
+
+#ifndef LAPACK_malloc
+#define LAPACK_malloc( size )   malloc( size )
+#endif
+
+#ifndef LAPACK_free
+#define LAPACK_free( p )        free( p )
+#endif
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* _LAPACKE_CONFIG_H_ */

ext_inc/lapacke_mangling.h

+#ifndef LAPACK_HEADER_INCLUDED
+#define LAPACK_HEADER_INCLUDED
+
+#ifndef LAPACK_GLOBAL
+#if defined(LAPACK_GLOBAL_PATTERN_LC) || defined(ADD_)
+#define LAPACK_GLOBAL(lcname,UCNAME)  lcname##_
+#elif defined(LAPACK_GLOBAL_PATTERN_UC) || defined(UPPER)
+#define LAPACK_GLOBAL(lcname,UCNAME)  UCNAME
+#elif defined(LAPACK_GLOBAL_PATTERN_MC) || defined(NOCHANGE)
+#define LAPACK_GLOBAL(lcname,UCNAME)  lcname
+#else
+#define LAPACK_GLOBAL(lcname,UCNAME)  lcname##_
+#endif
+#endif
+
+#endif
+

src/LapackInterface.hpp

@@ -2,11 +2,12 @@
 #define LAPACKINTERFACE_HPP
 
 #include <iostream>
-#include <lapacke.h>
-#include <cblas.h>
 #include <string.h>
 #include <complex>
 
+#include "../ext_inc/cblas.h"
+#include "../ext_inc/lapacke.h"
+
 
 //Tool : in order to choose from 'T' or 'C' in case we are on
 //Complex or not, we used a static struct
@@ -377,10 +378,32 @@ int callLapack_gesvd(char,char,       //Jobu and jobvt
                      Scalar *, int,   //output U and leading dim associated
                      Scalar *,int,    //output V^{H} and leading dim associated
                      Primary *){      //array fill in case of no convergence
-    std::cout<<"Only complx float and complx double supported\n";
+    std::cout<<"Only complx float, complx double, float and double supported (gesvd)\n";
     exit(0);
     return 0;
 }
+template<> //specialization on double
+int callLapack_gesvd(char jobu,char jobvt,
+                     int m ,int n,
+                     double * A, int ldA,
+                     double* sigma,
+                     double * U, int ldU,
+                     double * V, int ldV,
+                     double * sup){
+    return LAPACKE_dgesvd(LAPACK_COL_MAJOR,jobu,jobvt,m,n,A,ldA,sigma,
+                          U,ldU,V,ldV,sup);
+}
+template<> //specialization on float
+int callLapack_gesvd(char jobu,char jobvt,
+                     int m ,int n,
+                     float * A, int ldA,
+                     float * sigma,
+                     float * U, int ldU,
+                     float * V, int ldV,
+                     float * sup){
+    return LAPACKE_sgesvd(LAPACK_COL_MAJOR,jobu,jobvt,m,n,A,ldA,sigma,
+                          U,ldU,V,ldV,sup);
+}
 template<> //specialization on std::complex<double>
 int callLapack_gesvd(char jobu,char jobvt,
                      int m ,int n,