From 1b573dbac31e162680a9d25a4755fe4bf372840b Mon Sep 17 00:00:00 2001 From: Tom Deakin Date: Thu, 23 Feb 2017 15:55:45 +0000 Subject: [PATCH] Add EXTRA_FLAGS option to build line for custom extra flags --- CUDA.make | 2 +- Kokkos.make | 4 ++-- OpenCL.make | 2 +- RAJA.make | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CUDA.make b/CUDA.make index 2434754..9a7ec88 100644 --- a/CUDA.make +++ b/CUDA.make @@ -1,4 +1,4 @@ cuda-stream: main.cpp CUDAStream.cu - nvcc -std=c++11 -O3 -DCUDA $^ -o $@ + nvcc -std=c++11 -O3 -DCUDA $^ $(EXTRA_FLAGS) -o $@ diff --git a/Kokkos.make b/Kokkos.make index e30826c..78e2eaa 100644 --- a/Kokkos.make +++ b/Kokkos.make @@ -17,10 +17,10 @@ TARGET_DEF = endif kokkos-stream: main.o KOKKOSStream.o - $(CXX) $(KOKKOS_LDFLAGS) $^ $(KOKKOS_LIBS) -o $@ -DKOKKOS $(TARGET_DEF) -O3 + $(CXX) $(KOKKOS_LDFLAGS) $^ $(KOKKOS_LIBS) -o $@ -DKOKKOS $(TARGET_DEF) -O3 $(EXTRA_FLAGS) %.o:%.cpp $(KOKKOS_CPP_DEPENDS) - $(COMPILER) $(KOKKOS_CPPFLAGS) $(KOKKOS_CXXFLAGS) -c $< -DKOKKOS $(TARGET_DEF) -O3 + $(COMPILER) $(KOKKOS_CPPFLAGS) $(KOKKOS_CXXFLAGS) -c $< -DKOKKOS $(TARGET_DEF) -O3 $(EXTRA_FLAGS) .PHONY: clean clean: diff --git a/OpenCL.make b/OpenCL.make index 447deca..f48be82 100644 --- a/OpenCL.make +++ b/OpenCL.make @@ -1,4 +1,4 @@ ocl-stream: main.cpp OCLStream.cpp - $(CXX) -O3 -std=c++11 -DOCL $^ -lOpenCL -o $@ + $(CXX) -O3 -std=c++11 -DOCL $^ $(EXTRA_FLAGS) -lOpenCL -o $@ diff --git a/RAJA.make b/RAJA.make index 72cc5a6..0f9cd61 100644 --- a/RAJA.make +++ b/RAJA.make @@ -28,5 +28,5 @@ CFLAGS = --expt-extended-lambda -O3 -std=c++11 -x cu -Xcompiler -fopenmp endif raja-stream: main.cpp RAJAStream.cpp - $(COMP) $(CFLAGS) -DUSE_RAJA -I$(RAJA_PATH)/include $^ -L$(RAJA_PATH)/lib -lRAJA -o $@ + $(COMP) $(CFLAGS) -DUSE_RAJA -I$(RAJA_PATH)/include $^ $(EXTRA_FLAGS) -L$(RAJA_PATH)/lib -lRAJA -o $@