diff options
| author | Ying-Chieh Liao <ijliao@FreeBSD.org> | 2002-06-22 17:10:55 +0000 |
|---|---|---|
| committer | Ying-Chieh Liao <ijliao@FreeBSD.org> | 2002-06-22 17:10:55 +0000 |
| commit | c93bf47f9116af7484957942927da863f90db4ed (patch) | |
| tree | 127dfde9f408dd41bc504419a6668922fbbd69ec /math/lapack++/files | |
| parent | Replace ${PERL} with ${REINPLACE_CMD} (diff) | |
add lapack++ 1.1
Linear Algebra PACKage in C++, a wrapper for LAPACK
PR: 39653
Submitted by: Nakata Maho <chat95@mbox.kyoto-inet.or.jp>
Diffstat (limited to 'math/lapack++/files')
| -rw-r--r-- | math/lapack++/files/patch-blas++_test | 11 | ||||
| -rw-r--r-- | math/lapack++/files/patch-blaspp:testing:makefile | 11 | ||||
| -rw-r--r-- | math/lapack++/files/patch-eigslv.cc | 61 | ||||
| -rw-r--r-- | math/lapack++/files/patch-lapack++_test | 11 | ||||
| -rw-r--r-- | math/lapack++/files/patch-laslv.h | 11 | ||||
| -rw-r--r-- | math/lapack++/files/patch-makefile | 29 | ||||
| -rw-r--r-- | math/lapack++/files/patch-makefile.def | 44 | ||||
| -rw-r--r-- | math/lapack++/files/patch-matrix_test | 11 |
8 files changed, 189 insertions, 0 deletions
diff --git a/math/lapack++/files/patch-blas++_test b/math/lapack++/files/patch-blas++_test new file mode 100644 index 000000000000..504663e6e22d --- /dev/null +++ b/math/lapack++/files/patch-blas++_test @@ -0,0 +1,11 @@ +--- blaspp/testing/blas++_test.org Tue Feb 29 05:42:30 2000 ++++ blaspp/testing/blas++_test Mon May 20 10:30:07 2002 +@@ -31,7 +31,7 @@ + foreach t ($testsuite) + set answer = $t:t.out + echo "$t $N[1] $M[1] >& $answer" +- $t $N[1] $M[1] >& $answer ++ ./$t $N[1] $M[1] >& $answer + + end + diff --git a/math/lapack++/files/patch-blaspp:testing:makefile b/math/lapack++/files/patch-blaspp:testing:makefile new file mode 100644 index 000000000000..cfa85b5f04ab --- /dev/null +++ b/math/lapack++/files/patch-blaspp:testing:makefile @@ -0,0 +1,11 @@ +--- blaspp/testing/makefile.org Mon May 20 11:04:29 2002 ++++ blaspp/testing/makefile Mon May 20 11:04:44 2002 +@@ -13,7 +13,7 @@ + + + tblasd++ : tblasd++.o +- $(CPP) $(CPPFLAGS) -o tblasd++ tblasd++.o $(LAMATRIXPP_LIB) \ ++ $(CPP) $(CPPFLAGS) -o tblasd++ tblasd++.o -L${PREFIX}/lib $(LAMATRIXPP_LIB) \ + $(COMPLEX_LIB) $(BLASPP_LIB) $(BLAS_LIB) \ + $(FLIBS) + diff --git a/math/lapack++/files/patch-eigslv.cc b/math/lapack++/files/patch-eigslv.cc new file mode 100644 index 000000000000..c087bceb8f4f --- /dev/null +++ b/math/lapack++/files/patch-eigslv.cc @@ -0,0 +1,61 @@ +--- src/eigslv.cc~ Wed Mar 1 02:52:47 2000 ++++ src/eigslv.cc Wed May 22 21:49:45 2002 +@@ -58,14 +58,14 @@ + // char *fname = NULL; // HP C++ does not support string initalization! + //#endif + +- // view symmetric matrix S as a LaGenMatDouble +- // assumes S is contiguous... +- LaSymmMatDouble tmp(S); +- LaEigSolveVecIP(tmp, eigvals); +- +- LaGenMatDouble tmp2(&tmp(0,0), S.size(0), S.size(1)); +- eigvec.ref(tmp2); +- ++ long int N = S.size(0); ++ long int i,j; ++ ++ for(j=0;j<N;j++){ ++ for(i=j;i<N;i++){ ++ eigvec(i,j)=S(i,j); ++ }} ++ LaEigSolveVecIP(eigvec, eigvals); + + } + +@@ -100,18 +100,18 @@ + + } + +-void LaEigSolveVecIP(LaSymmMatDouble &S, LaVectorDouble &eigvals) ++void LaEigSolveVecIP(LaGenMatDouble &A, LaVectorDouble &eigvals) + { + #ifndef HPPA + const char fname[] = "LaEigSolveVecIP(LaGenMatDouble &A, &eigvals)"; + #else + char *fname = NULL; // HP C++ does not support string initalization! + #endif +- long int N = S.size(0); ++ long int N = A.size(0); + char jobz = 'V'; + char uplo = 'L'; + long int info; +- long int lda = S.gdim(0); ++ long int lda = A.gdim(0); + + if (eigvals.size() < N) + { +@@ -119,11 +119,11 @@ + } + + +- long int w = (LaEnvBlockSize("SSYTRD", S) +2) * N; ++ long int w = (LaEnvBlockSize("SSYTRD", A) +2) * N; + LaVectorDouble Work(w); + + +- F77NAME(dsyev)(&jobz, &uplo, &N, S.addr(), &lda, &eigvals(0), &Work(0), ++ F77NAME(dsyev)(&jobz, &uplo, &N, A.addr(), &lda, &eigvals(0), &Work(0), + &w, &info); + + if (info != 0) diff --git a/math/lapack++/files/patch-lapack++_test b/math/lapack++/files/patch-lapack++_test new file mode 100644 index 000000000000..9f0d5b4d5438 --- /dev/null +++ b/math/lapack++/files/patch-lapack++_test @@ -0,0 +1,11 @@ +--- testing/lapack++_test.org Tue Feb 29 05:42:30 2000 ++++ testing/lapack++_test Mon May 20 10:26:07 2002 +@@ -31,7 +31,7 @@ + foreach n ($N) + set answer = $t:t$n.out + echo "$t $n $n >& $answer" +- $t $n $n >>& $answer ++ ./$t $n $n >>& $answer + end + end + diff --git a/math/lapack++/files/patch-laslv.h b/math/lapack++/files/patch-laslv.h new file mode 100644 index 000000000000..194dc56f220e --- /dev/null +++ b/math/lapack++/files/patch-laslv.h @@ -0,0 +1,11 @@ +--- include/laslv.h~ Tue Feb 29 05:42:27 2000 ++++ include/laslv.h Wed May 22 21:51:02 2002 +@@ -51,7 +51,7 @@ + void LaEigSolve(const LaSymmMatDouble &S, LaVectorDouble &eigvals, + LaGenMatDouble &eigvec); + void LaEigSolveIP(LaSymmMatDouble &S, LaVectorDouble &eigvals); +-void LaEigSolveVecIP(LaSymmMatDouble &S, LaVectorDouble &eigvals); ++void LaEigSolveVecIP(LaGenMatDouble &A, LaVectorDouble &eigvals); + #endif + + diff --git a/math/lapack++/files/patch-makefile b/math/lapack++/files/patch-makefile new file mode 100644 index 000000000000..25dbcad8c8b7 --- /dev/null +++ b/math/lapack++/files/patch-makefile @@ -0,0 +1,29 @@ +--- makefile.org Tue Feb 29 05:42:30 2000 ++++ makefile Mon May 20 10:21:52 2002 +@@ -30,7 +30,7 @@ + + matrix_testing : + cd $(LAPACKPP_DIR)/matrix/testing; make; +- cd $(LAPACKPP_DIR)/matrix/testing; matrix_test ++ cd $(LAPACKPP_DIR)/matrix/testing; ./matrix_test + + + # C++ interface to the BLAS +@@ -41,7 +41,7 @@ + + blas++_testing: + cd $(LAPACKPP_DIR)/blaspp/testing; make; +- cd $(LAPACKPP_DIR)/blaspp/testing; blas++_test; ++ cd $(LAPACKPP_DIR)/blaspp/testing; ./blas++_test; + + + +@@ -56,7 +56,7 @@ + # (whose path is specified as $(TMGLIB)) be defined. + lapack++_testing : + cd $(LAPACKPP_DIR)/testing; make +- cd $(LAPACKPP_DIR)/testing; lapack++_test ++ cd $(LAPACKPP_DIR)/testing; ./lapack++_test + + nolibs: + cd $(LAPACKPP_LIB_DIR); rm *.a diff --git a/math/lapack++/files/patch-makefile.def b/math/lapack++/files/patch-makefile.def new file mode 100644 index 000000000000..51224438f39d --- /dev/null +++ b/math/lapack++/files/patch-makefile.def @@ -0,0 +1,44 @@ +--- makefile.def.orig Wed Mar 1 02:42:58 2000 ++++ makefile.def Mon May 20 11:18:27 2002 +@@ -12,11 +12,11 @@ + # g++ 2.7.0) Some other choices for ARCH are "SGI" and "RIOS" (RS-6000) + # + +-ARCH = Linux ++ARCH = FreeBSD + CPP = g++ +-CPPFLAGS = -I$(LAPACKPP_INC) -D$(ARCH) -Wall +-CPPLIBS = -lm +-CFLAGS = -I$(LAPACKPP_INC) ++CPPFLAGS+= $(CFLAGS) -I$(LAPACKPP_INC) -D$(ARCH) ++CPPLIBS+= -lm ++CFLAGS+= -I$(LAPACKPP_INC) + # + # + +@@ -35,8 +35,14 @@ + # + # Linux + # +-BLAS_LIB = $(HOME)/lib/Linux/libblas.a +-LAPACK_LIB = $(HOME)/lib/Linux/liblapack.a ++#BLAS_LIB = $(HOME)/lib/Linux/libblas.a ++#LAPACK_LIB = $(HOME)/lib/Linux/liblapack.a ++#FLIBS = -lm -lg2c ++# ++# FreeBSD ++# ++BLAS_LIB = -lf77blas -latlas ++LAPACK_LIB = -lalapack -lcblas + FLIBS = -lm -lg2c + # + # Sun +@@ -60,7 +66,7 @@ + LAPACKPP_LIB = $(LAPACKPP_LIB_DIR)/liblapack++.a + BLASPP_LIB = $(LAPACKPP_LIB_DIR)/libblas++.a + +-ALL_LAPACKPP_LIB = \ ++ALL_LAPACKPP_LIB = -L${PREFIX}/lib \ + $(LAMATRIXPP_LIB) \ + $(LAPACKPP_LIB) \ + $(TMGLIB) \ diff --git a/math/lapack++/files/patch-matrix_test b/math/lapack++/files/patch-matrix_test new file mode 100644 index 000000000000..6043c5398b86 --- /dev/null +++ b/math/lapack++/files/patch-matrix_test @@ -0,0 +1,11 @@ +--- matrix/testing/matrix_test.org Tue Feb 29 05:42:29 2000 ++++ matrix/testing/matrix_test Mon May 20 10:19:03 2002 +@@ -32,7 +32,7 @@ + foreach t ($testsuite) + set answer = $t:t.out + echo "$t $N[1] $N[1] >& $answer" +- $t $N[1] $N[1] >& $answer ++ ./$t $N[1] $N[1] >& $answer + + end + |
