Skip to content

Commit

Permalink
Updating src files, testing all precisions. Some clean-up remains but…
Browse files Browse the repository at this point in the history
… overall addition is complete
  • Loading branch information
Daniel Bielich committed Mar 16, 2023
1 parent c65a7a7 commit 3b08c51
Show file tree
Hide file tree
Showing 14 changed files with 3,678 additions and 3,127 deletions.
817 changes: 397 additions & 420 deletions SRC/cgedmd.f90

Large diffs are not rendered by default.

570 changes: 279 additions & 291 deletions SRC/cgedmdq.f90

Large diffs are not rendered by default.

678 changes: 344 additions & 334 deletions SRC/dgedmd.f90

Large diffs are not rendered by default.

424 changes: 218 additions & 206 deletions SRC/dgedmdq.f90

Large diffs are not rendered by default.

676 changes: 342 additions & 334 deletions SRC/sgedmd.f90

Large diffs are not rendered by default.

425 changes: 219 additions & 206 deletions SRC/sgedmdq.f90

Large diffs are not rendered by default.

842 changes: 410 additions & 432 deletions SRC/zgedmd.f90

Large diffs are not rendered by default.

578 changes: 281 additions & 297 deletions SRC/zgedmdq.f90

Large diffs are not rendered by default.

951 changes: 579 additions & 372 deletions TESTING/EIG/cchkdmd.f90

Large diffs are not rendered by default.

796 changes: 574 additions & 222 deletions TESTING/EIG/zchkdmd.f90

Large diffs are not rendered by default.

32 changes: 29 additions & 3 deletions TESTING/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,8 @@ SEIGTST= snep.out \
scsd.out \
slse.out

SDMDEIGTST= sdmd.out

CEIGTST= cnep.out \
csep.out \
cse2.out \
Expand All @@ -82,6 +84,8 @@ CEIGTST= cnep.out \
ccsd.out \
clse.out

CDMDEIGTST= cdmd.out

DEIGTST= dnep.out \
dsep.out \
dse2.out \
Expand Down Expand Up @@ -126,6 +130,7 @@ ZEIGTST= znep.out \
zcsd.out \
zlse.out

ZDMDEIGTST= zdmd.out

SLINTST= stest.out

Expand All @@ -144,10 +149,10 @@ ZLINTST= ztest.out
ZLINTSTPROTO= zctest.out ztest_rfp.out

.PHONY: single complex double complex16
single: $(SLINTST) $(SEIGTST)
complex: $(CLINTST) $(CEIGTST)
single: $(SLINTST) $(SEIGTST) $(SDMDEIGTST)
complex: $(CLINTST) $(CEIGTST) $(CDMDEIGTST)
double: $(DLINTST) $(DEIGTST) $(DDMDEIGTST)
complex16: $(ZLINTST) $(ZEIGTST)
complex16: $(ZLINTST) $(ZEIGTST) $(ZDMDEIGTST)

.PHONY: singleproto complexproto doubleproto complex16proto
singleproto: $(SLINTSTPROTO)
Expand Down Expand Up @@ -299,6 +304,10 @@ scsd.out: csd.in EIG/xeigtsts
slse.out: lse.in EIG/xeigtsts
@echo LSE: Testing Constrained Linear Least Squares routines
./EIG/xeigtsts < lse.in > $@ 2>&1

sdmd.out: sdmd.in EIG/xdmdeigtsts
@echo DMD: Testing Dynamic Mode Decomposition routines
./EIG/xdmdeigtsts < sdmd.in > $@ 2>&1
#
# ======== COMPLEX EIG TESTS ===========================

Expand Down Expand Up @@ -381,6 +390,10 @@ ccsd.out: csd.in EIG/xeigtstc
clse.out: lse.in EIG/xeigtstc
@echo LSE: Testing Constrained Linear Least Squares routines
./EIG/xeigtstc < lse.in > $@ 2>&1

cdmd.out: cdmd.in EIG/xdmdeigtstc
@echo DMD: Testing Dynamic Mode Decomposition routines
./EIG/xdmdeigtstc < cdmd.in > $@ 2>&1
#
# ======== DOUBLE EIG TESTS ===========================

Expand Down Expand Up @@ -549,6 +562,10 @@ zcsd.out: csd.in EIG/xeigtstz
zlse.out: lse.in EIG/xeigtstz
@echo LSE: Testing Constrained Linear Least Squares routines
./EIG/xeigtstz < lse.in > $@ 2>&1

