Merge pull request #7 from lwang-astro/master

Update due to new paper
ahwkuepper · Jul 6, 2018 · 9435dc7 · 9435dc7
2 parents 04d0fe0 + 5284213
commit 9435dc7
Show file tree

Hide file tree

Showing 3 changed files with 153 additions and 69 deletions.
diff --git a/Makefile b/Makefile
@@ -29,10 +29,14 @@ mcluster_sse: $(OBJECTS) $(LFLAGS)
 	$(CC) -c main.c -D SSE -lm
 	$(CC) $(OBJECTS) main.o -o mcluster_sse -lm $(CFLAGS) 
 
-mcluster_gpu: $(OBJECTS) $(LFLAGS) gpupot.gpu.o main.c
+mcluster_ssegpu: $(OBJECTS) $(LFLAGS) gpupot.gpu.o main.c
 	$(CC) -c main.c -D SSE -D GPU -lm -I$(CUDA_PATH)/include
 	$(CC) $(OBJECTS) main.o gpupot.gpu.o  -o mcluster_gpu -L$(CUDA_PATH)/lib64 -lcudart -lstdc++ -lm $(CFLAGS) 
 
+mcluster_gpu: gpupot.gpu.o main.c
+	$(CC) -c main.c -D GPU -I$(CUDA_PATH)/include
+	$(CC) main.o gpupot.gpu.o -o mcluster_gpu -L$(CUDA_PATH)/lib64 -lcudart -lstdc++ -lm
+
 mcluster: 
 	$(CC) -o mcluster main.c -lm