Commit 1d2091ff authored by Sergey Litvinov's avatar Sergey Litvinov
Browse files

Merge branch 'master' of gitlab.ethz.ch:mavt-cse/uDeviceX

parents 8a1fa247 03d2896a
......@@ -102,3 +102,5 @@ make -s test
----
<1> see `./configure --help`
MPI_VARIANT = mpich
MPI_CXXFLAGS = `pkg-config --cflags ${MPI_VARIANT}`
MPI_LIBS = `pkg-config --libs ${MPI_VARIANT}`
HDF5_VARIANT = hdf5-mpich
HDF5_CXXFLAGS = `pkg-config --cflags ${HDF5_VARIANT}`
HDF5_LIBS = `pkg-config --libs ${HDF5_VARIANT}`
libconfigL = `pkg-config --libs-only-l libconfig`
libconfigID = `pkg-config --variable=includedir libconfig`
libconfigLD = `pkg-config --variable=libdir libconfig`
LIBCONFIG_CXXFLAGS = -I${libconfigID}
LIBCONFIG_LIBS = -L${libconfigLD} -Wl,-rpath -Wl,${libconfigLD} ${libconfigL}
BOP_CXXFLAGS = `bop-config --cflags`
BOP_LIBS = `bop-config --libs-mpi`
# Ubuntu 16.04: https://github.com/BVLC/caffe/issues/4046
NVCCFLAGS += -D_FORCE_INLINES
CXXFLAGS += -Wall -Wextra
......@@ -8,4 +8,3 @@ config files for profiling cases
----
PROF= u.run udx <conf.cfg>
----
......@@ -47,7 +47,7 @@ clean:; -rm -f $B/udx $O $B/gpuCode.o $B/.cookie
install: $B/udx
u.install udx $(PREFIX)/bin
install_lib: $B/libudx_cpu.a $B/libudx_cuda.a
lib: $B/libudx_cpu.a $B/libudx_cuda.a
u.install libudx_cpu.a libudx_cuda.a $(PREFIX)/lib
u.install `find . -name '*.h' | grep -v '^u/'` $(PREFIX)/include/udx
......@@ -55,4 +55,4 @@ test: install
@echo log to atest.log
@atest 2>&1 `find test -name main -type f` | tee atest.log
.PHONY: clean test all D install
.PHONY: clean test all install lib
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment