Skip to content

Commit b2a237f

Browse files
committed
debug
1 parent ca9096f commit b2a237f

File tree

6 files changed

+20
-15
lines changed

6 files changed

+20
-15
lines changed

EXTERNAL/makefile

+6-3
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,12 @@ ifeq ($(INTEL), 1)
44
OBJ = DIRECTSOL/pevsl_pardiso.o ITERSOL/chebiter.o
55
INCLUDES = -I../INC -I. -I$(MKLROOT)/include
66
else
7-
include DIRECTSOL/makefile_mumps.in
8-
OBJ = DIRECTSOL/pevsl_mumps.o ITERSOL/chebiter.o
9-
INCLUDES = -I../INC -I. $(MUMPS_INC)
7+
#include DIRECTSOL/makefile_mumps.in
8+
#OBJ = DIRECTSOL/pevsl_mumps.o ITERSOL/chebiter.o
9+
#INCLUDES = -I../INC -I. $(MUMPS_INC)
10+
#include DIRECTSOL/makefile_mumps.in
11+
OBJ = ITERSOL/chebiter.o
12+
INCLUDES = -I../INC -I.
1013
endif
1114

1215
%.o : %.c

FORTRAN/pevsl_f90.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@ void PEVSL_FORT(pevsl_zlanbounds)(uintptr_t *pevslf90, int *mlan, int *nsteps, d
282282
pEVSL_ParvecCreate(N, n, nfirst, pevsl->comm, &viinit);
283283
pEVSL_ParvecRand(&viinit);
284284
/*------------------- Lanczos Bounds */
285-
pEVSL_ZLanTrbounds(pevsl, *mlan, *nsteps, 1e-8, &vrinit, &viinit, 1, lmin, lmax, NULL);
285+
pEVSL_ZLanTrbounds(pevsl, *mlan, *nsteps, 1e-8, &vrinit, &viinit, 1, lmin, lmax, stdout);
286286

287287
pEVSL_ParvecFree(&vrinit);
288288
pEVSL_ParvecFree(&viinit);

README.md

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
-----------------------------------------------------------------------
2-
pEVSL (parallel EigenValue SLicing)
3-
4-
-----------------------------------------------------------------------
5-
Modification for complex Hermitian systems
6-
2+
pEVSL (parallel EigenValue SLcing)
73
-----------------------------------------------------------------------
84
Latest changes made on:
95
-----------------------------------------------------------------------

SRC/lantrbnd.c

+4
Original file line numberDiff line numberDiff line change
@@ -461,6 +461,7 @@ int pEVSL_ZLanTrbounds(pevsl_Data *pevsl, int lanm, int maxit, double tol,
461461
/*-----------------------------------------------------------------------*
462462
* *thick restarted* Lanczos step
463463
*-----------------------------------------------------------------------*/
464+
464465
if (do_print) {
465466
fprintf(fstats, " LanTR for bounds: dim %d, maxits %d\n", lanm, maxit);
466467
}
@@ -545,10 +546,13 @@ int pEVSL_ZLanTrbounds(pevsl_Data *pevsl, int lanm, int maxit, double tol,
545546
/* z references the 1st columns of Z */
546547
pEVSL_ParvecsGetParvecShell(Zr, 0, zr);
547548
pEVSL_ParvecsGetParvecShell(Zi, 0, zi);
549+
550+
pEVSL_fprintf0(rank,fstats,"check 0 \n");
548551
/* B norm */
549552
pEVSL_ZMatvecB(pevsl, vr, vi, zr, zi);
550553
pEVSL_ParvecZDot(vr, vi, zr, zi, &tr, &ti);
551554
t = 1.0 / sqrt(tr);
555+
pEVSL_fprintf0(rank,fstats,"check 1 \n");
552556
/* check! ti != 0.0 ? */
553557

554558
/* z = B*v */

makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ default:
22
( cd SRC ; make )
33
( cd EXTERNAL ; make )
44
( cd TESTS/Lap ; mkdir -p OUT ; make)
5-
( cd TESTS/Gen_Lap ; mkdir -p OUT ; make)
6-
# ( cd TESTS/MM ; mkdir -p OUT ; make)
5+
# ( cd TESTS/Gen_Lap ; mkdir -p OUT ; make)
6+
( cd TESTS/MM ; mkdir -p OUT ; make)
77
all:
88
( cd SRC ; make )
99
( cd EXTERNAL ; make )

makefile.in

+6-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
INTEL = 1
1+
INTEL = 0
22

33
# Compilers
44
ifeq ($(INTEL), 1)
@@ -12,7 +12,8 @@ LINK = $(CC)
1212
# Common flags
1313
# Debug mode
1414
PEVSL_DEBUG = -DPEVSL_DEBUG
15-
FLAGS = -DUNIX -O3 -g -Wall $(PEVSL_DEBUG) $(TIMING)
15+
#FLAGS = -DUNIX -O3 -g -Wall $(PEVSL_DEBUG) $(TIMING)
16+
FLAGS = -DUNIX -g -Wall $(PEVSL_DEBUG) $(TIMING)
1617

1718
##OBJ_TIME = mactime.o
1819
OBJ_TIME = timing.o
@@ -25,6 +26,7 @@ ifeq ($(INTEL), 1)
2526
FLAGS += -DUSE_MKL
2627
LIBLAPACK = -Wl,--start-group ${MKLROOT}/lib/intel64/libmkl_intel_lp64.a ${MKLROOT}/lib/intel64/libmkl_intel_thread.a ${MKLROOT}/lib/intel64/libmkl_core.a ${MKLROOT}/lib/intel64/libmkl_blacs_intelmpi_lp64.a -Wl,--end-group -liomp5 -lpthread -lm -ldl
2728
else
28-
LIBLAPACK = /home/li50/workspace/OpenBLAS/libopenblas.a -lpthread
29-
LIB0 = -lgfortran -lm
29+
#LIBLAPACK = /home/li50/workspace/OpenBLAS/libopenblas.a -lpthread
30+
LIBLAPACK = -Wl,--start-group ${MKLROOT}/lib/intel64/libmkl_intel_lp64.a ${MKLROOT}/lib/intel64/libmkl_gnu_thread.a ${MKLROOT}/lib/intel64/libmkl_core.a ${MKLROOT}/lib/intel64/libmkl_blacs_intelmpi_lp64.a -Wl,--end-group -lgomp -lpthread -lm -ldl
31+
LIB0 = -lgfortran #-lm
3032
endif

0 commit comments

Comments
 (0)