Commit 2170ff74 authored by Joseph Pallamidessi's avatar Joseph Pallamidessi

Add openMP support in all templates

parent 987f981a
...@@ -456,11 +456,11 @@ endif ...@@ -456,11 +456,11 @@ endif
EASEALIB_PATH=$(EZ_PATH)libeasea/ EASEALIB_PATH=$(EZ_PATH)libeasea/
CXXFLAGS = -O2 -g -Wall -fmessage-length=0 -I$(EASEALIB_PATH)include -I$(EZ_PATH)boost CXXFLAGS = -fopenmp -O2 -g -Wall -fmessage-length=0 -I$(EASEALIB_PATH)include -I$(EZ_PATH)boost
OBJS = EASEA.o EASEAIndividual.o OBJS = EASEA.o EASEAIndividual.o
LIBS = -lpthread LIBS = -lpthread -fopenmp
ifneq ("$(OS)","") ifneq ("$(OS)","")
LIBS += -lws2_32 -lwinmm -L"C:\MinGW\lib" LIBS += -lws2_32 -lwinmm -L"C:\MinGW\lib"
endif endif
......
...@@ -625,10 +625,10 @@ BIN= EASEA ...@@ -625,10 +625,10 @@ BIN= EASEA
all:$(BIN) all:$(BIN)
$(BIN):$(OBJ) $(BIN):$(OBJ)
$(NVCC) $^ -o $@ $(LDFLAGS) $(NVCC) $^ -o $@ $(LDFLAGS) -Xcompiler -fopenmp
%.o:%.cu %.o:%.cu
$(NVCC) $(NVCCFLAGS) -o $@ $< -c -DTIMING $(CPPFLAGS) -g -Xcompiler -Wall $(NVCC) $(NVCCFLAGS) -o $@ $< -c -DTIMING $(CPPFLAGS) -g -Xcompiler -fopenmp
easeaclean: clean easeaclean: clean
rm -f Makefile EASEA.prm $(SRC) $(HDR) EASEA.mak $(CUDA_SRC) *.linkinfo EASEA.png EASEA.dat EASEA.vcproj EASEA.plot EASEA.r EASEA.csv rm -f Makefile EASEA.prm $(SRC) $(HDR) EASEA.mak $(CUDA_SRC) *.linkinfo EASEA.png EASEA.dat EASEA.vcproj EASEA.plot EASEA.r EASEA.csv
......
...@@ -828,10 +828,10 @@ BIN= EASEA ...@@ -828,10 +828,10 @@ BIN= EASEA
all:$(BIN) all:$(BIN)
$(BIN):$(OBJ) $(BIN):$(OBJ)
$(NVCC) $^ -o $@ $(LDFLAGS) $(NVCC) $^ -o $@ $(LDFLAGS) -Xcompiler -fopenmp
%.o:%.cu %.o:%.cu
$(NVCC) $(NVCCFLAGS) -o $@ $< -c -DTIMING $(CPPFLAGS) -g -Xcompiler -Wall $(NVCC) $(NVCCFLAGS) -o $@ $< -c -DTIMING $(CPPFLAGS) -g -Xcompiler -fopenmp
easeaclean: clean easeaclean: clean
rm -f Makefile EASEA.prm $(SRC) $(HDR) EASEA.mak $(CUDA_SRC) *.linkinfo EASEA.png EASEA.dat EASEA.vcproj EASEA.plot EASEA.r EASEA.csv EASEA.pop rm -f Makefile EASEA.prm $(SRC) $(HDR) EASEA.mak $(CUDA_SRC) *.linkinfo EASEA.png EASEA.dat EASEA.vcproj EASEA.plot EASEA.r EASEA.csv EASEA.pop
......
...@@ -1106,10 +1106,10 @@ BIN= EASEA ...@@ -1106,10 +1106,10 @@ BIN= EASEA
all:$(BIN) all:$(BIN)
$(BIN):$(OBJ) $(BIN):$(OBJ)
$(NVCC) $^ -o $@ $(LDFLAGS) $(NVCC) $^ -o $@ $(LDFLAGS) -Xcompiler -fopenmp
%.o:%.cu %.o:%.cu
$(NVCC) $(NVCCFLAGS) -o $@ $< -c -DTIMING $(CPPFLAGS) -g -Xcompiler -Wall $(NVCC) $(NVCCFLAGS) -o $@ $< -c -DTIMING $(CPPFLAGS) -g -Xcompiler -fopenmp
easeaclean: clean easeaclean: clean
rm -f Makefile EASEA.prm $(SRC) $(HDR) EASEA.mak $(CUDA_SRC) *.linkinfo EASEA.png EASEA.dat EASEA.vcproj EASEA.plot EASEA.r EASEA.csv EASEA.pop rm -f Makefile EASEA.prm $(SRC) $(HDR) EASEA.mak $(CUDA_SRC) *.linkinfo EASEA.png EASEA.dat EASEA.vcproj EASEA.plot EASEA.r EASEA.csv EASEA.pop
......
...@@ -786,10 +786,10 @@ BIN= EASEA ...@@ -786,10 +786,10 @@ BIN= EASEA
all:$(BIN) all:$(BIN)
$(BIN):$(OBJ) $(BIN):$(OBJ)
$(NVCC) $^ -o $@ $(LDFLAGS) $(NVCC) $^ -o $@ $(LDFLAGS) -Xcompiler -fopenmp
%.o:%.cu %.o:%.cu
$(NVCC) $(NVCCFLAGS) -o $@ $< -c -DTIMING $(CPPFLAGS) -g -Xcompiler -Wall $(NVCC) $(NVCCFLAGS) -o $@ $< -c -DTIMING $(CPPFLAGS) -g -Xcompiler -fopenmp
easeaclean: clean easeaclean: clean
rm -f Makefile EASEA.prm $(SRC) $(HDR) EASEA.mak $(CUDA_SRC) *.linkinfo EASEA.png EASEA.dat EASEA.vcproj EASEA.plot EASEA.r EASEA.csv EASEA.pop rm -f Makefile EASEA.prm $(SRC) $(HDR) EASEA.mak $(CUDA_SRC) *.linkinfo EASEA.png EASEA.dat EASEA.vcproj EASEA.plot EASEA.r EASEA.csv EASEA.pop
......
...@@ -2125,10 +2125,10 @@ BIN= EASEA ...@@ -2125,10 +2125,10 @@ BIN= EASEA
all:$(BIN) all:$(BIN)
$(BIN):$(OBJ) $(BIN):$(OBJ)
$(NVCC) $^ -o $@ $(LDFLAGS) $(NVCC) $^ -o $@ $(LDFLAGS) -Xcompiler -fopenmp
%.o:%.cu %.o:%.cu
$(NVCC) $(NVCCFLAGS) -o $@ $< -c -DTIMING $(CPPFLAGS) -g -Xcompiler -Wall $(NVCC) $(NVCCFLAGS) -o $@ $< -c -DTIMING $(CPPFLAGS) -g -Xcompiler -fopenmp
easeaclean: clean easeaclean: clean
rm -f Makefile EASEA.prm $(SRC) $(HDR) EASEA.mak $(CUDA_SRC) rm -f Makefile EASEA.prm $(SRC) $(HDR) EASEA.mak $(CUDA_SRC)
......
...@@ -619,11 +619,11 @@ endif ...@@ -619,11 +619,11 @@ endif
EASEALIB_PATH=$(EZ_PATH)/libeasea/ EASEALIB_PATH=$(EZ_PATH)/libeasea/
CXXFLAGS = -O2 -g -Wall -fmessage-length=0 -I$(EASEALIB_PATH)include -I$(EZ_PATH)boost CXXFLAGS = -fopenmp -O2 -g -Wall -fmessage-length=0 -I$(EASEALIB_PATH)include -I$(EZ_PATH)boost
OBJS = EASEA.o EASEAIndividual.o OBJS = EASEA.o EASEAIndividual.o
LIBS = -lpthread LIBS = -lpthread -fopenmp
ifneq ("$(OS)","") ifneq ("$(OS)","")
LIBS += -lws2_32 -lwinmm -L"C:\MinGW\lib" LIBS += -lws2_32 -lwinmm -L"C:\MinGW\lib"
endif endif
......
...@@ -451,11 +451,11 @@ endif ...@@ -451,11 +451,11 @@ endif
EASEALIB_PATH=$(EZ_PATH)/libeasea/ EASEALIB_PATH=$(EZ_PATH)/libeasea/
CXXFLAGS = -O2 -g -Wall -fmessage-length=0 -I$(EASEALIB_PATH)include -I$(EZ_PATH)boost CXXFLAGS = -fopenmp -O2 -g -Wall -fmessage-length=0 -I$(EASEALIB_PATH)include -I$(EZ_PATH)boost
OBJS = EASEA.o EASEAIndividual.o OBJS = EASEA.o EASEAIndividual.o
LIBS = -lpthread LIBS = -lpthread -fopenmp
ifneq ("$(OS)","") ifneq ("$(OS)","")
LIBS += -lws2_32 -lwinmm -L"C:\MinGW\lib" LIBS += -lws2_32 -lwinmm -L"C:\MinGW\lib"
endif endif
......
...@@ -487,11 +487,11 @@ endif ...@@ -487,11 +487,11 @@ endif
EASEALIB_PATH=$(EZ_PATH)libeasea/ EASEALIB_PATH=$(EZ_PATH)libeasea/
CXXFLAGS = -O2 -g -Wall -fmessage-length=0 -I$(EASEALIB_PATH)include -I$(EZ_PATH)boost CXXFLAGS = -fopenmp -O2 -g -Wall -fmessage-length=0 -I$(EASEALIB_PATH)include -I$(EZ_PATH)boost
OBJS = EASEA.o EASEAIndividual.o OBJS = EASEA.o EASEAIndividual.o
LIBS = -lpthread LIBS = -lpthread -fopenmp
ifneq ("$(OS)","") ifneq ("$(OS)","")
LIBS += -lw2_32 -lwinmm -L"C:\MinGW\lib" LIBS += -lw2_32 -lwinmm -L"C:\MinGW\lib"
endif endif
......
...@@ -1678,8 +1678,8 @@ std::string setVariable(const std::string optionName, std::string defaultValue); ...@@ -1678,8 +1678,8 @@ std::string setVariable(const std::string optionName, std::string defaultValue);
NVCC= nvcc NVCC= nvcc
CPPC= g++ CPPC= g++
CXXFLAGS+=-g -Wall CXXFLAGS+=-g -Wall -fopenmp
LDFLAGS=-lboost_program_options -lboost_serialization LDFLAGS=-lboost_program_options -lboost_serialization -fopenmp
#USER MAKEFILE OPTIONS : #USER MAKEFILE OPTIONS :
\INSERT_MAKEFILE_OPTION#END OF USER MAKEFILE OPTIONS \INSERT_MAKEFILE_OPTION#END OF USER MAKEFILE OPTIONS
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment