diff --git a/jacobi/mpi/SendRecv/Makefile b/jacobi/mpi/SendRecv/Makefile index 928007a35c8a7bcb7cb541ea555e785a4b810c87..d37755442afd19b56734dad95d99da5bad2da49c 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 1934487afa11994e187c6ab4b93a2e55bc66497f..6548f4b6b2d1ef3c78434166f88adac85b12801b 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 f2c3de9e0d1796034a518159f4c53a40e76919fc..3fdf888da9d4837eb7eafb51c93e53516774ce93 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 5cac9115080bc7575b22b86c68344938428b8b35..aa0427cc27994561b2d6e0aa13eb77f8f9cd8b19 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 a1d8f2e091f054f8f9488e7db35bc7444a8586a1..b6e3ba0df86a743b4f7af448d637d5b096080273 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 f2c3de9e0d1796034a518159f4c53a40e76919fc..3fdf888da9d4837eb7eafb51c93e53516774ce93 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 0000000000000000000000000000000000000000..be0cc32d813a1c58dfc2623b7c33ba4efd81bde7 --- /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 0000000000000000000000000000000000000000..1043d5ac7180019a9f27d9b8c8524c129c2df20a --- /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 928007a35c8a7bcb7cb541ea555e785a4b810c87..7013e43ef2a715a3f238199d3030392d79048527 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 32c14969a5569eba96c0668a25ae0568588429d6..31f5cdfbddd736474560463e767954e9cf870389 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 f2c3de9e0d1796034a518159f4c53a40e76919fc..3fdf888da9d4837eb7eafb51c93e53516774ce93 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 0000000000000000000000000000000000000000..be0cc32d813a1c58dfc2623b7c33ba4efd81bde7 --- /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 0000000000000000000000000000000000000000..1043d5ac7180019a9f27d9b8c8524c129c2df20a --- /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 928007a35c8a7bcb7cb541ea555e785a4b810c87..5fab606c821047892429f65740ee8f2f4f9473ec 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 41e5d7b17cd6a8c4188c44116e31a20b1df993a3..fd62c5b50dda4b59673ee638fce2fc1c584aff37 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 f2c3de9e0d1796034a518159f4c53a40e76919fc..3fdf888da9d4837eb7eafb51c93e53516774ce93 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 cf2b7db1591e480d0ebc4451bbbfc7cc074b0f7f..8b57b97d133c4acefdd2c0adc1a8966f4b6dc770 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 bafed56c0a0770db6a60fdeff9eafa2a6d5c23b1..2a18b507c5fb84155da02b47961bfdc51d4253e0 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 f2c3de9e0d1796034a518159f4c53a40e76919fc..3fdf888da9d4837eb7eafb51c93e53516774ce93 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 9a158f65c0237f7b5969e17921127a40cfab7bad..f83868ef964675323e46eabe255b84d79876d062 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 02fee4d5716a8732e0b630c23205b6174dc688be..911e34103f99fade5c989d4c1589588d139a2d26 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 75146ceeebe481679c8eee73088fd740b4fe5b63..3fdf888da9d4837eb7eafb51c93e53516774ce93 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 0000000000000000000000000000000000000000..53a1b43b137c6fdcb3cf54696925d0b310b2a369 --- /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 0000000000000000000000000000000000000000..225dedb5e28e045ac243e1f79aa9a79ee7efa546 --- /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 86d495638cbbd34c831b616944ed89375e47a43a..54b8cd61e022ef81ece11e51ad0508ca0c17fc24 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 148ba18c17fb37882dbb9e45a3fb6a07a005b2c7..bc2d48a13544cd52c435657c0cbe8239c3490887 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 01dd641863b57c577e1dcc2de14db298269cbf62..d278dc33018178b113e73ed3f93533d6e0a77861 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 55e3b7d2673ab472796fc226043b98e57802d656..d434ce25f2b9217543c5b55bf5f1bf03bef58a1c 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