From 4f248dca8a5678a9b16613a58c158cb785d4094c Mon Sep 17 00:00:00 2001 From: Will Nilges Date: Mon, 21 Nov 2022 11:14:35 -0500 Subject: [PATCH 1/4] Add UNAME_S variable to allow Linux to find files --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index 3f679f4..3cadfc3 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 From e5dc2fcadb08f42cce8696798da32c07cb341c7f Mon Sep 17 00:00:00 2001 From: Will Nilges Date: Mon, 21 Nov 2022 11:50:47 -0500 Subject: [PATCH 2/4] Add gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..567609b --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +build/ From 14e4854318ba8da4f12466dc8bfd33b960eb9664 Mon Sep 17 00:00:00 2001 From: Will Nilges Date: Mon, 21 Nov 2022 11:51:00 -0500 Subject: [PATCH 3/4] Properly reference libopenmp for Ubuntu Was giving a `output file specified twice` error because the Makefile referenced `-openmp` instead of `-fopenmp` --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 3cadfc3..97ff986 100644 --- a/Makefile +++ b/Makefile @@ -21,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) From ee1ecbd78bdaff7f11408783ff8ea00afb99ecb4 Mon Sep 17 00:00:00 2001 From: Will Nilges Date: Mon, 21 Nov 2022 12:06:56 -0500 Subject: [PATCH 4/4] Update gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 567609b..6bdc08f 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ build/ +times.csv