Skip to content
Snippets Groups Projects
Commit 1c21101f authored by Peter W. Draper's avatar Peter W. Draper
Browse files

Merge remote-tracking branch 'origin/master' into swiftmpiproxies 

Conflicts:
	Makefile
parents 8360c935 b75e6eb1
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 3 additions and 3 deletions
Makefile
+ 3
− 3
View file @ 1c21101f
......@@ -3,13 +3,13 @@ CFLAGS = -g -O0 -Wall
all: swiftmpistepsim swiftmpiproxies exchange-test
swiftmpistepsim: swiftmpistepsim.c mpiuse.c mpiuse.h atomic.h cycle.h clocks.h clocks.c
$(CC) $(CFLAGS) -o swiftmpistepsim swiftmpistepsim.c mpiuse.c clocks.c -I/usr/include/mpi -lmpi -lpthread
mpicc $(CFLAGS) -o swiftmpistepsim swiftmpistepsim.c mpiuse.c clocks.c
swiftmpiproxies: swiftmpiproxies.c mpiuse.c mpiuse.h atomic.h cycle.h clocks.h clocks.c
$(CC) $(CFLAGS) -o swiftmpiproxies swiftmpiproxies.c mpiuse.c clocks.c -I/usr/include/mpi -lmpi -lpthread
mpicc $(CFLAGS) -o swiftmpiproxies swiftmpiproxies.c mpiuse.c clocks.c
exchange-test: exchange-test.c
$(CC) $(CFLAGS) -o exchange-test exchange-test.c -I/usr/include/mpi -lmpi -lpthread
mpicc $(CFLAGS) -o exchange-test exchange-test.c
clean:
rm -f swiftmpistepsim
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment