Commit 369aab6a authored by incardon's avatar incardon

Fixing installation script

parent 7368581a
......@@ -98,8 +98,6 @@ AX_BOOST([1.52],[],[echo "boost not found"
####### Checking for GPU support
AX_CUDA
## detect for NVCC
if test x"$NVCC_EXIST" = x"yes"; then
......@@ -115,6 +113,7 @@ if test x"$NVCC_EXIST" = x"yes"; then
AC_MSG_RESULT($gpu_support)
if test x"$gpu_support" = x"yes"; then
AX_CUDA
AC_DEFINE([GPU],[],[GPU support])
fi
else
......
......@@ -60,7 +60,7 @@ if [ $install_req -eq 0 ]; then
else
while [ $conf_err -ne 0 ]
do
./configure $configure_options
./configure $options $configure_options
conf_err=$?
echo "Configure script terminated with $conf_err"
......
......@@ -56,8 +56,10 @@ AS_IF([test "x$NVCC_EXIST" = "xno"],[],[
# If $build_cpu contains "_64", append "64" to CUDA_LIBS
AS_IF([echo $build_cpu | grep -q "_64"],
[CUDA_LIBS+="64"])
[
AS_IF([-d {CUDA_LIBS}lib64], [ CUDA_LIBS+="64" ], [ ])
])
# Append " -lcuda -lcudart" to CUDA_LIBS
CUDA_LIBS+=" -lcuda -lcudart"
......
......@@ -5,7 +5,7 @@ bin_PROGRAMS = pdata
pdata_SOURCES = main.cpp ../openfpm_devices/src/memory/HeapMemory.cpp ../openfpm_devices/src/memory/PtrMemory.cpp ../openfpm_vcluster/src/VCluster.cpp ../openfpm_data/src/Memleak_check.cpp
pdata_CXXFLAGS = $(CUDA_CFLAGS) $(INCLUDES_PATH) $(METIS_INCLUDE) $(BOOST_CPPFLAGS)
pdata_CFLAGS = $(CUDA_CFLAGS)
pdata_LDADD = $(LINKLIBS) -L/usr/lib64/nvidia-bumblebee/ -lmetis
pdata_LDADD = $(LINKLIBS) -lmetis
.cu.o :
$(NVCC) $(NVCCFLAGS) -o $@ -c $<
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