From ca07ad0be2732c80dde67cbe1785646b25762437 Mon Sep 17 00:00:00 2001 From: josh Date: Mon, 13 Oct 2008 22:23:56 +0000 Subject: [PATCH] updated floyd-parallel.cc and Makefile git-svn-id: svn://anubis/gvsu@198 45c1a28c-8058-47b2-ae61-ca45b979098e --- cs677/hw7/src/Makefile | 3 ++- cs677/hw7/src/floyd-parallel.cc | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/cs677/hw7/src/Makefile b/cs677/hw7/src/Makefile index dc4a788..acfb729 100644 --- a/cs677/hw7/src/Makefile +++ b/cs677/hw7/src/Makefile @@ -1,6 +1,7 @@ TARGETS := gen_adj_matrix TARGETS += floyd-sequential +TARGETS += floyd-parallel CXXFLAGS := -fopenmp @@ -9,7 +10,7 @@ OBJS := $(foreach target,$(TARGETS),$(target).o) all: $(TARGETS) $(TARGETS): $(OBJS) - $(CXX) -o $@ $@.o + $(CXX) -o $@ $@.o $(CXXFLAGS) clean: -rm -f *~ *.o $(TARGETS) diff --git a/cs677/hw7/src/floyd-parallel.cc b/cs677/hw7/src/floyd-parallel.cc index f1effab..de777eb 100644 --- a/cs677/hw7/src/floyd-parallel.cc +++ b/cs677/hw7/src/floyd-parallel.cc @@ -43,6 +43,7 @@ int main(int argc, char * argv[]) /* Run Floyd's Algorithm on D */ for (int k = 1; k <= num_verts; k++) { +#pragma omp parallel for for (int i = 0; i < num_verts; i++) { for (int j = 0; j < num_verts; j++)