Commits

Piotr Dworzynski committed 8df437b

Cleaned up x86 makefiles

Comments (0)

Files changed (3)

kernel/Makefile-x86

 ##	MACROS
 ############################################################
 
-COMP = g++ #-mp-4.6 #llvm-g++  #gcc
+COMP = g++ 
 COMP_OPENMP = -fopenmp
 
-
-#MPI_COMP = openmpic++
-#MPI_COMP = g++ #-mp-4.6
-
 EXECUTABLE_NAME = ibas.bin
 TEST_EXECUTABLE_NAME = ibas_test.bin
 
-#ifndef COMP
-#COMP = $(INTEL_COMP)
-#COMP_OPENMP = $(INTEL_OPENMP)
-#endif
-
-#ifndef COMP
-#COMP = $(GNU_COMP)
-#COMP_OPENMP = $(GNU_OPENMP)
-#endif
-
-ifndef COMP
-COMP = $(CLANG_COMP)
-COMP_OPENMP = $(CLANG_OPENMP)
-endif
+ADDITIONAL_OPTS =  -O3
 
-ADDITIONAL_OPTS =  -O3 #-g -w -p #-O3 #<- this will ignore warnings
+LIBS =  -L/opt/local/lib -lboost_program_options-mt 
 
-COMMON_DIR = ../kernel-libs/common/
+TEST_LIBS = $(LIBS)  -lboost_unit_test_framework 
 
-LIBS =  -L/opt/local/lib -L../kernel-libs/boost/stage/lib/  #-L../ibas-ext-libs #-lmpi  #-lmpi_cxx -L /opt/local/lib # -L../UnitTest++/ 
+INCLUDES =  -I/opt/local/include -I./ -I../kernel-libs/ 
 
-TEST_LIBS = $(LIBS)  -lboost_unit_test_framework #-lmpi  #-lmpi_cxx -L /opt/local/lib # -L../UnitTest++/ 
-
-INCLUDES =  -I/opt/local/include -I$(COMMON_DIR) -I./ -I../kernel-libs/ -I../kernel-libs/boost/ #-I../ibas-ext-includes #-I/opt/local/include/openmpi/ -IlibUnitTest++.a
+ADDITIONAL_FILES_TO_BE_DELETED = output.out 
 
 ADDITIONAL_FILES_TO_BE_DELETED = output.out 
 
 ### EXECUTABLE
 
 $(EXECUTABLE_NAME): IbasGene.o Ibas.o DataFileReader.o FileReader.o GeneInteractionsFileReader.o InteractionScoreFileReader.o GeneInfoFileReader.o ConfigFileReader.o ProjectConfig.o GeneNetwork.o PCPListFileReader.o RocCurve.o InteractionParameters.o CVModel.o IbasGeneSet.o
-	$(COMP) -o$@ $(COMP_OPENMP) $(ADDITIONAL_OPTS) $(INCLUDES) $(LIBS) $^
+	$(COMP) -o$@ $(COMP_OPENMP) $(ADDITIONAL_OPTS) $(INCLUDES) $^ $(LIBS) 
 
 Ibas.o:	ibas.cpp 
 	$(COMP) -o$@ $(COMP_OPENMP) -c $(ADDITIONAL_OPTS) $(INCLUDES) $^
 
 all: $(EXECUTABLE_NAME) $(TEST_EXECUTABLE_NAME)
 
-abort:
-	echo Unsupported CC=$(CC), select intel or gnu
-
-publish:
-	echo Not yet supported
-	
-remote-all:
-	echo Not yet supported
 	
 
 ############################################################

kernel/Makefile-x86-broad

 EXECUTABLE_NAME = ibas.bin
 TEST_EXECUTABLE_NAME = ibas_test.bin
 
-ADDITIONAL_OPTS =  -O3 #-g -p 
+ADDITIONAL_OPTS =  -O3 
 
 LIBS = -lboost_program_options 
 
 
 ### EXECUTABLE
 
-$(EXECUTABLE_NAME): IbasGene.o Ibas.o DataFileReader.o FileReader.o GeneInteractionsFileReader.o InteractionScoreFileReader.o GeneInfoFileReader.o ConfigFileReader.o ProjectConfig.o GeneNetwork.o PCPListFileReader.o RocCurve.o InteractionParameters.o CVModel.o IbasGeneSet.o
-	$(COMP) -o$@ $(COMP_OPENMP) $(ADDITIONAL_OPTS) $(INCLUDES) $(LIBS) $^
+$(EXECUTABLE_NAME): IbasGene.o Ibas.o DataFileReader.o FileReader.o GeneInteractionsFileReader.o InteractionScoreFileReader.o GeneInfoFileReader.o ConfigFileReader.o GeneNetwork.o PCPListFileReader.o RocCurve.o InteractionParameters.o CVModel.o IbasGeneSet.o
+	$(COMP) -o$@ $(COMP_OPENMP) $(ADDITIONAL_OPTS) $(INCLUDES) $^ $(LIBS) 
 
 Ibas.o:	ibas.cpp 
 	$(COMP) -o$@ $(COMP_OPENMP) -c $(ADDITIONAL_OPTS) $(INCLUDES) $^
 FileReader.o: $(COMMON_DIR)FileReader.cpp
 	$(COMP) -o$@ $(COMP_OPENMP) -c $(ADDITIONAL_OPTS) $(INCLUDES) $^
 
