From d467fe8ee2e10c258abd7c95505805d5a688551d Mon Sep 17 00:00:00 2001
From: David Goz <david.goz@inaf.it>
Date: Fri, 21 Jun 2024 16:42:59 +0200
Subject: [PATCH] pleadi sbatch added
---
jacobi/mpi/SendRecv/Makefile | 3 +-
jacobi/mpi/SendRecv/make.def | 8 +--
jacobi/mpi/SendRecv/make_mpi_path | 3 +-
jacobi/mpi/Send_Recv_blocking/Makefile | 1 +
jacobi/mpi/Send_Recv_blocking/make.def | 8 +--
jacobi/mpi/Send_Recv_blocking/make_mpi_path | 3 +-
.../script/input_parameters | 10 ++++
.../Send_Recv_blocking/script/run_pleiadi.sh | 53 +++++++++++++++++++
jacobi/mpi/Send_Recv_nonblocking/Makefile | 3 +-
jacobi/mpi/Send_Recv_nonblocking/make.def | 8 +--
.../mpi/Send_Recv_nonblocking/make_mpi_path | 3 +-
.../script/input_parameters | 10 ++++
.../script/run_pleiadi.sh | 53 +++++++++++++++++++
jacobi/mpi/Send_Recv_paired/Makefile | 3 +-
jacobi/mpi/Send_Recv_paired/make.def | 8 +--
jacobi/mpi/Send_Recv_paired/make_mpi_path | 3 +-
jacobi/mpi/cartesian/Makefile | 1 +
jacobi/mpi/cartesian/make.def | 8 +--
jacobi/mpi/cartesian/make_mpi_path | 3 +-
jacobi/mpi/comp_comm/Makefile | 3 +-
jacobi/mpi/comp_comm/make.def | 8 +--
jacobi/mpi/comp_comm/make_mpi_path | 3 +-
jacobi/mpi/comp_comm/script/input_parameters | 10 ++++
jacobi/mpi/comp_comm/script/run_pleiadi.sh | 53 +++++++++++++++++++
jacobi/serial/not_opt/make.def | 8 +--
jacobi/serial/not_opt/script/run_pleiadi.sh | 4 +-
jacobi/serial/opt/Makefile | 1 +
jacobi/serial/opt/make.def | 8 +--
28 files changed, 246 insertions(+), 44 deletions(-)
create mode 100644 jacobi/mpi/Send_Recv_blocking/script/input_parameters
create mode 100755 jacobi/mpi/Send_Recv_blocking/script/run_pleiadi.sh
create mode 100644 jacobi/mpi/Send_Recv_nonblocking/script/input_parameters
create mode 100755 jacobi/mpi/Send_Recv_nonblocking/script/run_pleiadi.sh
create mode 100644 jacobi/mpi/comp_comm/script/input_parameters
create mode 100755 jacobi/mpi/comp_comm/script/run_pleiadi.sh
diff --git a/jacobi/mpi/SendRecv/Makefile b/jacobi/mpi/SendRecv/Makefile
index 928007a..d377554 100644
--- a/jacobi/mpi/SendRecv/Makefile
+++ b/jacobi/mpi/SendRecv/Makefile
@@ -17,7 +17,7 @@ include make_mpi_path
info:
@echo ' '
@echo '-----------------------------------------------------------------------------------------'
- @echo '$$ make ---> compile the mpi application '
+ @echo '$$ make mpi ---> compile the mpi application '
@echo '$$ make debug ---> compile the mpi application for debugger '
@echo '$$ make valgrind_memcheck ---> run the mpi application using Valgrind under Memcheck '
@echo '$$ make valgrind_callgrind ---> run the mpi application using Valgrind under Callgrind '
@@ -58,3 +58,4 @@ clean:
rm -f cachegrind.out.*
rm -f callgrind.*
rm -f *bin
+ rm -f jacobi_mpi_SendRecv_*
diff --git a/jacobi/mpi/SendRecv/make.def b/jacobi/mpi/SendRecv/make.def
index 1934487..6548f4b 100644
--- a/jacobi/mpi/SendRecv/make.def
+++ b/jacobi/mpi/SendRecv/make.def
@@ -1,10 +1,10 @@
-CC ?= gcc
-CFLAGS ?= -Wall -Wextra -march=native
-LIBS ?= -lm -lmpi
+CC = mpicc
+CFLAGS = -Wall -Wextra -march=native
+LIBS = -lm -lmpi
SYSTYPE = $(strip $(shell uname -n))
-PROG ?= jacobi_mpi_SendRecv_$(SYSTYPE)
+PROG = jacobi_mpi_SendRecv_$(SYSTYPE)
PROG_DEBUG = $(PROG)_DEBUG
PROG_MEMCHECK = $(PROG)_MEMCHECK
PROG_CALLGRIND = $(PROG)_CALLGRIND
diff --git a/jacobi/mpi/SendRecv/make_mpi_path b/jacobi/mpi/SendRecv/make_mpi_path
index f2c3de9..3fdf888 100644
--- a/jacobi/mpi/SendRecv/make_mpi_path
+++ b/jacobi/mpi/SendRecv/make_mpi_path
@@ -1,6 +1,7 @@
# set the MPI install path
-MPI_INSTALL_PATH = /home/gozzilla/software/openmpi/openmpi-5.0.3
+# pleiadi
+MPI_INSTALL_PATH = /opt/cluster/spack/opt/spack/linux-centos7-broadwell/gcc-11.2.0/openmpi-4.1.3-djxjqlmzbqwq76bhh3wvgxaefnoczleg
diff --git a/jacobi/mpi/Send_Recv_blocking/Makefile b/jacobi/mpi/Send_Recv_blocking/Makefile
index 5cac911..aa0427c 100644
--- a/jacobi/mpi/Send_Recv_blocking/Makefile
+++ b/jacobi/mpi/Send_Recv_blocking/Makefile
@@ -58,3 +58,4 @@ clean:
rm -f cachegrind.out.*
rm -f callgrind.*
rm -f *bin
+ rm -f jacobi_mpi_Send_Recv_blocking_*
diff --git a/jacobi/mpi/Send_Recv_blocking/make.def b/jacobi/mpi/Send_Recv_blocking/make.def
index a1d8f2e..b6e3ba0 100644
--- a/jacobi/mpi/Send_Recv_blocking/make.def
+++ b/jacobi/mpi/Send_Recv_blocking/make.def
@@ -1,10 +1,10 @@
-CC ?= gcc
-CFLAGS ?= -Wall -Wextra -march=native
-LIBS ?= -lm -lmpi
+CC = mpicc
+CFLAGS = -Wall -Wextra -march=native
+LIBS = -lm -lmpi
SYSTYPE = $(strip $(shell uname -n))
-PROG ?= jacobi_mpi_Send_Recv_blocking_$(SYSTYPE)
+PROG = jacobi_mpi_Send_Recv_blocking_$(SYSTYPE)
PROG_DEBUG = $(PROG)_DEBUG
PROG_MEMCHECK = $(PROG)_MEMCHECK
PROG_CALLGRIND = $(PROG)_CALLGRIND
diff --git a/jacobi/mpi/Send_Recv_blocking/make_mpi_path b/jacobi/mpi/Send_Recv_blocking/make_mpi_path
index f2c3de9..3fdf888 100644
--- a/jacobi/mpi/Send_Recv_blocking/make_mpi_path
+++ b/jacobi/mpi/Send_Recv_blocking/make_mpi_path
@@ -1,6 +1,7 @@
# set the MPI install path
-MPI_INSTALL_PATH = /home/gozzilla/software/openmpi/openmpi-5.0.3
+# pleiadi
+MPI_INSTALL_PATH = /opt/cluster/spack/opt/spack/linux-centos7-broadwell/gcc-11.2.0/openmpi-4.1.3-djxjqlmzbqwq76bhh3wvgxaefnoczleg
diff --git a/jacobi/mpi/Send_Recv_blocking/script/input_parameters b/jacobi/mpi/Send_Recv_blocking/script/input_parameters
new file mode 100644
index 0000000..be0cc32
--- /dev/null
+++ b/jacobi/mpi/Send_Recv_blocking/script/input_parameters
@@ -0,0 +1,10 @@
+##########################################################################
+
+# set the grid size
+
+GRID_SIZE_X=128
+GRID_SIZE_Y=128
+
+TASKS=(2 4 8)
+
+##########################################################################
diff --git a/jacobi/mpi/Send_Recv_blocking/script/run_pleiadi.sh b/jacobi/mpi/Send_Recv_blocking/script/run_pleiadi.sh
new file mode 100755
index 0000000..1043d5a
--- /dev/null
+++ b/jacobi/mpi/Send_Recv_blocking/script/run_pleiadi.sh
@@ -0,0 +1,53 @@
+#!/bin/bash
+
+######################### RESOURSE ALLOCATION #####################################
+##SBATCH --account=????????
+
+#SBATCH --partition=pleiadi
+#SBATCH --job-name="Jacobi"
+#SBATCH --nodes=1
+#SBATCH --exclusive
+#SBATCH --output=Jacobi-mpi-Send_Recv_nonblocking-%j.out
+#SBATCH --error=Jacobi-mpi-Send_Recv_nonblocking.%j.err
+#SBATCH --time=00:05:00
+###################################################################################
+
+################################## MODULES ########################################
+export MODULE_VERSION=5.0.1
+source /opt/cluster/spack/share/spack/setup-env.sh
+
+# module purge
+module purge
+# load GCC
+module load default-gcc-11.2.0
+###################################################################################
+
+# input parameters
+source input_parameters
+
+WORKDIR=${PWD}
+# compile the application
+cd .. && make clean && make mpi
+if [[ "$?" != "0" ]]
+then
+ echo "Cannot compile the application ...aborting..."
+ exit 1
+fi
+
+# get the executable
+EXEC=$(find $(realpath ./) -maxdepth 1 -executable -name "jacobi_*" -type f -print)
+if [[ "$?" != "0" ]]
+then
+ echo "Cannot find the executable ...aborting..."
+ exit 2
+fi
+
+for TASK in ${TASKS[@]}
+do
+ # run the application
+ time mpirun -n ${TASK} ${EXEC} ${GRID_SIZE_X} ${GRID_SIZE_Y} |& tee ${EXEC}_TASK_${TASK}_output.txt
+done
+
+cd ${WORKDIR}
+
+exit 0
diff --git a/jacobi/mpi/Send_Recv_nonblocking/Makefile b/jacobi/mpi/Send_Recv_nonblocking/Makefile
index 928007a..7013e43 100644
--- a/jacobi/mpi/Send_Recv_nonblocking/Makefile
+++ b/jacobi/mpi/Send_Recv_nonblocking/Makefile
@@ -17,7 +17,7 @@ include make_mpi_path
info:
@echo ' '
@echo '-----------------------------------------------------------------------------------------'
- @echo '$$ make ---> compile the mpi application '
+ @echo '$$ make mpi ---> compile the mpi application '
@echo '$$ make debug ---> compile the mpi application for debugger '
@echo '$$ make valgrind_memcheck ---> run the mpi application using Valgrind under Memcheck '
@echo '$$ make valgrind_callgrind ---> run the mpi application using Valgrind under Callgrind '
@@ -58,3 +58,4 @@ clean:
rm -f cachegrind.out.*
rm -f callgrind.*
rm -f *bin
+ rm -f jacobi_mpi_Send_Recv_nonblocking_*
diff --git a/jacobi/mpi/Send_Recv_nonblocking/make.def b/jacobi/mpi/Send_Recv_nonblocking/make.def
index 32c1496..31f5cdf 100644
--- a/jacobi/mpi/Send_Recv_nonblocking/make.def
+++ b/jacobi/mpi/Send_Recv_nonblocking/make.def
@@ -1,10 +1,10 @@
-CC ?= gcc
-CFLAGS ?= -Wall -Wextra -march=native
-LIBS ?= -lm -lmpi
+CC = mpicc
+CFLAGS = -Wall -Wextra -march=native
+LIBS = -lm -lmpi
SYSTYPE = $(strip $(shell uname -n))
-PROG ?= jacobi_mpi_Send_Recv_nonblocking_$(SYSTYPE)
+PROG = jacobi_mpi_Send_Recv_nonblocking_$(SYSTYPE)
PROG_DEBUG = $(PROG)_DEBUG
PROG_MEMCHECK = $(PROG)_MEMCHECK
PROG_CALLGRIND = $(PROG)_CALLGRIND
diff --git a/jacobi/mpi/Send_Recv_nonblocking/make_mpi_path b/jacobi/mpi/Send_Recv_nonblocking/make_mpi_path
index f2c3de9..3fdf888 100644
--- a/jacobi/mpi/Send_Recv_nonblocking/make_mpi_path
+++ b/jacobi/mpi/Send_Recv_nonblocking/make_mpi_path
@@ -1,6 +1,7 @@
# set the MPI install path
-MPI_INSTALL_PATH = /home/gozzilla/software/openmpi/openmpi-5.0.3
+# pleiadi
+MPI_INSTALL_PATH = /opt/cluster/spack/opt/spack/linux-centos7-broadwell/gcc-11.2.0/openmpi-4.1.3-djxjqlmzbqwq76bhh3wvgxaefnoczleg
diff --git a/jacobi/mpi/Send_Recv_nonblocking/script/input_parameters b/jacobi/mpi/Send_Recv_nonblocking/script/input_parameters
new file mode 100644
index 0000000..be0cc32
--- /dev/null
+++ b/jacobi/mpi/Send_Recv_nonblocking/script/input_parameters
@@ -0,0 +1,10 @@
+##########################################################################
+
+# set the grid size
+
+GRID_SIZE_X=128
+GRID_SIZE_Y=128
+
+TASKS=(2 4 8)
+
+##########################################################################
diff --git a/jacobi/mpi/Send_Recv_nonblocking/script/run_pleiadi.sh b/jacobi/mpi/Send_Recv_nonblocking/script/run_pleiadi.sh
new file mode 100755
index 0000000..1043d5a
--- /dev/null
+++ b/jacobi/mpi/Send_Recv_nonblocking/script/run_pleiadi.sh
@@ -0,0 +1,53 @@
+#!/bin/bash
+
+######################### RESOURSE ALLOCATION #####################################
+##SBATCH --account=????????
+
+#SBATCH --partition=pleiadi
+#SBATCH --job-name="Jacobi"
+#SBATCH --nodes=1
+#SBATCH --exclusive
+#SBATCH --output=Jacobi-mpi-Send_Recv_nonblocking-%j.out
+#SBATCH --error=Jacobi-mpi-Send_Recv_nonblocking.%j.err
+#SBATCH --time=00:05:00
+###################################################################################
+
+################################## MODULES ########################################
+export MODULE_VERSION=5.0.1
+source /opt/cluster/spack/share/spack/setup-env.sh
+
+# module purge
+module purge
+# load GCC
+module load default-gcc-11.2.0
+###################################################################################
+
+# input parameters
+source input_parameters
+
+WORKDIR=${PWD}
+# compile the application
+cd .. && make clean && make mpi
+if [[ "$?" != "0" ]]
+then
+ echo "Cannot compile the application ...aborting..."
+ exit 1
+fi
+
+# get the executable
+EXEC=$(find $(realpath ./) -maxdepth 1 -executable -name "jacobi_*" -type f -print)
+if [[ "$?" != "0" ]]
+then
+ echo "Cannot find the executable ...aborting..."
+ exit 2
+fi
+
+for TASK in ${TASKS[@]}
+do
+ # run the application
+ time mpirun -n ${TASK} ${EXEC} ${GRID_SIZE_X} ${GRID_SIZE_Y} |& tee ${EXEC}_TASK_${TASK}_output.txt
+done
+
+cd ${WORKDIR}
+
+exit 0
diff --git a/jacobi/mpi/Send_Recv_paired/Makefile b/jacobi/mpi/Send_Recv_paired/Makefile
index 928007a..5fab606 100644
--- a/jacobi/mpi/Send_Recv_paired/Makefile
+++ b/jacobi/mpi/Send_Recv_paired/Makefile
@@ -17,7 +17,7 @@ include make_mpi_path
info:
@echo ' '
@echo '-----------------------------------------------------------------------------------------'
- @echo '$$ make ---> compile the mpi application '
+ @echo '$$ make mpi ---> compile the mpi application '
@echo '$$ make debug ---> compile the mpi application for debugger '
@echo '$$ make valgrind_memcheck ---> run the mpi application using Valgrind under Memcheck '
@echo '$$ make valgrind_callgrind ---> run the mpi application using Valgrind under Callgrind '
@@ -58,3 +58,4 @@ clean:
rm -f cachegrind.out.*
rm -f callgrind.*
rm -f *bin
+ rm -f jacobi_mpi_Send_Recv_paired_*
diff --git a/jacobi/mpi/Send_Recv_paired/make.def b/jacobi/mpi/Send_Recv_paired/make.def
index 41e5d7b..fd62c5b 100644
--- a/jacobi/mpi/Send_Recv_paired/make.def
+++ b/jacobi/mpi/Send_Recv_paired/make.def
@@ -1,10 +1,10 @@
-CC ?= gcc
-CFLAGS ?= -Wall -Wextra -march=native
-LIBS ?= -lm -lmpi
+CC = mpicc
+CFLAGS = -Wall -Wextra -march=native
+LIBS = -lm -lmpi
SYSTYPE = $(strip $(shell uname -n))
-PROG ?= jacobi_mpi_Send_Recv_paired_$(SYSTYPE)
+PROG = jacobi_mpi_Send_Recv_paired_$(SYSTYPE)
PROG_DEBUG = $(PROG)_DEBUG
PROG_MEMCHECK = $(PROG)_MEMCHECK
PROG_CALLGRIND = $(PROG)_CALLGRIND
diff --git a/jacobi/mpi/Send_Recv_paired/make_mpi_path b/jacobi/mpi/Send_Recv_paired/make_mpi_path
index f2c3de9..3fdf888 100644
--- a/jacobi/mpi/Send_Recv_paired/make_mpi_path
+++ b/jacobi/mpi/Send_Recv_paired/make_mpi_path
@@ -1,6 +1,7 @@
# set the MPI install path
-MPI_INSTALL_PATH = /home/gozzilla/software/openmpi/openmpi-5.0.3
+# pleiadi
+MPI_INSTALL_PATH = /opt/cluster/spack/opt/spack/linux-centos7-broadwell/gcc-11.2.0/openmpi-4.1.3-djxjqlmzbqwq76bhh3wvgxaefnoczleg
diff --git a/jacobi/mpi/cartesian/Makefile b/jacobi/mpi/cartesian/Makefile
index cf2b7db..8b57b97 100644
--- a/jacobi/mpi/cartesian/Makefile
+++ b/jacobi/mpi/cartesian/Makefile
@@ -58,3 +58,4 @@ clean:
rm -f cachegrind.out.*
rm -f callgrind.*
rm -f *bin
+ rm -f jacobi_mpi_cartesian_*
diff --git a/jacobi/mpi/cartesian/make.def b/jacobi/mpi/cartesian/make.def
index bafed56..2a18b50 100644
--- a/jacobi/mpi/cartesian/make.def
+++ b/jacobi/mpi/cartesian/make.def
@@ -1,10 +1,10 @@
-CC ?= gcc
-CFLAGS ?= -Wall -Wextra -march=native
-LIBS ?= -lm -lmpi
+CC = mpicc
+CFLAGS = -Wall -Wextra -march=native
+LIBS = -lm -lmpi
SYSTYPE = $(strip $(shell uname -n))
-PROG ?= jacobi_mpi_cartesian_$(SYSTYPE)
+PROG = jacobi_mpi_cartesian_$(SYSTYPE)
PROG_DEBUG = $(PROG)_DEBUG
PROG_MEMCHECK = $(PROG)_MEMCHECK
PROG_CALLGRIND = $(PROG)_CALLGRIND
diff --git a/jacobi/mpi/cartesian/make_mpi_path b/jacobi/mpi/cartesian/make_mpi_path
index f2c3de9..3fdf888 100644
--- a/jacobi/mpi/cartesian/make_mpi_path
+++ b/jacobi/mpi/cartesian/make_mpi_path
@@ -1,6 +1,7 @@
# set the MPI install path
-MPI_INSTALL_PATH = /home/gozzilla/software/openmpi/openmpi-5.0.3
+# pleiadi
+MPI_INSTALL_PATH = /opt/cluster/spack/opt/spack/linux-centos7-broadwell/gcc-11.2.0/openmpi-4.1.3-djxjqlmzbqwq76bhh3wvgxaefnoczleg
diff --git a/jacobi/mpi/comp_comm/Makefile b/jacobi/mpi/comp_comm/Makefile
index 9a158f6..f83868e 100644
--- a/jacobi/mpi/comp_comm/Makefile
+++ b/jacobi/mpi/comp_comm/Makefile
@@ -17,7 +17,7 @@ include make_mpi_path
info:
@echo ' '
@echo '-----------------------------------------------------------------------------------------'
- @echo '$$ make ---> compile the mpi application '
+ @echo '$$ make mpi ---> compile the mpi application '
@echo '$$ make debug ---> compile the mpi application for debugging '
@echo '$$ make valgrind_memcheck ---> run the mpi application using Valgrind under Memcheck '
@echo '$$ make valgrind_callgrind ---> run the mpi application using Valgrind under Callgrind '
@@ -58,3 +58,4 @@ clean:
rm -f cachegrind.out.*
rm -f callgrind.*
rm -f *bin
+ rm -f jacobi_mpi_comp_comm_*
diff --git a/jacobi/mpi/comp_comm/make.def b/jacobi/mpi/comp_comm/make.def
index 02fee4d..911e341 100644
--- a/jacobi/mpi/comp_comm/make.def
+++ b/jacobi/mpi/comp_comm/make.def
@@ -1,10 +1,10 @@
-CC ?= gcc
-CFLAGS ?= -Wall -Wextra -march=native
-LIBS ?= -lm -lmpi
+CC = mpicc
+CFLAGS = -Wall -Wextra -march=native
+LIBS = -lm -lmpi
SYSTYPE = $(strip $(shell uname -n))
-PROG ?= jacobi_mpi_comp_comm_$(SYSTYPE)
+PROG = jacobi_mpi_comp_comm_$(SYSTYPE)
PROG_DEBUG = $(PROG)_DEBUG
PROG_MEMCHECK = $(PROG)_MEMCHECK
PROG_CALLGRIND = $(PROG)_CALLGRIND
diff --git a/jacobi/mpi/comp_comm/make_mpi_path b/jacobi/mpi/comp_comm/make_mpi_path
index 75146ce..3fdf888 100644
--- a/jacobi/mpi/comp_comm/make_mpi_path
+++ b/jacobi/mpi/comp_comm/make_mpi_path
@@ -1,6 +1,7 @@
# set the MPI install path
-MPI_INSTALL_PATH = /home/darkenergy/software/openmpi/openmpi-5.0.3
+# pleiadi
+MPI_INSTALL_PATH = /opt/cluster/spack/opt/spack/linux-centos7-broadwell/gcc-11.2.0/openmpi-4.1.3-djxjqlmzbqwq76bhh3wvgxaefnoczleg
diff --git a/jacobi/mpi/comp_comm/script/input_parameters b/jacobi/mpi/comp_comm/script/input_parameters
new file mode 100644
index 0000000..53a1b43
--- /dev/null
+++ b/jacobi/mpi/comp_comm/script/input_parameters
@@ -0,0 +1,10 @@
+##########################################################################
+
+# set the grid size
+
+GRID_SIZE_X=128
+GRID_SIZE_Y=128
+
+TASKS=(2 4 8 16)
+
+##########################################################################
diff --git a/jacobi/mpi/comp_comm/script/run_pleiadi.sh b/jacobi/mpi/comp_comm/script/run_pleiadi.sh
new file mode 100755
index 0000000..225dedb
--- /dev/null
+++ b/jacobi/mpi/comp_comm/script/run_pleiadi.sh
@@ -0,0 +1,53 @@
+#!/bin/bash
+
+######################### RESOURSE ALLOCATION #####################################
+##SBATCH --account=????????
+
+#SBATCH --partition=pleiadi
+#SBATCH --job-name="Jacobi"
+#SBATCH --nodes=1
+#SBATCH --exclusive
+#SBATCH --output=Jacobi-mpi-comp-comm-%j.out
+#SBATCH --error=Jacobi-mpi-comp-comm.%j.err
+#SBATCH --time=00:05:00
+###################################################################################
+
+################################## MODULES ########################################
+export MODULE_VERSION=5.0.1
+source /opt/cluster/spack/share/spack/setup-env.sh
+
+# module purge
+module purge
+# load GCC
+module load default-gcc-11.2.0
+###################################################################################
+
+# input parameters
+source input_parameters
+
+WORKDIR=${PWD}
+# compile the application
+cd .. && make clean && make mpi
+if [[ "$?" != "0" ]]
+then
+ echo "Cannot compile the application ...aborting..."
+ exit 1
+fi
+
+# get the executable
+EXEC=$(find $(realpath ./) -maxdepth 1 -executable -name "jacobi_*" -type f -print)
+if [[ "$?" != "0" ]]
+then
+ echo "Cannot find the executable ...aborting..."
+ exit 2
+fi
+
+for TASK in ${TASKS[@]}
+do
+ # run the application
+ time mpirun -n ${TASK} ${EXEC} ${GRID_SIZE_X} ${GRID_SIZE_Y} |& tee ${EXEC}_TASK_${TASK}_output.txt
+done
+
+cd ${WORKDIR}
+
+exit 0
diff --git a/jacobi/serial/not_opt/make.def b/jacobi/serial/not_opt/make.def
index 86d4956..54b8cd6 100644
--- a/jacobi/serial/not_opt/make.def
+++ b/jacobi/serial/not_opt/make.def
@@ -1,10 +1,10 @@
-CC ?= gcc
-CFLAGS ?= -Wall -Wextra -march=native
-LIBS ?= -lm
+CC = gcc
+CFLAGS = -Wall -Wextra -march=native
+LIBS = -lm
SYSTYPE = $(strip $(shell uname -n))
-PROG ?= jacobi_serial_not_opt_$(SYSTYPE)
+PROG = jacobi_serial_not_opt_$(SYSTYPE)
PROG_DEBUG = $(PROG)_DEBUG
PROG_MEMCHECK = $(PROG)_MEMCHECK
PROG_CALLGRIND = $(PROG)_CALLGRIND
diff --git a/jacobi/serial/not_opt/script/run_pleiadi.sh b/jacobi/serial/not_opt/script/run_pleiadi.sh
index 148ba18..bc2d48a 100755
--- a/jacobi/serial/not_opt/script/run_pleiadi.sh
+++ b/jacobi/serial/not_opt/script/run_pleiadi.sh
@@ -4,7 +4,7 @@
##SBATCH --account=????????
#SBATCH --partition=pleiadi
-#SBATCH --job-name="Jabobi"
+#SBATCH --job-name="Jacobi"
#SBATCH --nodes=1
#SBATCH --ntasks-per-node=1
#SBATCH --cpus-per-task=1
@@ -28,7 +28,7 @@ source input_parameters
WORKDIR=${PWD}
# compile the application
-cd .. && make serial
+cd .. && make clean && make serial
if [[ "$?" != "0" ]]
then
echo "Cannot compile the application ...aborting..."
diff --git a/jacobi/serial/opt/Makefile b/jacobi/serial/opt/Makefile
index 01dd641..d278dc3 100644
--- a/jacobi/serial/opt/Makefile
+++ b/jacobi/serial/opt/Makefile
@@ -60,3 +60,4 @@ clean:
rm -f cachegrind.out.*
rm -f callgrind.*
rm -f *bin
+ rm -f jacobi_serial_opt_*
diff --git a/jacobi/serial/opt/make.def b/jacobi/serial/opt/make.def
index 55e3b7d..d434ce2 100644
--- a/jacobi/serial/opt/make.def
+++ b/jacobi/serial/opt/make.def
@@ -1,10 +1,10 @@
-CC ?= gcc
-CFLAGS ?= -Wall -Wextra -march=native
-LIBS ?= -lm
+CC = gcc
+CFLAGS = -Wall -Wextra -march=native
+LIBS = -lm
SYSTYPE = $(strip $(shell uname -n))
-PROG ?= jacobi_serial_opt_$(SYSTYPE)
+PROG = jacobi_serial_opt_$(SYSTYPE)
PROG_DEBUG = $(PROG)_DEBUG
PROG_MEMCHECK = $(PROG)_MEMCHECK
PROG_CALLGRIND = $(PROG)_CALLGRIND
--
GitLab