Adding openmp optional

UofUEpiBio · Jan 31, 2024 · fbe8525 · fbe8525
1 parent 5cf626e
commit fbe8525
Show file tree

Hide file tree

Showing 17 changed files with 11 additions and 22 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -26,7 +26,7 @@ jobs:
       - name: Check
         run: |
           docker run --rm -i -v ${PWD}:/home/tests -w /home/tests ${cntr} \
-            make all-examples
+            OPENMP=-fopenmp make all-examples
   test-macos:
     runs-on: macos-latest
 
@@ -50,7 +50,7 @@ jobs:
 
       - name: Check
         run: |
-          cd tests && make main.o && ./main.o
+          cd tests && OPENMP=-fopenmp make main.o && ./main.o
           # cd tests && make 01c.o && valgrind --leak-check=full ./01c.o
 
           
diff --git a/examples/Makefile b/examples/Makefile
@@ -1,5 +1,5 @@
 VPATH = ../include/epiworld
-CPPFLAGS= -std=c++11 -Wall -pedantic -g -O2 -ftree-vectorize # -fopenmp
+CPPFLAGS= -std=c++11 -Wall -pedantic -g -O2 -ftree-vectorize $(OPENMP)
 GPP=g++
 # icpx take a look at ~/.profile
 # # /opt/intel/oneapi/setvars.sh 

diff --git a/tests/00-cloning-model-saves/README.md b/tests/00-cloning-model-saves/README.md
diff --git a/tests/00-lfmcmc-saves/README.md b/tests/00-lfmcmc-saves/README.md
diff --git a/tests/01-queue-saves/README.md b/tests/01-queue-saves/README.md
diff --git a/tests/01-sample-saves/README.md b/tests/01-sample-saves/README.md
diff --git a/tests/01-sir-saves/README.md b/tests/01-sir-saves/README.md
diff --git a/tests/01-sirconnected-saves/README.md b/tests/01-sirconnected-saves/README.md
diff --git a/tests/01b-sir-saves/README.md b/tests/01b-sir-saves/README.md
diff --git a/tests/01c-sir-saves/README.md b/tests/01c-sir-saves/README.md
diff --git a/tests/02-reproducible-sir-saves/README.md b/tests/02-reproducible-sir-saves/README.md
diff --git a/tests/02-reproducible-sirconn-saves/README.md b/tests/02-reproducible-sirconn-saves/README.md
diff --git a/tests/03-sis-saves/README.md b/tests/03-sis-saves/README.md
diff --git a/tests/04-initial-dist-saves/README.md b/tests/04-initial-dist-saves/README.md
diff --git a/tests/Makefile b/tests/Makefile
@@ -1,20 +1,20 @@
 all: main.o
 
 main.o: main.cpp clean
-	g++ -std=c++14 -Wunused -Wall -Wextra -Wnull-dereference -fdelete-null-pointer-checks -O2 -fopenmp -g -pedantic main.cpp -o main.o
+	g++ -std=c++14 -Wunused -Wall -Wextra -Wnull-dereference -fdelete-null-pointer-checks -O2 $(OPENMP) -g -pedantic main.cpp -o main.o
 
 main.a: main.cpp clean
-	clang++ -std=c++14 -Wall -Wextra -fopenmp -Wpedantic -O2 main.cpp -o main.a
+	clang++ -std=c++14 -Wall -Wextra $(OPENMP) -Wpedantic -O2 main.cpp -o main.a
 
 # Compile 02-reproducible-sirconn.cpp
 02-reproducible-sirconn.o: 02-reproducible-sirconn.cpp
-	g++ -std=c++14 -Wall -Wextra -O2 -g -fopenmp -pedantic 02-reproducible-sirconn.cpp -o 02-reproducible-sirconn.o
+	g++ -std=c++14 -Wall -Wextra -O2 -g $(OPENMP) -pedantic 02-reproducible-sirconn.cpp -o 02-reproducible-sirconn.o
 
 02.o: 02-reproducible.cpp
-	g++ -std=c++14 -Wall -Wextra -O2 -g -fopenmp -pedantic 02-reproducible.cpp -o 02.o
+	g++ -std=c++14 -Wall -Wextra -O2 -g $(OPENMP) -pedantic 02-reproducible.cpp -o 02.o
 
 01c.o: 01c-sir.cpp
-	g++ -std=c++14 -Wall -Wextra -O2 -g -fopenmp -pedantic 01c-sir.cpp -o 01c.o
+	g++ -std=c++14 -Wall -Wextra -O2 -g $(OPENMP) -pedantic 01c-sir.cpp -o 01c.o
 
 # Check coverage using the main.o target
 coverage: main.o

diff --git a/tests/main-saves/README.md b/tests/main-saves/README.md
diff --git a/tests/tests.hpp b/tests/tests.hpp
@@ -6,7 +6,9 @@
 #include <iostream>
 #include <type_traits>
 #include <exception>
-#include <omp.h>
+#if defined(_OPENMP)
+    #include <omp.h>
+#endif
 #include "../include/epiworld/epiworld.hpp"
 
 template<typename T>