Merge pull request #241 from masterleinad/fix_makefile_profiling

Fix Makefile for simple-kernel-timer and space-time-stack
kokkos · Feb 23, 2024 · 758d979 · 758d979
2 parents f67e816 + bdafe27
commit 758d979
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/profiling/simple-kernel-timer/Makefile b/profiling/simple-kernel-timer/Makefile
@@ -1,12 +1,12 @@
 CXX=g++
-CXXFLAGS=-O3 -std=c++11 -g
+CXXFLAGS=-O3 -std=c++17 -g
 SHARED_CXXFLAGS=-shared -fPIC
 
 all: kp_kernel_timer.so kp_reader kp_json_writer
 
 MAKEFILE_PATH := $(subst Makefile,,$(abspath $(lastword $(MAKEFILE_LIST))))
 
-CXXFLAGS+=-I${MAKEFILE_PATH} -I${MAKEFILE_PATH}/../../common/makefile-only -I${MAKEFILE_PATH}../all
+CXXFLAGS+=-I${MAKEFILE_PATH} -I${MAKEFILE_PATH}/../../common/makefile-only -I${MAKEFILE_PATH}../all -I${MAKEFILE_PATH}../../common
 
 kp_reader: ${MAKEFILE_PATH}kp_reader.cpp kp_kernel_timer.so
 	$(CXX) $(CXXFLAGS) -o kp_reader ${MAKEFILE_PATH}kp_reader.cpp ${MAKEFILE_PATH}kp_shared.cpp 

diff --git a/profiling/space-time-stack/Makefile b/profiling/space-time-stack/Makefile
@@ -1,12 +1,12 @@
 CXX=mpicxx
-CXXFLAGS=-shared -O3 -g -fPIC -std=c++11 -Wall -Wextra
+CXXFLAGS=-shared -O3 -g -fPIC -std=c++17 -Wall -Wextra
 
 #Turn MPI support off:
 #CXXFLAGS += -DUSE_MPI=0
 
 MAKEFILE_PATH := $(subst Makefile,,$(abspath $(lastword $(MAKEFILE_LIST))))
 
-CXXFLAGS+=-I${MAKEFILE_PATH} -I${MAKEFILE_PATH}/../../common/makefile-only -I${MAKEFILE_PATH}../all
+CXXFLAGS+=-I${MAKEFILE_PATH} -I${MAKEFILE_PATH}/../../common/makefile-only -I${MAKEFILE_PATH}../all -I${MAKEFILE_PATH}../../common
 
 kp_space_time_stack.so: ${MAKEFILE_PATH}kp_space_time_stack.cpp
 	$(CXX) $(CXXFLAGS) -o $@ $<