From e314db9dcc9008d6eb411abab6bfd349c11ca108 Mon Sep 17 00:00:00 2001 From: josh Date: Mon, 8 Dec 2008 22:57:48 +0000 Subject: [PATCH] restored printing # of cores only for nodes with id >= 1 if world_size > 1 git-svn-id: svn://anubis/gvsu@341 45c1a28c-8058-47b2-ae61-ca45b979098e --- cs677/final/Makefile | 15 +++++++++------ cs677/final/mpi-fractals.cc | 3 ++- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/cs677/final/Makefile b/cs677/final/Makefile index 2eec0a3..fb0907c 100644 --- a/cs677/final/Makefile +++ b/cs677/final/Makefile @@ -2,18 +2,21 @@ CXX := mpiCC CXXFLAGS := `sdl-config --cflags` -fopenmp LDFLAGS := `sdl-config --libs` -fopenmp -TARGET := mpi-fractals -OBJS := mpi-fractals.o -OBJS += NewtonComputation.o +TARGET1 := mpi-fractals +TARGET2 := mpi-fractals-static +OBJS := NewtonComputation.o OBJS += FatouComputation.o -all: $(TARGET) +all: $(TARGET1) $(TARGET2) -$(TARGET): $(OBJS) +$(TARGET1): $(OBJS) $(TARGET1).o + $(CXX) -o $@ $^ $(LDFLAGS) + +$(TARGET2): $(OBJS) $(TARGET2).o $(CXX) -o $@ $^ $(LDFLAGS) %.o: %.cc $(CXX) -o $@ -c $< $(CXXFLAGS) clean: - -rm -f *.o *~ $(TARGET) + -rm -f *.o *~ $(TARGET1) $(TARGET2) diff --git a/cs677/final/mpi-fractals.cc b/cs677/final/mpi-fractals.cc index 5de6339..81a9c34 100644 --- a/cs677/final/mpi-fractals.cc +++ b/cs677/final/mpi-fractals.cc @@ -268,7 +268,8 @@ void getSizes(int * rank, int * size, int * nprocs) { int total_nprocs = 0; cout << "Number of cores on each MPI node:" << endl; - for (int i = 0; i < *size; i++) + int i = (*size > 1) : 1 : 0; + for (; i < *size; i++) { cout << all_nprocs[i] << " "; total_nprocs += all_nprocs[i];