Renamed LAPACK routines to avoid name conflicts.

Author: m.petschow

EXAMPLES/C/Makefile

@@ -12,9 +12,8 @@ LDFLAGS  = -D_THREAD_SAFE=1 -pthread
 MPIFLAGS =
 
 INCPATH = ../../INCLUDE
-LIBPATH = ../../LIB 
-LIBS = pmrrr gfortran m pthread rt
-
+LIBPATH = ../../LIB $(HOME)/libs/lapack-3.2.2
+LIBS = pmrrr lapack_gnu_LINUX blas_gnu_LINUX gfortran m pthread rt
 
 ######################## do not edit below ###########################
 

EXAMPLES/Fortran/Makefile

@@ -12,10 +12,8 @@ LDFLAGS  = -D_THREAD_SAFE=1 -pthread
 MPIFLAGS = 
 
 INCPATH = ../../INCLUDE
-LIBPATH = ../../LIB
-
-# Libraries to link
-LIBS = pmrrr gfortran pthread rt m
+LIBPATH = ../../LIB $(HOME)/libs/lapack-3.2.2
+LIBS = pmrrr lapack_gnu_LINUX blas_gnu_LINUX m gfortran pthread rt
 
 
 ######################## do not edit below ###########################
@@ -30,21 +28,21 @@ all: main_all.x main_ind.x main_val.x
 
 # All eigenpairs
 main_all.x: maina.o
-	$(LD) $(LDFLAGS) $< -L$(LIBPATH) \
+	$(LD) $(LDFLAGS) $< $(foreach LIBP,$(LIBPATH),-L$(LIBP)) \
         $(foreach LIBRARY,$(LIBS),-l$(LIBRARY)) -o $@
 
 maina.o: maina.f
 
 # Subset of eigenpairs by index
 main_ind.x: maini.o
-	$(LD) $(LDFLAGS) $< -L$(LIBPATH) \
+	$(LD) $(LDFLAGS) $< $(foreach LIBP,$(LIBPATH),-L$(LIBP)) \
         $(foreach LIBRARY,$(LIBS),-l$(LIBRARY)) -o $@
 
 maini.o: maini.f
 
 # Subset of eigenpairs by value
 main_val.x: mainv.o
-	$(LD) $(LDFLAGS) $< -L$(LIBPATH) \
+	$(LD) $(LDFLAGS) $< $(foreach LIBP,$(LIBPATH),-L$(LIBP)) \
         $(foreach LIBRARY,$(LIBS),-l$(LIBRARY)) -o $@
 
 mainv.o: mainv.f

INCLUDE/pmrrr.h

@@ -217,9 +217,29 @@ int PMR_comm_eigvals(MPI_Comm comm, int *nz, int *ifirst, double *W);
  */
 
 
-/* LAPACK function prototypes
+/* LAPACK and BLAS function prototypes
  * Note: type specifier 'extern' does not matter in declaration
  * so here used to mark routines from LAPACK and BLAS libraries */
+extern void pmrrr_dscal(int*, double*, double*, int*);
+
+#ifdef NOLAPACK
+#define dlamch_ odmch_
+#define dlanst_ odnst_
+#define dlarrr_ odrrr_
+#define dlarra_ odrra_
+#define dlarrc_ odrrc_
+#define dlarrd_ odrrd_
+#define dlarrb_ odrrb_
+#define dlarrk_ odrrk_
+#define dlaebz_ odebz_
+#define dlarnv_ odrnv_
+#define dlarrf_ odrrf_
+#define dlar1v_ odr1v_
+#define dlarrj_ odrrj_
+#define dstemr_ odstmr_
+#define dscal_  pmrrr_dscal
+#endif
+
 extern double dlamch_(char*);
 extern double dlanst_(char*, int*, double*, double*);
 extern void   dlarrr_(int*, double*, double*, int*);
@@ -257,11 +277,7 @@ extern void   dstemr_(char*, char*, int*, double*, double*, double*,
 		      double*, int*, int*, int*, double*, double*, 
 		      int*, int*, int*, int*, double*, int*, int*, 
 		      int*, int*);
