From 1ce6daf7ce3380e579934e14e4b312088315dd9e Mon Sep 17 00:00:00 2001
From: Vamsi Kundeti <vamsi.k.kundeti@intel.com>
Date: Tue, 24 Jan 2023 16:57:40 -0800
Subject: [PATCH] Changes to compile on NORDIC2

---
 Makefile            | 37 ++++++++++++++++++++-----------------
 include/GMDP/gmdp.h |  1 +
 2 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/Makefile b/Makefile
index 9b91847..ac5a8b5 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 MPICXX=mpiicpc
-CXX=icpc
+CXX=dpcpp
 
 SRCDIR=./src
 INCLUDEDIR=./include
@@ -10,36 +10,39 @@ CATCHDIR=./test/Catch
 TESTDIR=./test
 TESTBINDIR=./testbin
 
-ifeq (${CXX}, icpc)
-  CXX_OPTIONS=-qopenmp -std=c++11
+
+ifeq (${CXX}, dpcpp)
+	CXX_OPTIONS=-qopenmp -std=c++11 -I/opt/intel/oneapi/mpi/latest/include
 else
-  CXX_OPTIONS=-fopenmp --std=c++11 -I/usr/include/mpi/
+	CXX_OPTIONS=-fopenmp --std=c++11 -I/usr/include/mpi/
 endif
 
-CXX_OPTIONS+=-I$(INCLUDEDIR) -I$(DIST_PRIMITIVES_PATH)
+CXX_OPTIONS+=-I$(INCLUDEDIR) -I$(DIST_PRIMITIVES_PATH) -I${BOOST_ROOT}
 
 ifeq (${debug}, 1)
-  CXX_OPTIONS += -O0 -g -D__DEBUG 
+	CXX_OPTIONS += -O0 -g -D__DEBUG 
 else
-  ifeq (${CXX}, icpc)
-    CXX_OPTIONS += -O3 -ipo 
-  else
-    CXX_OPTIONS += -O3 -flto -fwhole-program
-  endif
+	ifeq (${CXX}, dpcpp)
+	  CXX_OPTIONS += -O3 -ipo 
+	else
+	  CXX_OPTIONS += -O3 -flto -fwhole-program
+	endif
 endif
 
-ifeq (${CXX}, icpc)
-  CXX_OPTIONS += -xHost
+ifeq (${CXX}, dpcpp)
+	CXX_OPTIONS += -xHost
 else
-  CXX_OPTIONS += -march=native
+	CXX_OPTIONS += -march=native
 endif
 
 ifeq (${timing}, 1)
-  CXX_OPTIONS += -D__TIMING
+	CXX_OPTIONS += -D__TIMING
 else
 endif
 
-LD_OPTIONS += -lboost_serialization
+CXX_OPTIONS += -Wno-format -Wno-dangling-else
+
+LD_OPTIONS += -L${BOOST_ROOT}/stage/lib/ -lboost_serialization
 
 # --- Apps --- #
 sources = $(wildcard $(SRCDIR)/*.cpp)
@@ -49,7 +52,7 @@ deps = $(include_headers) $(dist_primitives_headers)
 apps = $(patsubst $(SRCDIR)/%.cpp, $(BINDIR)/%, $(sources))
 
 all: $(apps)
-	
+
 $(BINDIR)/% : $(SRCDIR)/%.cpp $(deps)  
 	$(MPICXX) -cxx=$(CXX) $(CXX_OPTIONS) -o $@ $< $(LD_OPTIONS)
 
diff --git a/include/GMDP/gmdp.h b/include/GMDP/gmdp.h
index f499d9a..26d7c31 100644
--- a/include/GMDP/gmdp.h
+++ b/include/GMDP/gmdp.h
@@ -39,6 +39,7 @@
 #include <sys/time.h>
 #include <math.h>
 #include <parallel/algorithm>
+#include <immintrin.h> // for _mm_malloc
 #include <map>
 #include <set>
 #include <string>