diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..6bdc08f --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +build/ +times.csv diff --git a/Makefile b/Makefile index 3f679f4..97ff986 100644 --- a/Makefile +++ b/Makefile @@ -7,6 +7,7 @@ SOURCE_FILES := ifeq ($(OS), Windows_NT) SOURCE_FILES = $(shell find $(SOURCE_DIR) -name *.cpp -o -name *.cu) else + UNAME_S = $(shell uname -s) ifeq ($(UNAME_S), Linux) SOURCE_FILES = $(shell find $(SOURCE_DIR) -name '*.cpp' -o -name '*.cu') else @@ -20,7 +21,7 @@ list_sources: build: mkdir -p ${BUILD_DIR} - nvcc -x cu ${SOURCE_FILES} --std=c++11 -lineinfo -o ${BUILD_DIR}/${EXEC_FILE} -Xcompiler -openmp + nvcc -x cu ${SOURCE_FILES} --std=c++11 -lineinfo -o ${BUILD_DIR}/${EXEC_FILE} -Xcompiler -fopenmp run: ./${BUILD_DIR}/${EXEC_FILE} $(file) $(threads) $(blocks) -d $(device_id)