-
-
-/* BLAS function prototypes - renamed version for prevending
- * use of multithreaded version */
-extern void   odscal_(int*, double*, double*, int*);
+/* BLAS function prototypes */
 extern void   dscal_(int*, double*, double*, int*);
 
 #endif /* End of header file */

INSTALL/make.inc.gnu

@@ -1,4 +1,5 @@
-f# Compiler for C and Fortran
+# Compiler for C and Fortran
+# The Fortran compiler is only used if INCLAPACK is set to 1
 CC = mpicc
 FC = mpif90
 
@@ -11,7 +12,8 @@ AR = /usr/bin/ar
 ARFLAGS = rcs
 
 # To build 'libmrrr.a' without adding necessary LAPACK routines 
-# for the to the archive set value to 0; default value is 1
+# for the to the archive set value to 0; in this case linking 
+# to LAPACK and BLAS is necessary; default value is 1
 INCLAPACK = 1
 
 # On some systems 'spinlocks' are not supported, therefore 

INSTALL/make.inc.ibm

@@ -1,4 +1,5 @@
 # Compiler for C and Fortran
+# The Fortran compiler is only used if INCLAPACK is set to 1
 CC = mpixlc_r
 FC = mpixlf77_r
 
@@ -11,7 +12,8 @@ AR = /usr/bin/ar
 ARFLAGS = rcs
 
 # To build 'libmrrr.a' without adding necessary LAPACK routines 
-# for the to the archive set value to 0; default value is 1
+# for the to the archive set value to 0; in this case linking 
+# to LAPACK and BLAS is necessary; default value is 1
 INCLAPACK = 1
 
 # On some systems 'spinlocks' are not supported, therefore 

INSTALL/make.inc.ibm.jugene

@@ -1,4 +1,5 @@
 # Compiler for C and Fortran
+# The Fortran compiler is only used if INCLAPACK is set to 1
 CC = mpixlc_r
 FC = mpixlf77_r
 
@@ -11,7 +12,8 @@ AR = /usr/bin/ar
 ARFLAGS = rcs
 
 # To build 'libmrrr.a' without adding necessary LAPACK routines 
-# for the to the archive set value to 0; default value is 1
+# for the to the archive set value to 0; in this case linking 
+# to LAPACK and BLAS is necessary; default value is 1
 INCLAPACK = 1
 
 # On some systems 'spinlocks' are not supported, therefore 

INSTALL/make.inc.intel

@@ -1,4 +1,5 @@
 # Compiler for C and Fortran
+# The Fortran compiler is only used if INCLAPACK is set to 1
 CC = mpiicc
 FC = mpiifort
 
@@ -11,7 +12,8 @@ AR = /usr/bin/ar
 ARFLAGS = rcs
 
 # To build 'libmrrr.a' without adding necessary LAPACK routines 
-# for the to the archive set value to 0; default value is 1
+# for the to the archive set value to 0; in this case linking 
+# to LAPACK and BLAS is necessary; default value is 1
 INCLAPACK = 1
 
 # On some systems 'spinlocks' are not supported, therefore 

Makefile

@@ -14,8 +14,9 @@ HEADERS := $(foreach DIR,$(DIRS),$(wildcard $(DIR)/*.h))
 CSRCS   := $(foreach DIR,$(DIRS),$(wildcard $(DIR)/*.c))
 COBJS = $(CSRCS:.c=.o)
 
-ifeq ($(INCLAPACK),1)
- FSRCS   := $(foreach DIR,$(DIRS),$(wildcard $(DIR)/*.f))
+ifeq ($(INCLAPACK),1) 
+ CFLAGS += -DNOLAPACK
+ FSRCS  := $(foreach DIR,$(DIRS),$(wildcard $(DIR)/*.f))
  FOBJS = $(FSRCS:.f=.o)
 endif
 

SRC/BLAS/dcopy.f SRC/BLAS/odcpy.f

@@ -1,4 +1,4 @@
-      SUBROUTINE DCOPY(N,DX,INCX,DY,INCY)
+      SUBROUTINE ODCPY(N,DX,INCX,DY,INCY)
 *     .. Scalar Arguments ..
       INTEGER INCX,INCY,N
 *     ..
@@ -9,7 +9,7 @@ SUBROUTINE DCOPY(N,DX,INCX,DY,INCY)
 *  Purpose
 *  =======
 *
-*     DCOPY copies a vector, x, to a vector, y.
+*     ODCPY copies a vector, x, to a vector, y.
 *     uses unrolled loops for increments equal to one.
 *
 *  Further Details

SRC/BLAS/dscal.f SRC/BLAS/odscl.f

@@ -1,4 +1,4 @@
-      SUBROUTINE DSCAL(N,DA,DX,INCX)
+      SUBROUTINE ODSCL(N,DA,DX,INCX)
 *     .. Scalar Arguments ..
       DOUBLE PRECISION DA
       INTEGER INCX,N
@@ -10,7 +10,7 @@ SUBROUTINE DSCAL(N,DA,DX,INCX)
 *  Purpose
 *  =======
 *
-*     DSCAL scales a vector by a constant.
+*     ODSCL scales a vector by a constant.
 *     uses unrolled loops for increment equal to one.
 *
 *  Further Details

SRC/LAPACK/LICENSE

@@ -0,0 +1,36 @@
+Copyright (c) 1992-2009 The University of Tennessee.  All rights reserved.
+
+$COPYRIGHT$
+
+Additional copyrights may follow
+
+$HEADER$
+
+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 listed
+  in this license in the documentation and/or other materials
+  provided with the distribution.
+  
+- Neither the name of the copyright holders 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. 
+

SRC/LAPACK/SEQUENTIAL/dlae2.f SRC/LAPACK/SEQUENTIAL/ode2.f

@@ -1,4 +1,4 @@
-      SUBROUTINE DLAE2( A, B, C, RT1, RT2 )
+      SUBROUTINE ODE2( A, B, C, RT1, RT2 )
 *
 *  -- LAPACK auxiliary routine (version 3.2) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -12,7 +12,7 @@ SUBROUTINE DLAE2( A, B, C, RT1, RT2 )
 *  Purpose
 *  =======
 *
-*  DLAE2  computes the eigenvalues of a 2-by-2 symmetric matrix
+*  ODE2  computes the eigenvalues of a 2-by-2 symmetric matrix
 *     [  A   B  ]
 *     [  B   C  ].
 *  On return, RT1 is the eigenvalue of larger absolute value, and RT2
@@ -119,6 +119,6 @@ SUBROUTINE DLAE2( A, B, C, RT1, RT2 )
       END IF
       RETURN
 *
-*     End of DLAE2
+*     End of ODE2
 *
       END

SRC/LAPACK/SEQUENTIAL/dlaev2.f SRC/LAPACK/SEQUENTIAL/odev2.f

@@ -1,4 +1,4 @@
-      SUBROUTINE DLAEV2( A, B, C, RT1, RT2, CS1, SN1 )
+      SUBROUTINE ODEV2( A, B, C, RT1, RT2, CS1, SN1 )
 *
 *  -- LAPACK auxiliary routine (version 3.2) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -12,7 +12,7 @@ SUBROUTINE DLAEV2( A, B, C, RT1, RT2, CS1, SN1 )
 *  Purpose
 *  =======
 *
-*  DLAEV2 computes the eigendecomposition of a 2-by-2 symmetric matrix
+*  ODEV2 computes the eigendecomposition of a 2-by-2 symmetric matrix
 *     [  A   B  ]
 *     [  B   C  ].
 *  On return, RT1 is the eigenvalue of larger absolute value, RT2 is the
@@ -165,6 +165,6 @@ SUBROUTINE DLAEV2( A, B, C, RT1, RT2, CS1, SN1 )
       END IF
       RETURN
 *
-*     End of DLAEV2
+*     End of ODEV2
 *
       END

SRC/LAPACK/dlanst.f SRC/LAPACK/SEQUENTIAL/odnst.f

@@ -1,4 +1,4 @@
-      DOUBLE PRECISION FUNCTION DLANST( NORM, N, D, E )
+      DOUBLE PRECISION FUNCTION ODNST( NORM, N, D, E )
 *
 *  -- LAPACK auxiliary routine (version 3.2) --
 *  -- LAPACK is a software package provided by Univ. of Tennessee,    --
@@ -16,16 +16,16 @@ DOUBLE PRECISION FUNCTION DLANST( NORM, N, D, E )
 *  Purpose
 *  =======
 *
-*  DLANST  returns the value of the one norm,  or the Frobenius norm, or
+*  ODNST  returns the value of the one norm,  or the Frobenius norm, or
 *  the  infinity norm,  or the  element of  largest absolute value  of a
 *  real symmetric tridiagonal matrix A.
 *
 *  Description
 *  ===========
 *
-*  DLANST returns the value
+*  ODNST returns the value
 *
-*     DLANST = ( max(abs(A(i,j))), NORM = 'M' or 'm'
+*     ODNST = ( max(abs(A(i,j))), NORM = 'M' or 'm'
 *              (
 *              ( norm1(A),         NORM = '1', 'O' or 'o'
 *              (
@@ -42,11 +42,11 @@ DOUBLE PRECISION FUNCTION DLANST( NORM, N, D, E )
 *  =========
 *
 *  NORM    (input) CHARACTER*1
-*          Specifies the value to be returned in DLANST as described
+*          Specifies the value to be returned in ODNST as described
 *          above.
 *
 *  N       (input) INTEGER
-*          The order of the matrix A.  N >= 0.  When N = 0, DLANST is
+*          The order of the matrix A.  N >= 0.  When N = 0, ODNST is
 *          set to zero.
 *
 *  D       (input) DOUBLE PRECISION array, dimension (N)
@@ -66,11 +66,11 @@ DOUBLE PRECISION FUNCTION DLANST( NORM, N, D, E )
       DOUBLE PRECISION   ANORM, SCALE, SUM
 *     ..
 *     .. External Functions ..
-      LOGICAL            LSAME
-      EXTERNAL           LSAME
+      LOGICAL            OLSAME
+      EXTERNAL           OLSAME
 *     ..
 *     .. External Subroutines ..
-      EXTERNAL           DLASSQ
+      EXTERNAL           ODSSQ
 *     ..
 *     .. Intrinsic Functions ..
       INTRINSIC          ABS, MAX, SQRT
@@ -79,7 +79,7 @@ DOUBLE PRECISION FUNCTION DLANST( NORM, N, D, E )
 *
       IF( N.LE.0 ) THEN
          ANORM = ZERO
-      ELSE IF( LSAME( NORM, 'M' ) ) THEN
+      ELSE IF( OLSAME( NORM, 'M' ) ) THEN
 *
 *        Find max(abs(A(i,j))).
 *
@@ -88,8 +88,8 @@ DOUBLE PRECISION FUNCTION DLANST( NORM, N, D, E )
             ANORM = MAX( ANORM, ABS( D( I ) ) )
             ANORM = MAX( ANORM, ABS( E( I ) ) )
    10    CONTINUE
-      ELSE IF( LSAME( NORM, 'O' ) .OR. NORM.EQ.'1' .OR.
-     $         LSAME( NORM, 'I' ) ) THEN
+      ELSE IF( OLSAME( NORM, 'O' ) .OR. NORM.EQ.'1' .OR.
+     $         OLSAME( NORM, 'I' ) ) THEN
 *
 *        Find norm1(A).
 *
@@ -103,23 +103,23 @@ DOUBLE PRECISION FUNCTION DLANST( NORM, N, D, E )
      $                 ABS( E( I-1 ) ) )
    20       CONTINUE
          END IF
-      ELSE IF( ( LSAME( NORM, 'F' ) ) .OR. ( LSAME( NORM, 'E' ) ) ) THEN
+      ELSE IF((OLSAME(NORM,'F')) .OR. (OLSAME(NORM,'E'))) THEN
 *
 *        Find normF(A).
 *
          SCALE = ZERO
          SUM = ONE
          IF( N.GT.1 ) THEN
-            CALL DLASSQ( N-1, E, 1, SCALE, SUM )
+            CALL ODSSQ( N-1, E, 1, SCALE, SUM )
             SUM = 2*SUM
          END IF
-         CALL DLASSQ( N, D, 1, SCALE, SUM )
+         CALL ODSSQ( N, D, 1, SCALE, SUM )
          ANORM = SCALE*SQRT( SUM )
       END IF
 *
-      DLANST = ANORM
+      ODNST = ANORM
       RETURN
 *
-*     End of DLANST
+*     End of ODNST
 *
       END