zdmd.out: zdmd.in EIG/xdmdeigtstz
@echo DMD: Testing Dynamic Mode Decomposition routines
./EIG/xdmdeigtstz < zdmd.in > $@ 2>&1
# ==============================================================================

LIN/xlintsts: $(FRCLIN) $(FRC)
Expand Down Expand Up @@ -584,9 +601,15 @@ LIN/xlintstzc: $(FRCLIN) $(FRC)
EIG/xeigtsts: $(FRCEIG) $(FRC)
$(MAKE) -C EIG xeigtsts

EIG/xdmdeigtsts: $(FRCEIG) $(FRC)
$(MAKE) -C EIG xdmdeigtsts

EIG/xeigtstc: $(FRCEIG) $(FRC)
$(MAKE) -C EIG xeigtstc

EIG/xdmdeigtstc: $(FRCEIG) $(FRC)
$(MAKE) -C EIG xdmdeigtstc

EIG/xeigtstd: $(FRCEIG) $(FRC)
$(MAKE) -C EIG xeigtstd

Expand All @@ -596,6 +619,9 @@ EIG/xdmdeigtstd: $(FRCEIG) $(FRC)
EIG/xeigtstz: $(FRCEIG) $(FRC)
$(MAKE) -C EIG xeigtstz

EIG/xdmdeigtstz: $(FRCEIG) $(FRC)
$(MAKE) -C EIG xdmdeigtstz

.PHONY: clean cleantest
clean: cleantest
cleantest:
Expand Down
6 changes: 2 additions & 4 deletions TESTING/cdmd.in
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
4

20
10
5

20
11
10

30
11
Expand Down
2 changes: 0 additions & 2 deletions TESTING/zdmd.in
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
4

10
5

Expand Down
8 changes: 4 additions & 4 deletions lapack_testing.py
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ def run_summary_test( f, cmdline, short_summary):
range_prec=[1,3]
elif test=='rfp':
range_test=[18]
elif test=='ddmd':
elif test=='dmd':
range_test=[20]
elif test=='eig':
range_test=list(range(16))
Expand Down Expand Up @@ -229,7 +229,7 @@ def run_summary_test( f, cmdline, short_summary):
letter+"gd",letter+"sb",letter+"sg",
letter+"bb","glm","gqr",
"gsv","csd","lse",
letter+"test", letter+dtypes[0][dtype-1]+"test",letter+"test_rfp","ddmd"),
letter+"test", letter+dtypes[0][dtype-1]+"test",letter+"test_rfp",letter+"dmd"),
("Nonsymmetric-Eigenvalue-Problem", "Symmetric-Eigenvalue-Problem", "Symmetric-Eigenvalue-Problem-2-stage", "Singular-Value-Decomposition",
"Eigen-Condition","Nonsymmetric-Eigenvalue","Nonsymmetric-Generalized-Eigenvalue-Problem",
"Nonsymmetric-Generalized-Eigenvalue-Problem-driver", "Symmetric-Eigenvalue-Problem", "Symmetric-Eigenvalue-Generalized-Problem",
Expand All @@ -241,7 +241,7 @@ def run_summary_test( f, cmdline, short_summary):
letter+"gd",letter+"sb",letter+"sg",
letter+"bb",letter+"glm",letter+"gqr",
letter+"gsv",letter+"csd",letter+"lse",
letter+"test", letter+dtypes[0][dtype-1]+"test",letter+"test_rfp","ddmd"),
letter+"test", letter+dtypes[0][dtype-1]+"test",letter+"test_rfp",letter+"dmd"),
)


Expand All @@ -264,7 +264,7 @@ def run_summary_test( f, cmdline, short_summary):
cmdbase="xlintstrf"+letter+" < "+dtests[0][dtest]+".in > "+dtests[2][dtest]+".out"
elif dtest==20:
# DMD EIG TESTS
cmdbase="xdmdeigtstd"" < "+dtests[0][dtest]+".in > "+dtests[2][dtest]+".out"
cmdbase="xdmdeigtst"+letter+" < "+dtests[0][dtest]+".in > "+dtests[2][dtest]+".out"
else:
# EIG TESTS
cmdbase="xeigtst"+letter+" < "+dtests[0][dtest]+".in > "+dtests[2][dtest]+".out"
Expand Down

0 comments on commit 3b08c51

Please sign in to comment.