Skip to content

Fixes necessary to get this compiling on a 32-bit Linux Mint 13/Ubuntu 12.04 system. #2

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
Max-E wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Fixes necessary to get this compiling on a 32-bit Linux Mint 13/Ubuntu 12.04 system. #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b40046f
Correct "common.mk" relative paths in various benchmark Makefiles.
Max-E May 7, 2015
e53cd3e
AES: add dependency on boost_system library
Max-E May 7, 2015
5d928cf
DG: add the include path for openmpi where I happened to find it on m…
Max-E May 7, 2015
b540f1a
WP: add the ability to find libraries in $CUDAHOME/lib as well as lib64.
Max-E May 7, 2015
7bc8719
Boost and mpicc are usually available on the "normal" paths.
Max-E May 7, 2015
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
4 changes: 2 additions & 2 deletions AES/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ EXECUTABLE := AES
CUFILES := aesHost.cu
# C/C++ source files (compiled with gcc / c++)
CCFILES := aescuda.cpp aesCudaUtils.cpp
LINKFLAGS := -L$(BOOST_LIB) -lboost_filesystem$(BOOST_VER)
LINKFLAGS := -L$(BOOST_LIB) -lboost_filesystem$(BOOST_VER) -lboost_system$(BOOST_VER)

HDRDIR :=
NEWLIBDIR :=
Expand All @@ -50,4 +50,4 @@ CUFLAGS := $(CFLAGS)
###############################################################################
# Rules and targets

include ../../common/common.mk
include ../common/common.mk
2 changes: 1 addition & 1 deletion BFS/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,5 +43,5 @@ CCFILES :=
################################################################################
# Rules and targets

include ../../common/common.mk
include ../common/common.mk

6 changes: 3 additions & 3 deletions DG/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,9 @@ MPILNKOPTS := $(shell $(OPENMPI_BINDIR)mpicxx --showme:link) # extract the requi
N ?= 6
HOSTNAME=$(shell hostname | awk '/aamodt/ {print 1;} /arch/ {print 1;}')
ifeq ($(HOSTNAME),1)
INCLUDES = -Dp_N=$(N) -DNDG3d -DCUDA -I/opt/local/include -I/usr/include/malloc -I$(HDRDIR) -I/opt/mpich/include
INCLUDES = -Dp_N=$(N) -DNDG3d -DCUDA -I/opt/local/include -I/usr/include/malloc -I$(HDRDIR) -I/usr/lib/openmpi/include -I/opt/mpich/include
else
INCLUDES = -Dp_N=$(N) -DNDG3d -DCUDA -I/opt/local/include -I/usr/include/malloc -I$(HDRDIR)
INCLUDES = -Dp_N=$(N) -DNDG3d -DCUDA -I/opt/local/include -I/usr/include/malloc -I$(HDRDIR) -I/usr/lib/openmpi/include
endif

NEWCC = $(OPENMPI_BINDIR)mpicc
Expand All @@ -62,7 +62,7 @@ NEWCPP = $(OPENMPI_BINDIR)mpicxx
###############################################################################
# Rules and targets

include ../../common/common.mk
include ../common/common.mk

LINKLINE += $(MPILNKOPTS) -L$(PWD)/3rdParty/ParMetis-3.1/ -lparmetis -lmetis -lm

2 changes: 1 addition & 1 deletion LIB/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,5 +44,5 @@ GPGPUSIM_ROOT := ..

################################################################################
# Rules and targets
include ../../common/common.mk
include ../common/common.mk

2 changes: 1 addition & 1 deletion LPS/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@ GPGPUSIM_ROOT := ..
################################################################################
# Rules and targets

include ../../common/common.mk
include ../common/common.mk

2 changes: 1 addition & 1 deletion MUM/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,4 +48,4 @@ CCFILES := \
# Rules and targets

GPGPUSIM_ROOT := ..
include ../../common/common.mk
include ../common/common.mk
4 changes: 2 additions & 2 deletions Makefile.ispass-2009
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ BINSUBDIR=release
SETENV=export BINDIR=$(BINDIR); \
export ROOTDIR=$(NVIDIA_COMPUTE_SDK_LOCATION)/C/src/; \
export BINSUBDIR=$(BINSUBDIR); \
export BOOST_LIB=/usr/lib64; \
export BOOST_LIB=/usr/lib; \
export BOOST_ROOT=/usr/include; \
export BOOST_VER=""; \
export OPENMPI_BINDIR=/usr/lib64/mpi/gcc/openmpi/bin/;
export OPENMPI_BINDIR="";
noinline?=0

.PHONY: check_environment
Expand Down
2 changes: 1 addition & 1 deletion NN/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,4 +45,4 @@ GPGPUSIM_ROOT := ..
###############################################################################
# Rules and targets

include ../../common/common.mk
include ../common/common.mk
2 changes: 1 addition & 1 deletion NQU/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,6 @@ GPGPUSIM_ROOT := ..
################################################################################
# Rules and targets

include ../../common/common.mk
include ../common/common.mk


2 changes: 1 addition & 1 deletion RAY/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,4 @@ GPGPUSIM_ROOT := ..
# Rules and targets
#LIB :=

include ../../common/common.mk
include ../common/common.mk
2 changes: 1 addition & 1 deletion STO/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,4 @@ CCFILES := storeCPU.cpp md5_cpu.cpp sha1_cpu.cpp
################################################################################
# Rules and targets

include ../../common/common.mk
include ../common/common.mk
2 changes: 1 addition & 1 deletion WP/makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ INTERMED_FILES := *.cpp*.i *.cpp*.ii *.cu.c *.cudafe*.* *.fatbin.c *.cubin *.has
CUDAHOME=$(CUDA_INSTALL_PATH)

NVOPENCC_VER:=$(shell $$CUDAHOME/open64/bin/nvopencc --version 2>&1 | awk '/GPGPU-Sim/ {printf("_nvopencc_CL%d", $$3);}')
GPGPULINK = -L$(CUDAHOME)/lib64/ -lcudart -L$(NVIDIA_COMPUTE_SDK_LOCATION)/C/lib/ -lcutil_x86_64 -lm -lz -ldl -lGL -lstdc++ $(NEWLIBDIR) $(LIB) # /usr/lib64/libstdc++.so.6
GPGPULINK = -L$(CUDAHOME)/lib64/ -L$(CUDAHOME)/lib/ -lcudart -L$(NVIDIA_COMPUTE_SDK_LOCATION)/C/lib/ -lcutil -lm -lz -ldl -lGL -lstdc++ $(NEWLIBDIR) $(LIB) # /usr/lib64/libstdc++.so.6
.SUFFIXES :

all : vanilla $(BINDIR)/$(BINSUBDIR)/WP compare_snaps
Expand Down