Browse Source

minor fixes,

add: slurm script
master
Daniel Kapla 6 months ago
parent
commit
7f716ffae6
3 changed files with 15 additions and 5 deletions
  1. +2
    -2
      Exercise_01/src/Makefile
  2. +3
    -3
      Exercise_01/src/main.cpp
  3. +10
    -0
      Exercise_01/src/slurm.sh

+ 2
- 2
Exercise_01/src/Makefile View File

@@ -13,8 +13,8 @@ mpi: main.cpp Matrix.h Solver.h
all: seriel mpi

test: seriel mpi
./$(OUT)_seriel 1D 120 1000
mpirun -n 4 ./$(OUT)_mpi 2D 120 1000
./$(OUT)_seriel 1D 125 1000
mpirun -n 4 ./$(OUT)_mpi 2D 125 1000
# for script in *.R; do R --vanilla < $${script}; done

clean:

+ 3
- 3
Exercise_01/src/main.cpp View File

@@ -125,7 +125,7 @@ int main(int argn, char* argv[]) {

// Report grid topology
if (mpi_world_rank == 0) {
std::cout << "topology: " << dim << "D";
std::cout << "topology: " << dim << "D";
if (dim == 2) {
std::cout << " (" << mpi_dims[0] << " x " << mpi_dims[1] << ")";
}
@@ -159,8 +159,8 @@ int main(int argn, char* argv[]) {
mpi_comm_grid, // grid communicator
0, // axis index (0 <-> X)
1, // offset
&(mpi_neighbors.west), // negated offset neighbor
&(mpi_neighbors.east) // offset neighbor
&(mpi_neighbors.west), // negated offset neighbor
&(mpi_neighbors.east) // offset neighbor
);
// Get Y-direction (dim 1) neighbors
MPI_Cart_shift(

+ 10
- 0
Exercise_01/src/slurm.sh View File

@@ -0,0 +1,10 @@
#!/bin/bash
#SBATCH --time=00:10:00
#SBATCH -N 1 # Nr. of nodes
#SBATCH -n 10 # Total nr. of cores

DIM=2D
resolution=125
iterations=10

mpirun main_mpi $DIM $resolution $iterations

Loading…
Cancel
Save