[UPDATE] Changed compilation structure in gedot and added cleanup in autotes.sh, in order to remove files generated during the multi-process test phase

test_dev
Stack-1 10 months ago
parent 20bcd553ca
commit 448a6d6e0a

@ -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

@ -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}

Loading…
Cancel
Save