-
 IbasGeneSet.o:	IbasGeneSet.cpp
 	$(COMP) -o$@ $(COMP_OPENMP) -c $(ADDITIONAL_OPTS) $(INCLUDES) $^
 
 IbasGene.o:	IbasGene.cpp
 	$(COMP) -o$@ $(COMP_OPENMP) -c $(ADDITIONAL_OPTS) $(INCLUDES) $^
 	
-ProjectConfig.o: $(COMMON_DIR)ProjectConfig.cpp
-	$(COMP) -o$@ $(COMP_OPENMP) -c $(ADDITIONAL_OPTS) $(INCLUDES) $^
-
 RocCurve.o: RocCurve.cpp
 	$(COMP) -o$@ $(COMP_OPENMP) -c $(ADDITIONAL_OPTS) $(INCLUDES) $^
 	
 
 ### TEST EXECS
 
-$(TEST_EXECUTABLE_NAME): IbasGene.o DataFileReader.o FileReader.o GeneInteractionsFileReader.o InteractionScoreFileReader.o GeneInfoFileReader.o ConfigFileReader.o ProjectConfig.o GeneNetwork.o PCPListFileReader.o RocCurve.o InteractionParameters.o IbasTest.o CVModel.o
+$(TEST_EXECUTABLE_NAME): IbasGene.o DataFileReader.o FileReader.o GeneInteractionsFileReader.o InteractionScoreFileReader.o GeneInfoFileReader.o ConfigFileReader.o GeneNetwork.o PCPListFileReader.o RocCurve.o InteractionParameters.o IbasTest.o CVModel.o
 	$(COMP) -o$@ $(COMP_OPENMP) $(ADDITIONAL_OPTS) $(INCLUDES) $(TEST_LIBS) $^
 
 IbasTest.o: ibas_test.cpp

kernel/Makefile-x86-fur

 ##	MACROS
 ############################################################
 
-COMP = g++ #-mp-4.6 #llvm-g++  #gcc
+COMP = g++ 
 COMP_OPENMP = -fopenmp
 
-
-#MPI_COMP = openmpic++
-#MPI_COMP = g++ #-mp-4.6
-
 EXECUTABLE_NAME = ibas.bin
 TEST_EXECUTABLE_NAME = ibas_test.bin
 
-#ifndef COMP
-#COMP = $(INTEL_COMP)
-#COMP_OPENMP = $(INTEL_OPENMP)
-#endif
-
-#ifndef COMP
-#COMP = $(GNU_COMP)
-#COMP_OPENMP = $(GNU_OPENMP)
-#endif
-
-ifndef COMP
-COMP = $(CLANG_COMP)
-COMP_OPENMP = $(CLANG_OPENMP)
-endif
-
 ADDITIONAL_OPTS =  -O3 -msse4.2 
 
-LIBS =  -L/opt/local/lib -lboost_program_options-mt #-L../ibas-ext-libs #-lmpi  #-lmpi_cxx -L /opt/local/lib # -L../UnitTest++/ 
+LIBS =  -lboost_program_options-mt 
 
-TEST_LIBS = $(LIBS)  -lboost_unit_test_framework #-lmpi  #-lmpi_cxx -L /opt/local/lib # -L../UnitTest++/ 
+TEST_LIBS = $(LIBS)  -lboost_unit_test_framework 
 
-INCLUDES =  -I/opt/local/include -I./ -I../kernel-libs/ #-I../ibas-ext-includes #-I/opt/local/include/openmpi/ -IlibUnitTest++.a
+INCLUDES =  -I./
 
 ADDITIONAL_FILES_TO_BE_DELETED = output.out 
 
 
-
-
-
 ############################################################
 ##	OBJECTS
 ############################################################
 
 all: $(EXECUTABLE_NAME) $(TEST_EXECUTABLE_NAME)
 
-abort:
-	echo Unsupported CC=$(CC), select intel or gnu
-
-publish:
-	echo Not yet supported
-	
-remote-all:
-	echo Not yet supported
 	
 
 ############################################################