Commit a5a89323 authored by incardon's avatar incardon

Fixing naming convention

parent a0d95989
...@@ -4,11 +4,11 @@ ...@@ -4,11 +4,11 @@
mkdir /tmp/openfpm_data mkdir /tmp/openfpm_data
mv * .[^.]* /tmp/openfpm_data mv * .[^.]* /tmp/openfpm_data
mv /tmp/openfpm_data OpenFPM_data mv /tmp/openfpm_data openfpm_data
mkdir OpenFPM_data/src/config mkdir OpenFPM_data/src/config
git clone git@ppmcore.mpi-cbg.de:incardon/openfpm_devices.git OpenFPM_devices git clone git@ppmcore.mpi-cbg.de:incardon/openfpm_devices.git openfpm_devices
cd "$1/OpenFPM_data" cd "$1/OpenFPM_data"
......
...@@ -143,9 +143,9 @@ else ...@@ -143,9 +143,9 @@ else
NVCCFLAGS+="$NVCCFLAGS -O3 " NVCCFLAGS+="$NVCCFLAGS -O3 "
fi fi
####### include OpenFPM_devices include path ####### include openfpm_devices include path
INCLUDES_PATH+="-I. -Iconfig -I../../OpenFPM_devices/src" INCLUDES_PATH+="-I. -Iconfig -I../../openfpm_devices/src"
###### Check for memleak check compilation ###### Check for memleak check compilation
......
...@@ -2,13 +2,13 @@ ...@@ -2,13 +2,13 @@
LINKLIBS = $(PTHREAD_LIBS) $(OPT_LIBS) $(BOOST_PROGRAM_OPTIONS_LIB) $(CUDA_LIBS) $(BOOST_IOSTREAMS_LIB) LINKLIBS = $(PTHREAD_LIBS) $(OPT_LIBS) $(BOOST_PROGRAM_OPTIONS_LIB) $(CUDA_LIBS) $(BOOST_IOSTREAMS_LIB)
if BUILDCUDA if BUILDCUDA
CUDA_SOURCES=../../OpenFPM_devices/src/memory/CudaMemory.cu CUDA_SOURCES=../../openfpm_devices/src/memory/CudaMemory.cu
else else
CUDA_SOURCES= CUDA_SOURCES=
endif endif
bin_PROGRAMS = mem_map bin_PROGRAMS = mem_map
mem_map_SOURCES = main.cpp Memleak_check.cpp $(CUDA_SOURCES) ../../OpenFPM_devices/src/memory/HeapMemory.cpp ../../OpenFPM_devices/src/memory/PtrMemory.cpp mem_map_SOURCES = main.cpp Memleak_check.cpp $(CUDA_SOURCES) ../../openfpm_devices/src/memory/HeapMemory.cpp ../../openfpm_devices/src/memory/PtrMemory.cpp
mem_map_CXXFLAGS = $(CUDA_CFLAGS) $(INCLUDES_PATH) -I/usr/local/include mem_map_CXXFLAGS = $(CUDA_CFLAGS) $(INCLUDES_PATH) -I/usr/local/include
mem_map_CFLAGS = $(CUDA_CFLAGS) mem_map_CFLAGS = $(CUDA_CFLAGS)
mem_map_LDADD = $(LINKLIBS) -L/usr/lib64/nvidia-bumblebee/ -L/usr/local/lib -L/usr/local/lib64 mem_map_LDADD = $(LINKLIBS) -L/usr/lib64/nvidia-bumblebee/ -L/usr/local/lib -L/usr/local/lib64
......
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