From c69199ad0b32000f578d48a953d5049e1cff247c Mon Sep 17 00:00:00 2001
From: Serhii Yaskovets <yaskovet@mpi-cbg.de>
Date: Fri, 20 Oct 2023 18:31:29 +0200
Subject: [PATCH] Add -DTEST_RUN flag to common.mk
---
example/SparseGrid/2_gray_scott_3d_sparse_opt/Makefile | 2 +-
example/common.mk | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/example/SparseGrid/2_gray_scott_3d_sparse_opt/Makefile b/example/SparseGrid/2_gray_scott_3d_sparse_opt/Makefile
index 1079b2de5..02c296cff 100644
--- a/example/SparseGrid/2_gray_scott_3d_sparse_opt/Makefile
+++ b/example/SparseGrid/2_gray_scott_3d_sparse_opt/Makefile
@@ -8,7 +8,7 @@ gray_scott_sparse_opt_test: OPT += -DTEST_RUN
gray_scott_sparse_opt_test: gray_scott_sparse_opt
%.o: %.cpp
- $(CC) -mavx -$(OPT) -c -o $@ $< $(INCLUDE_PATH)
+ $(CC) -mavx $(OPT) -c -o $@ $< $(INCLUDE_PATH)
gray_scott_sparse_opt: $(OBJ)
$(CC) -o $@ $^ $(CFLAGS) $(LIBS_PATH) $(LIBS)
diff --git a/example/common.mk b/example/common.mk
index a6a536b74..50a44e440 100644
--- a/example/common.mk
+++ b/example/common.mk
@@ -18,7 +18,7 @@ else
CUDA_CC=mpic++ -x c++
INCLUDE_PATH_NVCC=$(INCLUDE_PATH)
CUDA_CC_LINK=mpic++
- CUDA_OPTIONS=-O3 --std=c++14 -D__NVCC__ -DCUDART_VERSION=11000
+ CUDA_OPTIONS=-O3 --std=c++14 -DTEST_RUN -D__NVCC__ -DCUDART_VERSION=11000
LIBS_SELECT=$(LIBS) -lboost_context
else
ifeq (, $(shell which nvcc))
@@ -31,7 +31,7 @@ else
INCLUDE_PATH_NVCC:=-Xcompiler=-Wno-deprecated-declarations $(INCLUDE_PATH_NVCC)
CUDA_CC=nvcc -ccbin=mpic++
CUDA_CC_LINK=nvcc -ccbin=mpic++
- CUDA_OPTIONS=-O3 --std=c++14 -use_fast_math -arch=sm_61 -lineinfo --extended-lambda --expt-relaxed-constexpr
+ CUDA_OPTIONS=-O3 --std=c++14 -DTEST_RUN -use_fast_math -arch=sm_61 -lineinfo --extended-lambda --expt-relaxed-constexpr
LIBS_SELECT=$(LIBS_NVCC)
endif
endif
@@ -46,7 +46,7 @@ else
CUDA_CC_LINK:=$(CUDA_CC_LINK)
endif
-OPT=-g -O3 --std=c++14
+OPT=-g -O3 --std=c++14 -DTEST_RUN
INCLUDE_PATH:=-Wno-deprecated-declarations $(INCLUDE_PATH)
INCLUDE_PATH_NVCC:=$(INCLUDE_PATH_NVCC) -I./include
--
GitLab