Skip to content

GitLab

Commit c01d7758 authored by Pietro Incardona's avatar Pietro Incardona
Browse files

All test working

parent 6094c057
Expand all Hide whitespace changes
Inline Side-by-side
configure.ac
View file @ c01d7758
......@@ -40,6 +40,7 @@ m4_ifdef([AX_SUITESPARSE],,[m4_include([m4/ax_suitesparse.m4])])
m4_ifdef([AX_EIGEN],,[m4_include([m4/ax_eigen.m4])])
m4_ifdef([AX_LIB_HDF5],,[m4_include([m4/ax_lib_hdf5.m4])])
m4_ifdef([AX_LIB_PETSC],,[m4/ax_petsc_lib.m4])
m4_ifdef([AX_LIB_HILBERT],,[m4/ax_libhilbert.m4])
case $host_os in
*darwin*|*macosx*)
......@@ -129,6 +130,13 @@ fi
##########
## Check for LIBHILBERT
AX_LIB_HILBERT([],[echo "Cannot detect libhilbert, use the --with-libhilbert option if it is not installed in the default location"
exit 210])
##########
## Check for PETSC
AX_LIB_PETSC()
......
images/Makefile.am
View file @ c01d7758
LINKLIBS = $(PETSC_LIB) $(METIS_LIB) $(PARMETIS_LIB) $(PTHREAD_LIBS) $(OPT_LIBS) $(BOOST_LDFLAGS) $(BOOST_IOSTREAMS_LIB) $(CUDA_LIBS)
LINKLIBS = $(LIBHILBERT_LIB) $(PETSC_LIB) $(METIS_LIB) $(PARMETIS_LIB) $(PTHREAD_LIBS) $(OPT_LIBS) $(BOOST_LDFLAGS) $(BOOST_IOSTREAMS_LIB) $(CUDA_LIBS)
noinst_PROGRAMS = cart_dec metis_dec dom_box vector_dist
cart_dec_SOURCES = CartDecomposition_gen_vtk.cpp ../src/lib/pdata.cpp ../openfpm_devices/src/memory/HeapMemory.cpp ../openfpm_devices/src/memory/PtrMemory.cpp ../openfpm_vcluster/src/VCluster.cpp ../openfpm_devices/src/Memleak_check.cpp
......@@ -17,7 +17,7 @@ dom_box_CFLAGS = $(CUDA_CFLAGS)
dom_box_LDADD = $(LINKLIBS)
vector_dist_SOURCES = vector.cpp ../openfpm_devices/src/memory/HeapMemory.cpp ../openfpm_vcluster/src/VCluster.cpp ../openfpm_devices/src/memory/PtrMemory.cpp
vector_dist_CXXFLAGS = $(PETSC_INCLUDE) $(PARMETIS_INCLUDE) $(METIS_INCLUDE) $(CUDA_CFLAGS) $(INCLUDES_PATH) $(HDF5_CPPFLAGS) $(BOOST_CPPFLAGS) -I../src -Wno-unused-function -Wno-unused-local-typedefs
vector_dist_CXXFLAGS = $(LIBHILBERT_INCLUDE) $(PETSC_INCLUDE) $(PARMETIS_INCLUDE) $(METIS_INCLUDE) $(CUDA_CFLAGS) $(INCLUDES_PATH) $(HDF5_CPPFLAGS) $(BOOST_CPPFLAGS) -I../src -Wno-unused-function -Wno-unused-local-typedefs
vector_dist_CFLAGS = $(CUDA_CFLAGS)
vector_dist_LDADD = $(LINKLIBS) -lparmetis -lmetis
......
m4/ax_libhilbert.m4 0 → 100644
View file @ c01d7758
# ===========================================================================
#
# ===========================================================================
#
# SYNOPSIS
#
# AX_LIB_HILBERT()
#
# DESCRIPTION
#
# This macro provides tests of the availability of libHilbert library.
#
#
# The macro adds a --with-libhilbert option accepting one of three values:
#
# no - do not check for the libhilbert library.
# yes - do check for libhilbert library in standard locations.
# path - complete path to the libhilbert library.
#
# If libhilbert is successfully found, this macro calls
#
# AC_SUBST(LIBHILBERT_INCLUDE)
# AC_SUBST(LIBHILBERT_LIB)
# AC_DEFINE(HAVE_LIBHILBERT)
#
# and sets with_libhilbert="yes"
#
# If libhilbert is disabled or not found, this macros sets with_libhilbert="no"
#
# Your configuration script can test $with_libhilbert to take any further
# actions. LIBHILBERT_{INCLUDE,LIB} may be used when building with C or C++.
#
# To use the macro, one would code one of the following in "configure.ac"
# before AC_OUTPUT:
#
# 1) dnl Check for libhilbert support
# AX_LIB_HILBERT()
#
# One could test $with_libhilbert for the outcome or display it as follows
#
# echo "libhilbert support: $with_libhilbert"
#
# You could also for example, override the default CC in "configure.ac"
#
# LICENSE
#
# Copyright (c) 2009 Timothy Brown <tbrown@freeshell.org>
# Copyright (c) 2010 Rhys Ulerich <rhys.ulerich@gmail.com>
#
# Copying and distribution of this file, with or without modification, are
# permitted in any medium without royalty provided the copyright notice
# and this notice are preserved. This file is offered as-is, without any
# warranty.
#serial 12
AC_DEFUN([AX_LIB_HILBERT], [
AC_MSG_CHECKING(for libhilbert library)
AC_REQUIRE([AC_PROG_CC])
#
# User hints...
#
AC_ARG_VAR([LIBHILBERT], [Libhilbert library location])
AC_ARG_WITH([libhilbert],
[AC_HELP_STRING([--with-libhilbert],
[user defined path to LIBHILBERT library])],
[
if test -n "$LIBHILBERT" ; then
AC_MSG_RESULT(yes)
with_libhilbert=$LIBHILBERT
elif test "$withval" != no ; then
AC_MSG_RESULT(yes)
with_libhilbert=$withval
else
AC_MSG_RESULT(no)
fi
],
[
if test -n "$PETSC" ; then
with_libhilbert=$PETSC
AC_MSG_RESULT(yes)
else
with_petsc=/usr
if test ! -f "$with_libhilbert/include/hilbertKey.h" ; then
with_libhilbert=/usr/local
if test ! -f "$with_libhilbert/include/hilbertKey.h" ; then
with_libhilbert=""
AC_MSG_RESULT(failed)
else
AC_MSG_RESULT(yes)
fi
else
AC_MSG_RESULT(yes)
fi
fi
])
#
# locate LIBHILBERT library
#
if test -n "$with_libhilbert" ; then
old_CC=$CC
old_CFLAGS=$CFLAGS
old_LDFLAGS=$LDFLAGS
CFLAGS="-I$with_libhilbert/include "
LDFLAGS="-L$with_libhilbert/lib "
CC=$CXX
AC_LANG_SAVE
AC_LANG_C
AC_CHECK_HEADER([hilbertKey.h],libhilbert_h=yes,## Copy LIB and include in the target directory
AC_MSG_WARN([could not find header file hilbertKey.h]))
AC_CHECK_LIB([libhilbert],[getIntCoordFromHKey],libhilbert_lib=yes,AC_MSG_WARN([could not find libhilbert]))
AC_LANG_RESTORE
CFLAGS=$old_CFLAGS
LDFLAGS=$old_LDFLAGS
CC=$old_CC
AC_MSG_CHECKING(LIBHILBERT in $with_libhilbert)
if test x"$libhilbert_lib" = x"yes" -a x"$libhilbert_h" = x"yes" ; then
AC_SUBST(LIBHILBERT_INCLUDE, [-I$with_libhilbert/include])
AC_SUBST(LIBHILBERT_LIB, ["-L$with_libhilbert/lib -llibhilbert"])
AC_MSG_RESULT(ok)
AC_DEFINE(HAVE_LIBHILBERT,1,[Define if you have LIBHILBERT library])
else
AC_MSG_RESULT(failed)
fi
fi
#
#
#
if test x = x"$LIBHILBERT_LIB" ; then
ifelse([$2],,[],[$2])
:
else
ifelse([$1],,[],[$1])
:
fi
])dnl AX_LIB_HILBERT
openfpm_data @ c78ac493
Subproject commit aaacba08d3306b4f7c22198ae767481e022276f8
Subproject commit c78ac493019f2b3bc96a43bcced5a031f4f4717d
openfpm_devices @ aef59d58
Subproject commit 5868264de4c5d9a684b48f492efbfd26798f1d18
Subproject commit aef59d58fe1e8958dd09da9672fa673063ab970e
openfpm_io @ ffcab9ac
Subproject commit ca2becb045ef96fcf6287f8ef5da2314248bcb66
Subproject commit ffcab9ac1a89b0f7e017146ac24fab521c50bb62
src/Makefile.am
View file @ c01d7758
LINKLIBS = $(METIS_LIB) $(PTHREAD_LIBS) $(OPT_LIBS) $(BOOST_LDFLAGS) $(BOOST_IOSTREAMS_LIB) $(CUDA_LIBS) $(PETSC_LIB) $(HDF5_LDFLAGS) $(HDF5_LIBS) $(PARMETIS_LIB) $(BOOST_UNIT_TEST_FRAMEWORK_LIB) $(BOOST_CHRONO_LIB) $(BOOST_TIMER_LIB) $(BOOST_SYSTEM_LIB)
LINKLIBS = $(LIBHILBERT_LIB) $(METIS_LIB) $(PTHREAD_LIBS) $(OPT_LIBS) $(BOOST_LDFLAGS) $(BOOST_IOSTREAMS_LIB) $(CUDA_LIBS) $(PETSC_LIB) $(HDF5_LDFLAGS) $(HDF5_LIBS) $(PARMETIS_LIB) $(BOOST_UNIT_TEST_FRAMEWORK_LIB) $(BOOST_CHRONO_LIB) $(BOOST_TIMER_LIB) $(BOOST_SYSTEM_LIB)
noinst_PROGRAMS = pdata
pdata_SOURCES = main.cpp Grid/grid_dist_id_unit_test.cpp lib/pdata.cpp test_multiple_o.cpp ../openfpm_devices/src/memory/HeapMemory.cpp ../openfpm_devices/src/memory/PtrMemory.cpp ../openfpm_vcluster/src/VCluster.cpp ../openfpm_devices/src/Memleak_check.cpp
pdata_CXXFLAGS = $(PETSC_INCLUDE) $(HDF5_CPPFLAGS) $(CUDA_CFLAGS) $(INCLUDES_PATH) $(PARMETIS_INCLUDE) $(METIS_INCLUDE) $(BOOST_CPPFLAGS) $(H5PART_INCLUDE) -DPARALLEL_IO -Wno-unused-local-typedefs
pdata_CXXFLAGS = $(LIBHILBERT_INCLUDE) $(PETSC_INCLUDE) $(HDF5_CPPFLAGS) $(CUDA_CFLAGS) $(INCLUDES_PATH) $(PARMETIS_INCLUDE) $(METIS_INCLUDE) $(BOOST_CPPFLAGS) $(H5PART_INCLUDE) -DPARALLEL_IO -Wno-unused-local-typedefs
pdata_CFLAGS = $(CUDA_CFLAGS)
pdata_LDADD = $(LINKLIBS) -lparmetis -lmetis -L/usr/local/libhilbert/lib -lhilbert
pdata_LDADD = $(LINKLIBS) -lparmetis -lmetis
nobase_include_HEADERS = Decomposition/CartDecomposition.hpp Decomposition/common.hpp Decomposition/Decomposition.hpp Decomposition/ie_ghost.hpp \
Decomposition/nn_processor.hpp Decomposition/ie_loc_ghost.hpp Decomposition/ORB.hpp \
Graph/CartesianGraphFactory.hpp \
......
src/Vector/vector_dist_performance_util.hpp 0 → 100644
View file @ c01d7758
This diff is collapsed.
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