Skip to content
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

Jump to bottom

Makefile cleanup #1

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Makefile cleanup #1

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
07e0c2e
Add TBB headers and library path
trilean May 8, 2018
1225cd0
use ICC for GOMP test
trilean May 8, 2018
6e664b0
only assign CXXFLAGS when none have been defined in env
trilean May 8, 2018
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
8 changes: 4 additions & 4 deletions sort-bench/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ DASHROOT?=$(HOME)/opt/dash-0.3.0
DASHCXX=$(DASHROOT)/bin/dash-mpic++ -dash:verbose

#CXXFLAGS = -O3 -std=c++11 -I./external -I. -Wall -DENABLE_LOGGING
CXXFLAGS = -O3 -std=c++11 -I./external -I. -DNDEBUG
CXXFLAGS ?= -O3 -std=c++11 -I./external -I. -DNDEBUG

SIZE ?= $$((500 * (2**20)))

Expand Down Expand Up @@ -37,18 +37,18 @@ run: all

build/tbb-lowlevel.x: tbb/sortbench.h sortbench.cc
@mkdir -p build
icpc $(CXXFLAGS) -o $@ -DUSE_TBB_LOWLEVEL sortbench.cc -ltbb
icpc $(CXXFLAGS) $(TBB_INC) -L$(TBB_LIBDIR) -o $@ -DUSE_TBB_LOWLEVEL sortbench.cc -ltbb

build/tbb-highlevel.x: tbb/sortbench.h sortbench.cc
@mkdir -p build
icpc $(CXXFLAGS) -o $@ -DUSE_TBB_HIGHLEVEL sortbench.cc -ltbb
icpc $(CXXFLAGS) $(TBB_INC) -L$(TBB_LIBDIR) -o $@ -DUSE_TBB_HIGHLEVEL sortbench.cc -ltbb

build/openmp.x: openmp/sortbench.h sortbench.cc
icpc $(CXXFLAGS) -o $@ -DUSE_OPENMP -qopenmp sortbench.cc

build/gomp.x: openmp/sortbench.h sortbench.cc
@mkdir -p build
g++ $(CXXFLAGS) -o $@ -DUSE_OPENMP -fopenmp sortbench.cc
icpc $(CXXFLAGS) -o $@ -DUSE_OPENMP -fopenmp sortbench.cc

build/dash.x: dash/sortbench.h sortbench.cc
@mkdir -p build
Expand Down