Skip to content

Changes to compile on NORDIC2 #23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Changes to compile on NORDIC2 #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 20 additions & 17 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
MPICXX=mpiicpc
CXX=icpc
CXX=dpcpp

SRCDIR=./src
INCLUDEDIR=./include
Expand All @@ -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)
Expand All @@ -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)

Expand Down
1 change: 1 addition & 0 deletions include/GMDP/gmdp.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down