Added jenkins build script

build_vcluster.sh

+#! /bin/bash
+
+# Make a directory in /tmp/OpenFPM_data
+
+mkdir /tmp/openfpm_vcluster
+mv * .[^.]* /tmp/openfpm_vcluster
+mv /tmp/openfpm_vcluster OpenFPM_vcluster
+
+mkdir OpenFPM_vcluster/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_data
+
+cd "$1/OpenFPM_vcluster"
+
+sh ./autogen.sh
+sh ./configure CXX=mpic++
+make
+
+mpirun -np 2 ./src/vcluster
+mpirun -np 4 ./src/vcluster
+mpirun -np 16 ./src/vcluster

configure.ac

@@ -7,22 +7,16 @@ AC_INIT(FULL-PACKAGE-NAME, VERSION, BUG-REPORT-ADDRESS)
 AC_CANONICAL_SYSTEM
 AC_CONFIG_SRCDIR([src/main.cpp])
 AM_INIT_AUTOMAKE
-AC_CONFIG_HEADER([src/config.h])
-m4_ifdef([MYSQL_FOUND],,[m4_include([m4/ax_lib_mysql.m4])])
-m4_ifdef([AX_CHECK_COMPILER_FLAGS],,[m4_include([m4/ax_check_compiler_flags.m4])])
+AC_CONFIG_HEADER([src/config/config.h])
 m4_ifdef([ACX_PTHREAD],,[m4_include([m4/acx_pthread.m4])])
-m4_ifdef([AX_CHECK_CL],,[m4_include([m4/ax_opencl.m4])])
-m4_ifdef([AX_BOOST_BASE],,[m4_include([m4/ax_boost_base.m4])])
-m4_ifdef([AX_BOOST_PROGRAM_OPTIONS],,[m4_include([m4/ax_boost_program_options.m4])])
-m4_ifdef([AX_BOOST_THREAD],,[m4_include([m4/ax_boost_thread.m4])])
+m4_ifdef([AX_BOOST],,[m4_include([m4/ax_boost.m4])])
 m4_ifdef([ACX_MPI],,[m4_include([m4/acx_mpi.m4])])
 m4_ifdef([AX_OPENMP],,[m4_include([m4/ax_openmp.m4])])
-m4_ifdef([AX_GCC_X86_CPUID],,[m4_include([m4/ax_gcc_x86_cpuid.m4])])
-m4_ifdef([AX_GCC_ARCHFLAG],,[m4_include([m4/ax_gcc_archflag.m4])])
 m4_ifdef([AX_CUDA],,[m4_include([m4/ax_cuda.m4])])
 
-CXXFLAGS+=" --std=c++11 "
+CXXFLAGS+=" --std=c++11 -march=native -mtune=native -Wno-unused-local-typedefs -Wextra -Wno-unused-parameter "
 NVCCFLAGS=" "
+INCLUDES_PATH=" "
 
 # Checks for programs.
 AC_PROG_CXX
@@ -31,10 +25,6 @@ AC_PROG_CXX
 
 AC_CANONICAL_HOST
 
-# Check target architetture
-
-AX_GCC_ARCHFLAG([], [CXXFLAGS="$CXXFLAGS $ax_cv_gcc_archflag"], [])
-
 ###### Check for debug compilation
 
 AC_MSG_CHECKING(whether to build with debug information)
@@ -56,55 +46,75 @@ if test x"$debuger" = x"yes"; then
 	CXXFLAGS="$CXXFLAGS -g3  -Wall -O0 "
 	NVCCFLAGS+="$NVCCFLAGS -g -O0 "
 else
-	CXXFLAGS="$CXXFLAGS -Wall -O3 -g3 "
+	CXXFLAGS="$CXXFLAGS -Wall -O3 -g3 -funroll-loops "
 	NVCCFLAGS+="$NVCCFLAGS -O3 "
 fi
 
-####### Checking for GPU support
+####### include OpenFPM_devices include path
 
-AX_CUDA
+INCLUDES_PATH+="-I. -Iconfig -I../../OpenFPM_devices/src -I../../OpenFPM_data/src"
+
+###### Check for memleak check compilation
 
-AC_MSG_CHECKING(whether to build with GPU support)
-gpu_support=no
-AC_ARG_ENABLE(gpu,
+AC_MSG_CHECKING(whether to build with memory check)
+mem_check=no
+AC_ARG_ENABLE(memcheck,
 	AC_HELP_STRING(
-	    [--enable-gpu],
-	    [enable gpu support]
+	    [--enable-memcheck],
+	    [enable memory checking (def=no)]
 	),
-  	gpu_support="$enableval"
+  	mem_check="$enableval"
 )
 
 
 
-AC_MSG_RESULT($gpu_support)
-if test x"$gpu_support" = x"yes"; then
-	AC_DEFINE([GPU],[],[GPU support])
+AC_MSG_RESULT($mem_check)
+if test x"$mem_check" = x"yes"; then
+	AC_DEFINE([MEMLEAK_CHECK],[],[Memory check])
+fi
+
+##### CHECK FOR BOOST ##############
+
+AX_BOOST([1.52],[],[])
+
+####### Checking for GPU support
+
+AX_CUDA
+
+if test x"$NVCC_EXIST" = x"yes"; then
+  AC_MSG_CHECKING(whether to build with GPU support)
+  gpu_support=yes
+  AC_ARG_ENABLE(gpu,
+        AC_HELP_STRING(
+            [--enable-gpu],
+            [enable gpu support]
+        ),
+        gpu_support="$enableval"
+  )
+
+  AC_MSG_RESULT($gpu_support)
+  if test x"$gpu_support" = x"yes"; then
+        AC_DEFINE([CUDA_GPU],[],[CUDA GPU support])
+  fi
+else
+  gpu_support=no
 fi
 
 
 # Set this conditional if cuda is wanted
 
-AM_CONDITIONAL(BUILDCUDA, test ! x$NVCC = x"no")
-
-###########################
-
-no_avx=no
-no_sse42=no
-no_sse41=no
-no_sse3=no
-no_sse2=no
-no_sse=no
-no_mmx=no
-AX_CHECK_COMPILER_FLAGS([-msse4.2],[CXXFLAGS="$CXXFLAGS -mavx"],[no_avx=yes])
-AX_CHECK_COMPILER_FLAGS([-msse4.2],[CXXFLAGS="$CXXFLAGS -msse4.2"],[no_sse42=yes])
-AX_CHECK_COMPILER_FLAGS([-msse4.1],[CXXFLAGS="$CXXFLAGS -msse4.1"],[no_sse41=yes])
-AX_CHECK_COMPILER_FLAGS([-msse3],[CXXFLAGS="$CXXFLAGS -msse3"],[no_sse3=yes])
-AX_CHECK_COMPILER_FLAGS([-msse2],[CXXFLAGS="$CXXFLAGS -msse2"],[no_sse2=yes])
-AX_CHECK_COMPILER_FLAGS([-msse],[CXXFLAGS="$CXXFLAGS -msse"],[no_sse=yes])
-AX_CHECK_COMPILER_FLAGS([-mmmx],[CXXFLAGS="$CXXFLAGS -mmmx"],[no_mmx=yes])
-AX_CHECK_COMPILER_FLAGS([-Wno-unused-but-set-variable],[CXXFLAGS="$CXXFLAGS -Wno-unused-but-set-variable"],[])
+#
+
+AM_CONDITIONAL(BUILDCUDA, test x$gpu_support = x"yes")
+
+##### CHECK FOR BOOST ###
+
+AX_BOOST([1.52],[],[])
+
+##########################
 
 AC_SUBST(NVCCFLAGS)
+AC_SUBST(INCLUDES_PATH)
 
 # Checks for typedefs, structures, and compiler characteristics.
 
@@ -115,59 +125,21 @@ AC_OUTPUT
 echo ""
 echo   "***********************************"
 echo   "*                                 *"
-arch_str="${ax_cv_gcc_archflag#-march=#-mtune=}"
-arch_str="${arch_str#-mtune=}"
-n_arch_str=${#arch_str}
-for (( X=0; X<23-n_arch_str; X++ ))
-do
-   arch_str="$arch_str "
-done
-echo "*    arch: $arch_str*"
-if [ test x"$no_sse42" = x"no" ]; then
-    echo "*    sse4.2: yes                  *"
-else
-    echo "*    sse4.2: no                   *"
-fi
-if [ test x"$no_sse41" = x"no" ]; then
-    echo "*    sse4.1: yes                  *"
-else
-    echo "*    sse4.1: no                   *"
-fi
-if [ test x"$no_sse3" = x"no" ]; then
-    echo "*    sse3: yes                    *"
-else
-    echo "*    sse3: no                     *"
-fi
-if [ test x"$no_sse2" = x"no" ]; then
-    echo "*    sse2: yes                    *"
-else
-    echo "*    sse2: no                     *"
-fi
-if [ test x"$no_sse" = x"no" ]; then
-    echo "*    sse: yes                     *"
-else
-    echo "*    sse: no                      *"
-fi
-if [ test x"$no_mmx" = x"no" ]; then
-  echo "*    mmx: yes                     *"
-else
-  echo "*    mmx: no                      *"
-fi
 if [ test x"$profiler" = x"yes" ]; then
   echo "*    profiler: yes                *"
 else
   echo "*    profiler: no                 *"
 fi
+if [ test x"$memcheck" = x"yes" ]; then
+  echo "*    memcheck: yes                *"
+else
+  echo "*    memcheck: no                 *"
+fi
 if [ test x"$debuger" = x"yes" ]; then
   echo "*    debug: yes                   *"
 else
   echo "*    debug: no                    *"
 fi
-if [ test x"$no_64" = x"no" ]; then
-  echo "*    64 bit: yes                  *"
-else
-  echo "*    64 bit: no                   *"
-fi
 if [ test x"$gpu_support" = x"no" ]; then
   echo "*    gpu: no                      *"
 else

src/Makefile.am

 
-LINKLIBS = $(PTHREAD_LIBS) $(OPT_LIBS) $(BOOST_LDFLAGS) $(BOOST_PROGRAM_OPTIONS_LIB) $(CUDA_LIBS) $(BOOST_THREAD_LIB)
+LINKLIBS = $(PTHREAD_LIBS) $(OPT_LIBS) $(BOOST_LDFLAGS)
 
-bin_PROGRAMS = ppline
-ppline_SOURCES = main.cpp
-ppline_CXXFLAGS = $(CUDA_CFLAGS)
-ppline_CFLAGS = $(CUDA_CFLAGS)
-ppline_LDADD = $(LINKLIBS) -L/usr/lib64/nvidia-bumblebee/
+bin_PROGRAMS = vcluster
+vcluster_SOURCES = main.cpp VCluster.cpp
+vcluster_CXXFLAGS = $(INCLUDES_PATH)
+vcluster_CFLAGS = $(CUDA_CFLAGS)
+vcluster_LDADD = $(LINKLIBS)
 
 .cu.o :
 	$(NVCC) $(NVCCFLAGS) -o $@ -c $<

src/main.cpp

-#include <iostream.h>
+#include "config.h"
+#define BOOST_TEST_MODULE "C++ test module for OpenFPM_vcluster project"
+#include <boost/test/included/unit_test.hpp>
 
-int main()
-{
 
-}
+#include "VCluster_unit_tests.hpp"