From b6eccee12d1f29ade014d10ce2c8cf85b579e9fd Mon Sep 17 00:00:00 2001 From: nadolski <nadolski@9a6e40ed-f3a0-4838-9b4a-bf418f78e88d> Date: Thu, 22 Dec 2011 14:19:42 +0000 Subject: [PATCH] New for parallel and cross compilation --- tracy/README | 35 +++++++++++++++++++++++++++++++++++ tracy/TPSA/Makefile.am | 2 +- tracy/bootstrap | 5 +---- tracy/tools/Makefile.am | 20 +++++++++----------- 4 files changed, 46 insertions(+), 16 deletions(-) diff --git a/tracy/README b/tracy/README index ca80712..65271b8 100644 --- a/tracy/README +++ b/tracy/README @@ -4,3 +4,38 @@ For most C++ developers, we recommend disabling #981. But for C code, #981 is mo #pragma warning (default:193) +Tracy-3 + +Author: Johan Bengtsson + +Requirements: + + 1. GNU autoconf and automake environment. + + 2. GNU C++ compiler: gcc + + 3. Numerical Recipes in C (with support for "double"). + Assumed directory structure: + + $NUM_REC/lib libnum_rec.a + $NUM_REC/inc nrutil.h, nr.h + +To install: + + 1. Define the environment variable: + + $NUM_REC = <path to Numerical Recipes library> + + 2. tar -xvzf <tar ball name> + + 3. cd tracy-3.0 + + 4. ./bootstrap + + 5. ./configure + + 6. cd tracy/wrk + + 7. make + + 8. ./main lattice/ALBA diff --git a/tracy/TPSA/Makefile.am b/tracy/TPSA/Makefile.am index ef996af..3ca0bd8 100644 --- a/tracy/TPSA/Makefile.am +++ b/tracy/TPSA/Makefile.am @@ -4,4 +4,4 @@ libTPSALib_a_SOURCES = TPSALib.f libLieLib_a_SOURCES = LieLib.f -FFLAGS = -g -O2 -Wall -fbounds-check -fPIC +AM_FFLAGS = -g -O2 -Wall -fbounds-check -fPIC diff --git a/tracy/bootstrap b/tracy/bootstrap index 31a94c6..ab3041f 100755 --- a/tracy/bootstrap +++ b/tracy/bootstrap @@ -1,6 +1,3 @@ #!/bin/sh set -x -aclocal -I config -autoheader -autoreconf -automake --add-missing --foreign --copy +autoreconf -i diff --git a/tracy/tools/Makefile.am b/tracy/tools/Makefile.am index 1568ab4..86a9d08 100644 --- a/tracy/tools/Makefile.am +++ b/tracy/tools/Makefile.am @@ -4,27 +4,25 @@ AM_CPPFLAGS = -I$(top_srcdir)/tracy/inc -I$(NUM_REC)/inc bin_PROGRAMS = soltracy #for single cpu -#bin_PROGRAMS = psoltracy # for parallel computation -#bin_PROGRAMS = max4 track_fft dynap leac #max4_SOURCES = max4.cc nrutil.c nrcheck.c nrlinwww.c nrframe.c soltracy_SOURCES = soltracy.cc nrutil.c nrcheck.c nrlinwww.c nrframe.c ../tracy/src/tracy_lib.cc -#psoltracy_SOURCES = psoltracy.cc nrutil.c nrcheck.c nrlinwww.c nrframe.c ../tracy/src/tracy_lib.cc LIBS = -L$(NUM_REC)/lib -lrecipes_c_gcc - # test factory -check_SCRIPTS = psoltracy_test1.sh psoltracy_test2.sh +check_SCRIPTS = soltracy_demo1.sh soltracy_demo2.sh TESTS = $(check_SCRIPTS) -psoltracy_test1.sh: - echo "cd check; ../psoltracy Input_ptest1.prm; mkdir check1; mv *lax *.out flatfile.dat check1" > psoltracy_test1.sh - chmod +x psoltracy_test1.sh +demodir=demo + +soltracy_demo1.sh: + echo "cd $(demodir)/demo1; ../../soltracy Input_demo1.prm;" > soltracy_demo1.sh + chmod +x soltracy_demo1.sh -psoltracy_test2.sh: - echo "cd check; ../psoltracy Input_ptest2.prm; mkdir check2; mv *lax *.out flatfile.dat check2" > psoltracy_test2.sh - chmod +x psoltracy_test2.sh +soltracy_demo2.sh: + echo "cd $(demodir)/demo2; ../../soltracy Input_demo2.prm;" > soltracy_demo2.sh + chmod +x soltracy_demo2.sh -- GitLab