remove omp code

jeduardobras · May 4, 2021 · e674210 · e674210
1 parent 49330f2
commit e674210
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 367 deletions.
diff --git a/make_omp_submission.sh b/make_omp_submission.sh
diff --git a/src/Makefile b/src/Makefile
@@ -1,26 +1,15 @@
 # C compiler to use
 CC = gcc
 
-#C compiler for omp
-CC_OMPP = kinst-ompp gcc
-
 # Flags for the compiler
 CFLAGS = -O3 -Wall
 
 # Flags for the linker
 LDFLAGS = -lm
 
-.PHONY: all ompp clean zip
-
-all: ballAlg ballAlg-omp ballQuery
-
-ompp: ballAlg-ompp
+.PHONY: all clean zip
 
-ballAlg-ompp: ballAlg-omp.c gen_points.o point_operations.o ball_tree.o
-	$(CC_OMPP) $(CFLAGS) -fopenmp -o $@ $^ ${LDFLAGS}
-
-ballAlg-omp: ballAlg-omp.c gen_points.o point_operations.o ball_tree.o merge_sort.o
-	$(CC) $(CFLAGS) -fopenmp -o $@ $^ ${LDFLAGS}
+all: ballAlg ballQuery
 
 ballAlg: ballAlg.c gen_points.o point_operations.o ball_tree.o 
 	$(CC) $(CFLAGS) -fopenmp -o $@ $^ ${LDFLAGS}
@@ -31,17 +20,14 @@ ball_tree.o: ball_tree.c
 gen_points.o: gen_points.c
 	$(CC) $(CFLAGS) -c $^
 
-merge_sort.o: merge_sort.c
-	$(CC) $(CFLAGS) -fopenmp -c $^	
-
 point_operations.o: point_operations.c
 	$(CC) $(CFLAGS) -c $^
 
 ballQuery: ballQuery.c
 	$(CC) $(CFLAGS) -o $@ $^ ${LDFLAGS}
 
 clean:
-	@rm -f ballAlg ballQuery ballAlg-omp
+	@rm -f ballAlg ballQuery 
 	@rm -f *.o
 	@rm -f *.zip
 

diff --git a/src/ballAlg-omp.c b/src/ballAlg-omp.c
diff --git a/src/merge_sort.c b/src/merge_sort.c