diff --git a/test/computational_routines/gedot/Makefile b/test/computational_routines/gedot/Makefile index 7a0f8fff..f59d5c8a 100644 --- a/test/computational_routines/gedot/Makefile +++ b/test/computational_routines/gedot/Makefile @@ -8,6 +8,7 @@ include $(INCDIR)/Make.inc.psblas LIBDIR = $(INSTALLDIR)/lib/ PSBLAS_LIB = -L$(LIBDIR) -lpsb_util -lpsb_base LDLIBS = $(PSBLDLIBS) +EXEDIR = runs FINCLUDES=$(FMFLAG)$(MODDIR) $(FMFLAG). @@ -18,16 +19,20 @@ YELLOW=\033[33m END_COLOUR=\033[0m -all: psb_gedot_test +all: runsd psb_gedot_test @printf "$(GREEN)[INFO]\t Compilation success!$(END_COLOUR)\n" +runsd: + @(if test ! -d $(EXEDIR) ; then mkdir $(EXEDIR); fi) + @printf "$(BLUE)[INFO]\t Build directory $(EXEDIR)/ correctly initialized$(END_COLOUR)\n" + psb_gedot_test: - @$(FLINK) $(LOPT) psb_gedot_test.f90 ../utils/psb_test_utils.o -o psb_gedot_test -I../utils/ -I$(MODDIR) -I. $(PSBLAS_LIB) $(LDLIBS) + @$(FLINK) $(LOPT) psb_gedot_test.f90 ../utils/psb_test_utils.o -o $(EXEDIR)/psb_gedot_test -I../utils/ -I$(MODDIR) -I. $(PSBLAS_LIB) $(LDLIBS) @printf "$(BLUE)[INFO]\t Testing files for psb_gedot linked and compiled correctly$(END_COLOUR)\n" clean: @rm -f $(OBJS)\ - *$(.mod) psb_gedot_test + *$(.mod) $(EXEDIR)/psb_gedot_test .PHONY: all psb_gedot_test clean diff --git a/test/computational_routines/gedot/autotest.sh b/test/computational_routines/gedot/autotest.sh index f51bb814..fd102259 100755 --- a/test/computational_routines/gedot/autotest.sh +++ b/test/computational_routines/gedot/autotest.sh @@ -15,7 +15,7 @@ RESET="\033[0m" # Check if the executable ELF file exists -if [ ! -f "./psb_gedot_test" ]; then +if [ ! -f "./runs/psb_gedot_test" ]; then echo -e "${YELLOW}[WARNING] Executable not found. Running make...${RESET}" make if [ ! -f "./runs/psb_geaxpby_test" ]; then @@ -30,13 +30,16 @@ fi echo -e "${BLUE}[INFO]\t Running the PSBLAS psb_gedot test...${RESET}" echo "" echo -e "${BLUE}[INFO]\t Starting single process computation${RESET}" -mpirun -np 1 ./psb_gedot_test +mpirun -np 1 ./runs/psb_gedot_test echo -e "${BLUE}[INFO]\t Single process computation terminated correctly${RESET}" echo "" echo -e "${BLUE}[INFO]\t Starting $num_procs processes computation${RESET}" -mpirun -np $num_procs ./psb_gedot_test +mpirun -np $num_procs ./runs/psb_gedot_test echo -e "${BLUE}[INFO]\t Multiple processes computation terminated correctly${RESET}" +rm results/* +rm -r results/ + # echo "" >> ${log_file_name} diff --git a/test/computational_routines/gedot/psb_gedot_test b/test/computational_routines/gedot/psb_gedot_test deleted file mode 100755 index 95aa39cf..00000000 Binary files a/test/computational_routines/gedot/psb_gedot_test and /dev/null differ diff --git a/test/computational_routines/gedot/results/result_1.txt b/test/computational_routines/gedot/results/result_1.txt deleted file mode 100644 index dc88de05..00000000 --- a/test/computational_routines/gedot/results/result_1.txt +++ /dev/null @@ -1 +0,0 @@ - 25018.3417968750 diff --git a/test/computational_routines/gedot/results/result_11.txt b/test/computational_routines/gedot/results/result_11.txt deleted file mode 100644 index dc88de05..00000000 --- a/test/computational_routines/gedot/results/result_11.txt +++ /dev/null @@ -1 +0,0 @@ - 25018.3417968750 diff --git a/test/computational_routines/gedot/results/result_13.txt b/test/computational_routines/gedot/results/result_13.txt deleted file mode 100644 index 76e9693e..00000000 --- a/test/computational_routines/gedot/results/result_13.txt +++ /dev/null @@ -1 +0,0 @@ - 13.8227043152 diff --git a/test/computational_routines/gedot/results/result_15.txt b/test/computational_routines/gedot/results/result_15.txt deleted file mode 100644 index d2ba3db1..00000000 --- a/test/computational_routines/gedot/results/result_15.txt +++ /dev/null @@ -1 +0,0 @@ - 0.0000000000 diff --git a/test/computational_routines/gedot/results/result_17.txt b/test/computational_routines/gedot/results/result_17.txt deleted file mode 100644 index db066453..00000000 --- a/test/computational_routines/gedot/results/result_17.txt +++ /dev/null @@ -1 +0,0 @@ - 43.0904617310 diff --git a/test/computational_routines/gedot/results/result_19.txt b/test/computational_routines/gedot/results/result_19.txt deleted file mode 100644 index 4ee66f33..00000000 --- a/test/computational_routines/gedot/results/result_19.txt +++ /dev/null @@ -1 +0,0 @@ - -43.0904617310 diff --git a/test/computational_routines/gedot/results/result_21.txt b/test/computational_routines/gedot/results/result_21.txt deleted file mode 100644 index 380d2c47..00000000 --- a/test/computational_routines/gedot/results/result_21.txt +++ /dev/null @@ -1 +0,0 @@ - 10.9213161469 diff --git a/test/computational_routines/gedot/results/result_23.txt b/test/computational_routines/gedot/results/result_23.txt deleted file mode 100644 index d2ba3db1..00000000 --- a/test/computational_routines/gedot/results/result_23.txt +++ /dev/null @@ -1 +0,0 @@ - 0.0000000000 diff --git a/test/computational_routines/gedot/results/result_25.txt b/test/computational_routines/gedot/results/result_25.txt deleted file mode 100644 index d2ba3db1..00000000 --- a/test/computational_routines/gedot/results/result_25.txt +++ /dev/null @@ -1 +0,0 @@ - 0.0000000000 diff --git a/test/computational_routines/gedot/results/result_27.txt b/test/computational_routines/gedot/results/result_27.txt deleted file mode 100644 index d2ba3db1..00000000 --- a/test/computational_routines/gedot/results/result_27.txt +++ /dev/null @@ -1 +0,0 @@ - 0.0000000000 diff --git a/test/computational_routines/gedot/results/result_29.txt b/test/computational_routines/gedot/results/result_29.txt deleted file mode 100644 index d2ba3db1..00000000 --- a/test/computational_routines/gedot/results/result_29.txt +++ /dev/null @@ -1 +0,0 @@ - 0.0000000000 diff --git a/test/computational_routines/gedot/results/result_3.txt b/test/computational_routines/gedot/results/result_3.txt deleted file mode 100644 index 259814f5..00000000 --- a/test/computational_routines/gedot/results/result_3.txt +++ /dev/null @@ -1 +0,0 @@ - -25018.3417968750 diff --git a/test/computational_routines/gedot/results/result_31.txt b/test/computational_routines/gedot/results/result_31.txt deleted file mode 100644 index d2ba3db1..00000000 --- a/test/computational_routines/gedot/results/result_31.txt +++ /dev/null @@ -1 +0,0 @@ - 0.0000000000 diff --git a/test/computational_routines/gedot/results/result_5.txt b/test/computational_routines/gedot/results/result_5.txt deleted file mode 100644 index c9ce959e..00000000 --- a/test/computational_routines/gedot/results/result_5.txt +++ /dev/null @@ -1 +0,0 @@ - -13.8227043152 diff --git a/test/computational_routines/gedot/results/result_7.txt b/test/computational_routines/gedot/results/result_7.txt deleted file mode 100644 index d2ba3db1..00000000 --- a/test/computational_routines/gedot/results/result_7.txt +++ /dev/null @@ -1 +0,0 @@ - 0.0000000000 diff --git a/test/computational_routines/gedot/results/result_9.txt b/test/computational_routines/gedot/results/result_9.txt deleted file mode 100644 index 259814f5..00000000 --- a/test/computational_routines/gedot/results/result_9.txt +++ /dev/null @@ -1 +0,0 @@ - -25018.3417968750