cory-master/BabelStream
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use CXXFLAGS everywhere for consistency

Browse Source
This commit is contained in:
James Price 2017-02-23 18:39:40 +00:00
parent 063446b6a7
commit d78baa4c2b
3 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenACC.make
View File

@ -23,8 +23,8 @@ FLAGS_PGI += -ta=multicore
endif endif
FLAGS_CRAY = -hstd=c++11 FLAGS_CRAY = -hstd=c++11
CFLAGS = $(FLAGS_$(COMPILER)) CXXFLAGS = $(FLAGS_$(COMPILER))
acc-stream: main.cpp ACCStream.cpp acc-stream: main.cpp ACCStream.cpp
$(CXX) $(CFLAGS) -DACC $^ $(EXTRA_FLAGS) -o $@ $(CXX) $(CXXFLAGS) -DACC $^ $(EXTRA_FLAGS) -o $@

4
OpenCL.make
View File

@ -10,8 +10,8 @@ COMPILER_CRAY = CC
FLAGS_ = -O3 FLAGS_ = -O3
FLAGS_GNU = -O3 -std=c++11 FLAGS_GNU = -O3 -std=c++11
FLAGS_CRAY = -O3 -hstd=c++11 FLAGS_CRAY = -O3 -hstd=c++11
CFLAGS=$(FLAGS_$(COMPILER)) CXXFLAGS=$(FLAGS_$(COMPILER))
ocl-stream: main.cpp OCLStream.cpp ocl-stream: main.cpp OCLStream.cpp
$(COMPILER_$(COMPILER)) $(CFLAGS) -DOCL $^ $(EXTRA_FLAGS) -lOpenCL -o $@ $(COMPILER_$(COMPILER)) $(CXXFLAGS) -DOCL $^ $(EXTRA_FLAGS) -lOpenCL -o $@

13
RAJA.make
View File

@ -6,20 +6,20 @@ endif
ifeq ($(TARGET), CPU) ifeq ($(TARGET), CPU)
COMP=$(CXX) COMP=$(CXX)
CFLAGS = -O3 -std=c++11 -DRAJA_TARGET_CPU CXXFLAGS = -O3 -std=c++11 -DRAJA_TARGET_CPU
ifndef COMPILER ifndef COMPILER
$(error No COMPILER defined. Specify COMPILER for correct OpenMP flag.) $(error No COMPILER defined. Specify COMPILER for correct OpenMP flag.)
endif endif
ifeq ($(COMPILER), INTEL) ifeq ($(COMPILER), INTEL)
COMP = icpc COMP = icpc
CFLAGS += -qopenmp CXXFLAGS += -qopenmp
else ifeq ($(COMPILER), GNU) else ifeq ($(COMPILER), GNU)
COMP = g++ COMP = g++
CFLAGS += -fopenmp CXXFLAGS += -fopenmp
else ifeq ($(COMPILER), CRAY) else ifeq ($(COMPILER), CRAY)
COMP = CC COMP = CC
CFLAGS += CXXFLAGS +=
endif endif
else ifeq ($(TARGET), GPU) else ifeq ($(TARGET), GPU)
@ -28,9 +28,8 @@ COMP = nvcc
ifndef ARCH ifndef ARCH
$(error No ARCH defined. Specify target GPU architecture (e.g. ARCH=sm_35)) $(error No ARCH defined. Specify target GPU architecture (e.g. ARCH=sm_35))
endif endif
CFLAGS = --expt-extended-lambda -O3 -std=c++11 -x cu -Xcompiler -fopenmp -arch $(ARCH) CXXFLAGS = --expt-extended-lambda -O3 -std=c++11 -x cu -Xcompiler -fopenmp -arch $(ARCH)
endif endif
raja-stream: main.cpp RAJAStream.cpp raja-stream: main.cpp RAJAStream.cpp
$(COMP) $(CFLAGS) -DUSE_RAJA -I$(RAJA_PATH)/include $^ $(EXTRA_FLAGS) -L$(RAJA_PATH)/lib -lRAJA -o $@ $(COMP) $(CXXFLAGS) -DUSE_RAJA -I$(RAJA_PATH)/include $^ $(EXTRA_FLAGS) -L$(RAJA_PATH)/lib -lRAJA -o $@