1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98
|
Index: scalapack-1.8.0/SLmake.inc
===================================================================
--- scalapack-1.8.0.orig/SLmake.inc
+++ scalapack-1.8.0/SLmake.inc
@@ -33,15 +33,30 @@
#
# MPI setup; tailor to your system if using MPIBLACS
#
+ifeq ($(MPI),openmpi)
+USEMPI = -DUsingMpiBlacs
+ifeq ($(BUILD),static)
+SMPLIB = -L/usr/lib/openmpi/lib/ -lmpi -lmpi_f77
+BLACSFINIT = /usr/lib/libblacsF77init-openmpi.a
+BLACSCINIT = /usr/lib/libblacsCinit-openmpi.a
+BLACSLIB = /usr/lib/libblacs-openmpi.a
+else
+SMPLIB = -L/usr/lib/openmpi/lib/ -lmpi -lmpi_f77
+BLACSFINIT = -lblacsF77init-openmpi
+BLACSCINIT = -lblacsCinit-openmpi
+BLACSLIB = -lblacs-openmpi
+endif
+TESTINGdir = $(home)/TESTING
+endif
ifeq ($(MPI),lam)
USEMPI = -DUsingMpiBlacs
ifeq ($(BUILD),static)
-SMPLIB = -lmpi
+SMPLIB = -L/usr/lib/lam/lib -lmpi
BLACSFINIT = /usr/lib/libblacsF77init-lam.a
BLACSCINIT = /usr/lib/libblacsCinit-lam.a
BLACSLIB = /usr/lib/libblacs-lam.a
else
-SMPLIB = -lmpi
+SMPLIB = -L/usr/lib/lam/lib -lmpi
BLACSFINIT = -lblacsF77init-lam
BLACSCINIT = -lblacsCinit-lam
BLACSLIB = -lblacs-lam
@@ -56,13 +71,28 @@
BLACSCINIT = /usr/lib/libblacsCinit-mpich.a
BLACSLIB = /usr/lib/libblacs-mpich.a
else
-SMPLIB = /usr/lib/mpich/lib/libmpich.a
+SMPLIB = -L/usr/lib/mpich/lib/shared -lmpich
BLACSFINIT = -lblacsF77init-mpich
BLACSCINIT = -lblacsCinit-mpich
BLACSLIB = -lblacs-mpich
endif
TESTINGdir = $(home)/TESTING
endif
+ifeq ($(MPI),mpich2)
+USEMPI = -DUsingMpiBlacs
+ifeq ($(BUILD),static)
+SMPLIB = -L/usr/lib/mpich2/lib/ -lmpich
+BLACSFINIT = /usr/lib/libblacsF77init-mpich2.a
+BLACSCINIT = /usr/lib/libblacsCinit-mpich2.a
+BLACSLIB = /usr/lib/libblacs-mpich2.a
+else
+SMPLIB = -L/usr/lib/mpich2/lib/ -lmpich
+BLACSFINIT = -lblacsF77init-mpich2
+BLACSCINIT = -lblacsCinit-mpich2
+BLACSLIB = -lblacs-mpich2
+endif
+TESTINGdir = $(home)/TESTING
+endif
ifeq ($(MPI),pvm)
USEMPI =
ifeq ($(BUILD),static)
@@ -96,10 +126,10 @@
#
# The fortran and C compilers, loaders, and their flags
#
-F77 = g77
+F77 = gfortran
#F77 = /usr/local/pgi/linux86/bin/pgf77
CC = gcc
-NOOPT = -w -fno-globals -fno-f90 -fugly-complex $(FPIC)
+NOOPT = -w $(FPIC)
F77FLAGS = -Wall -O6 -funroll-all-loops -ffast-math $(NOOPT)
CCFLAGS = -Wall $(FPIC) -O6 -funroll-all-loops -ffast-math
SRCFLAG =
@@ -117,7 +147,7 @@
# C preprocessor defs for compilation
# (-DNoChange, -DAdd_, -DUpCase, or -Df77IsF2C)
#
-CDEFS = -Df77IsF2C -DNO_IEEE $(USEMPI)
+CDEFS = -DAdd_ -DNO_IEEE $(USEMPI)
#
# The archiver and the flag(s) to use when building archive (library)
# Also the ranlib routine. If your system has no ranlib, set RANLIB = echo
@@ -129,7 +159,7 @@
# The name of the libraries to be created/linked to
#
SCALAPACKLIB = $(home)/scalapack_$(MPI).a
-BLASLIB = -llapack-3 -lblas-3
+BLASLIB = -llapack -lblas
# BLASLIB = /usr/local/lib/libf77blas.a /usr/local/lib/libatlas.a
#
ifeq ($(BUILD),static)
|