X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=Robust%2Fsrc%2FBenchmarks%2FoooJava%2Fkmeans%2Fmakefile;h=525ca78f10bb9be33be81e2ef884c364e797ba6a;hb=77aaabdf59bc4a475f8544a5dda6471e23b9c5d7;hp=3d03c798f4d3d85b758088c196b4338e009708ba;hpb=b02b6af1183d19037536a42c6683b58defd4ccab;p=IRC.git

diff --git a/Robust/src/Benchmarks/oooJava/kmeans/makefile b/Robust/src/Benchmarks/oooJava/kmeans/makefile
index 3d03c798..525ca78f 100644
--- a/Robust/src/Benchmarks/oooJava/kmeans/makefile
+++ b/Robust/src/Benchmarks/oooJava/kmeans/makefile
@@ -1,53 +1,9 @@
 PROGRAM=KMeans
-BUILDSCRIPT=../../../buildscript
 SOURCE_FILES=${PROGRAM}.java \
 	Random.java \
 	Cluster.java \
-    Normal.java \
-    Common.java \
-    GlobalArgs.java 
+	Normal.java \
+	Common.java \
+	GlobalArgs.java 
 
-
-COREPROFOVERFLOW= #-coreprof-checkoverflow
-USECOREPROF= -coreprof $(COREPROFOVERFLOW) \
-	-coreprof-eventwords 1024*1024*128 \
-	-coreprof-enable cpe_main \
-	-coreprof-enable cpe_taskdispatch
-#	-coreprof-enable cpe_runmalloc \
-#	-coreprof-enable cpe_runfree \
-#	-coreprof-enable cpe_count_poolalloc \
-#	-coreprof-enable cpe_count_poolreuse \
-#	-coreprof-enable cpe_workschedgrab \
-#	-coreprof-enable cpe_taskexecute \
-#	-coreprof-enable cpe_taskretire \
-#	-coreprof-enable cpe_taskstallvar \
-#	-coreprof-enable cpe_taskstallmem
-
-
-USEOOO= -ooojava 24 2  -ooodebug -ooodebug-disable-task-mem-pool 
-BSFLAGS= -64bit -mainclass $(PROGRAM)  -heapsize-mb 1024 -garbagestats -debug -joptimize -noloop -optimize 
-
-DRELEASEMODE=-disjoint-release-mode -disjoint-alias-file aliases.txt tabbed
-DISJOINT= -disjoint -disjoint-k 1 -enable-assertions $(DRELEASEMODE) #-disjoint-desire-determinism
-
-default:
-	$(BUILDSCRIPT) -nojava $(BSFLAGS) $(USECOREPROF) $(USEOOO) $(DISJOINT) -o $(PROGRAM)p -builddir par  $(SOURCE_FILES)
-
-single:
-	$(BUILDSCRIPT) -thread $(BSFLAGS) $(USECOREPROF)                       -o $(PROGRAM)s -builddir sing $(SOURCE_FILES) 
-
-ooo:
-	$(BUILDSCRIPT)         $(BSFLAGS) $(USECOREPROF) $(USEOOO) $(DISJOINT) -o $(PROGRAM)p -builddir par  $(SOURCE_FILES) 
-
-clean:
-	rm -f  $(PROGRAM)p.bin $(PROGRAM)s.bin
-	rm -fr par sing
-	rm -f  *~
-	rm -f  *.dot
-	rm -f  *.png
-	rm -f  *.txt
-	rm -f  aliases.txt
-	rm -f  mlpReport*txt
-	rm -f  results*txt
-	rm -f coreprof.dat
-	rm -f trace.out
+include ../master-makefile