diff options
author | Thierry Thomas <thierry@FreeBSD.org> | 2004-11-15 22:16:27 +0000 |
---|---|---|
committer | Thierry Thomas <thierry@FreeBSD.org> | 2004-11-15 22:16:27 +0000 |
commit | 29e92be35318cc3be37848dda1e72fbc5c4693da (patch) | |
tree | 92b3d7ae032a1ef3a439eb8c9b98e140e63c36b8 /math/blocksolve95/files | |
parent | cf67891e3f9326cba3841af11ddfffdd14ff4a4d (diff) |
Notes
Diffstat (limited to 'math/blocksolve95/files')
-rw-r--r-- | math/blocksolve95/files/BSman3.inc | 85 | ||||
-rw-r--r-- | math/blocksolve95/files/patch-bmake::common | 19 | ||||
-rw-r--r-- | math/blocksolve95/files/patch-bmake::freebsd::freebsd | 37 | ||||
-rw-r--r-- | math/blocksolve95/files/patch-bmake::freebsd::freebsd.O | 8 | ||||
-rw-r--r-- | math/blocksolve95/files/patch-bmake::freebsd::freebsd.site | 35 | ||||
-rw-r--r-- | math/blocksolve95/files/patch-examples::makefile | 11 | ||||
-rw-r--r-- | math/blocksolve95/files/patch-include::BSdepend.h | 14 |
7 files changed, 209 insertions, 0 deletions
diff --git a/math/blocksolve95/files/BSman3.inc b/math/blocksolve95/files/BSman3.inc new file mode 100644 index 000000000000..9b260ff076ad --- /dev/null +++ b/math/blocksolve95/files/BSman3.inc @@ -0,0 +1,85 @@ +MAN3= BSb_back_solve.3 \ + BSb_backward.3 \ + BSb_for_solve.3 \ + BSb_forward.3 \ + BSback_solve.3 \ + BSback_solve1.3 \ + BSbackward.3 \ + BSbackward1.3 \ + BSbjacobi.3 \ + BScopy_nz.3 \ + BScopy_par_mat.3 \ + BScreate_ctx.3 \ + BSctx_print.3 \ + BSctx_set_cs.3 \ + BSctx_set_ct.3 \ + BSctx_set_err.3 \ + BSctx_set_guess.3 \ + BSctx_set_id.3 \ + BSctx_set_is.3 \ + BSctx_set_max_it.3 \ + BSctx_set_method.3 \ + BSctx_set_np.3 \ + BSctx_set_num_rhs.3 \ + BSctx_set_pr.3 \ + BSctx_set_pre.3 \ + BSctx_set_print_log.3 \ + BSctx_set_ps.3 \ + BSctx_set_restart.3 \ + BSctx_set_rt.3 \ + BSctx_set_scaling.3 \ + BSctx_set_si.3 \ + BSctx_set_tol.3 \ + BSeasy_A.3 \ + BSfactor.3 \ + BSfinalize.3 \ + BSfor_solve.3 \ + BSfor_solve1.3 \ + BSforward.3 \ + BSforward1.3 \ + BSfree_comm.3 \ + BSfree_copy_par_mat.3 \ + BSfree_ctx.3 \ + BSfree_easymat.3 \ + BSfree_off_map.3 \ + BSfree_par_mat.3 \ + BSfree_reperm.3 \ + BSfree_spmat.3 \ + BSfreeg2l.3 \ + BSfreel2g.3 \ + BSget_diag.3 \ + BSglob2loc.3 \ + BSglob2proc.3 \ + BSglobal_flops.3 \ + BSglobal_nnz.3 \ + BSglobal_num_cliques.3 \ + BSglobal_num_inodes.3 \ + BSinit.3 \ + BSinv_diag_block.3 \ + BSloc2glob.3 \ + BSlocal_flops.3 \ + BSlocal_nnz.3 \ + BSlocal_num_cliques.3 \ + BSlocal_num_inodes.3 \ + BSmain_perm.3 \ + BSmain_reperm.3 \ + BSmake_off_map.3 \ + BSmat_subtract.3 \ + BSnum_colors.3 \ + BSoffset.3 \ + BSpar_gmres.3 \ + BSpar_isolve.3 \ + BSpar_solve.3 \ + BSpar_sym_solve.3 \ + BSprint_log.3 \ + BSsave_diag.3 \ + BSscale_diag.3 \ + BSset_diag.3 \ + BSset_diagv.3 \ + BSset_mat_icc_storage.3 \ + BSset_mat_symmetric.3 \ + BSsetup_block.3 \ + BSsetup_factor.3 \ + BSsetup_forward.3 \ + BStri_mult.3 \ + BStri_solve.3 diff --git a/math/blocksolve95/files/patch-bmake::common b/math/blocksolve95/files/patch-bmake::common new file mode 100644 index 000000000000..7c426bf835a8 --- /dev/null +++ b/math/blocksolve95/files/patch-bmake::common @@ -0,0 +1,19 @@ +--- bmake/common.orig Tue Jan 9 16:35:45 1996 ++++ bmake/common Sun Oct 3 23:03:55 2004 +@@ -161,13 +161,13 @@ + # + # Builds library - fast version + libfast: chkpetsc_dir $(SOURCEC) $(SOURCEF) +- @-if [ "$(SOURCEC)" != "" ] ; then \ ++ -if [ "$(SOURCEC)" != "" ] ; then \ + $(CC) -c $(CFLAGS) $(BASEOPT) $(SOURCEC) ;\ + fi +- @-if [ "$(SOURCEF)" != "" ] ; then \ ++ -if [ "$(SOURCEF)" != "" ] ; then \ + $(FC) -c $(FFLAGS) $(BASEOPTF) $(SOURCEF) ;\ + fi +- @-if [ "$(OBJS)" != " " ] ; then \ ++ -if [ "$(OBJS)" != " " ] ; then \ + $(AR) cr $(LIBNAME) $(OBJS); \ + $(RM) -f $(OBJS); \ + fi diff --git a/math/blocksolve95/files/patch-bmake::freebsd::freebsd b/math/blocksolve95/files/patch-bmake::freebsd::freebsd new file mode 100644 index 000000000000..d3334f6431fc --- /dev/null +++ b/math/blocksolve95/files/patch-bmake::freebsd::freebsd @@ -0,0 +1,37 @@ +--- bmake/freebsd/freebsd.orig Tue Jan 9 16:40:08 1996 ++++ bmake/freebsd/freebsd Sun Oct 3 18:12:06 2004 +@@ -1,13 +1,13 @@ + +-CC = gcc -DPARCH_freebsd +-FC = f77 ++CC += -DPARCH_freebsd ++#FC = f77 + AR = ar + RM = rm -f *.c.* +-OMAKE = gnumake --no-print-directory ++OMAKE = $(GMAKE) + RANLIB = ranlib + SHELL = /bin/sh +-CLINKER = gcc $(BASEOPT) +-FLINKER = f77 $(BASEOPTF) ++CLINKER = $(CC) $(BASEOPT) ++FLINKER = $(FC) $(BASEOPTF) + CONF = -DHAVE_PWD_H -DHAVE_MALLOC_H -DHAVE_STRING_H \ + -DHAVE_SWAPPED_BYTES -DHAVE_X11 + SYS_LIB = +@@ -33,13 +33,13 @@ + $(RM) $*.o + .F.o: + $(RM) $*.f +- cpp $(PETSC_INCLUDE) $*.F > $*.f ++ $(CPP) $(PETSC_INCLUDE) $*.F > $*.f + $(FC) -c $(FFLAGS) $(BASEOPTF) $*.f + $(RM) $*.f + + .F.a: + $(RM) $*.f +- cpp $(PETSC_INCLUDE) $*.F > $*.f ++ $(CPP) $(PETSC_INCLUDE) $*.F > $*.f + $(FC) -c $(FFLAGS) $(BASEOPTF) $*.f + $(RM) $*.f + $(AR) cr $(LIBNAME) $*.o diff --git a/math/blocksolve95/files/patch-bmake::freebsd::freebsd.O b/math/blocksolve95/files/patch-bmake::freebsd::freebsd.O new file mode 100644 index 000000000000..1829d187a1a5 --- /dev/null +++ b/math/blocksolve95/files/patch-bmake::freebsd::freebsd.O @@ -0,0 +1,8 @@ +--- bmake/freebsd/freebsd.O.orig Thu Dec 14 20:49:35 1995 ++++ bmake/freebsd/freebsd.O Sun Oct 3 23:08:37 2004 +@@ -1,3 +1,3 @@ +-BASEOPT = -O -Wall -Wshadow -fomit-frame-pointer -DINLINE_FOR \ ++BASEOPT = $(CFLAGS) -fomit-frame-pointer -DINLINE_FOR \ + -DPETSC_LOG -DPETSC_DEBUG -Dlint -DPETSC_BOPT_O +-BASEOPTF = -O4 ++BASEOPTF = $(FFLAGS) diff --git a/math/blocksolve95/files/patch-bmake::freebsd::freebsd.site b/math/blocksolve95/files/patch-bmake::freebsd::freebsd.site new file mode 100644 index 000000000000..abf2fceb9cba --- /dev/null +++ b/math/blocksolve95/files/patch-bmake::freebsd::freebsd.site @@ -0,0 +1,35 @@ +--- ./bmake/freebsd/freebsd.site.orig Thu Feb 15 22:53:34 1996 ++++ ./bmake/freebsd/freebsd.site Sun Oct 3 20:40:47 2004 +@@ -15,24 +15,24 @@ + # Location of BLAS and LAPACK. These libraries are available via Netlib, + # or see $(BS_DIR)/readme for information on retrieving a subset. + # +-BLAS_LIB = /home/bsmith/lapack/blas_freebsd.a $(FC_LIB) +-LAPACK_LIB = /home/bsmith/lapack/lapack_freebsd.a ++BLAS_LIB = -lf77blas -lcblas -latlas -lg2c -lm ++LAPACK_LIB = -L$(LOCALBASE)/lib -lalapack + # + # Location of X-windows software + # +-X11_INCLUDE = ++X11_INCLUDE = -I$(X11BASE)/include + X11_LIB = -lX11 + # + # Location of MPI (Message Passing Interface) software + # +-MPI_LIB = /usr/local/mpi/lib/freebsd/ch_p4/libmpi.a +-MPI_INCLUDE = -I/usr/local/mpi/include +-MPIRUN = /usr/local/mpi/bin/mpirun ++MPI_LIB = $(LOCALBASE)/mpich/lib/libmpich.a ++MPI_INCLUDE = -I$(LOCALBASE)/mpich/include ++MPIRUN = $(LOCALBASE)/mpich/bin/mpirun + # + # Location of BlockSolve95 + # +-BS_INCLUDE = +-BS_LIB = ++BS_INCLUDE = $(PETSC_INCLUDE) ++BS_LIB = $(BS_DIR)/lib/lib$(BOPT)/$(PETSC_ARCH)/libBS95.a + # + # PCONF - indicates which external packages are available at your site + # diff --git a/math/blocksolve95/files/patch-examples::makefile b/math/blocksolve95/files/patch-examples::makefile new file mode 100644 index 000000000000..d79080a58e17 --- /dev/null +++ b/math/blocksolve95/files/patch-examples::makefile @@ -0,0 +1,11 @@ +--- examples/makefile.orig Thu Oct 17 22:15:08 1996 ++++ examples/makefile Sun Oct 3 21:38:26 2004 +@@ -19,7 +19,7 @@ + $(MPI_LIB) $(FC_LIB) $(SYS_LIB) -lm + LINCLUDE = $(SOURCEH) + +-bsrunexamples: ++bsrunexamples: $(EXAMPLES_1) + -@echo ">>>>>> Running examples in example directory <<<<<<" + -@$(MPIRUN) -np 4 grid0.$(PETSC_ARCH) 2 2 1 10 10 10 + -@$(MPIRUN) -np 4 grid1.$(PETSC_ARCH) 2 2 1 10 10 10 diff --git a/math/blocksolve95/files/patch-include::BSdepend.h b/math/blocksolve95/files/patch-include::BSdepend.h new file mode 100644 index 000000000000..a6868374dc19 --- /dev/null +++ b/math/blocksolve95/files/patch-include::BSdepend.h @@ -0,0 +1,14 @@ +--- include/BSdepend.h.orig Tue Jul 8 21:10:10 1997 ++++ include/BSdepend.h Sun Oct 3 18:23:32 2004 +@@ -16,6 +16,11 @@ + #define MPI_Aint int + + #include <stdio.h> ++ ++#if defined(PARCH_freebsd) ++#include <stdlib.h> ++#endif ++ + #if defined(PARCH_sun4) && !defined(__cplusplus) && defined(_Gnu_) + extern int fprintf(FILE*,const char*,...); + extern void sscanf(char *,...); |