Commit 8a68f882 authored by jenkins's avatar jenkins

Fixing OSX installation

parent 4192ec42
......@@ -253,6 +253,11 @@ AX_SUITESPARSE([],[echo "suitesparse not found"
AX_EIGEN([],[echo "eigen not found"
exit 206])
###### Checking for libquadmath
AC_CHECK_LIB(quadmath, sinq, [ LIBQUADMATH=-lquadmath ], [ LIBQUADMATH= ])
AC_SUBST(LIBQUADMATH)
###### Checking for compiler flags -fext-numeric-literals
my_save_cflags="$CFLAGS"
......
......@@ -5,7 +5,7 @@ noinst_PROGRAMS = numerics
numerics_SOURCES = main.cpp ../../openfpm_vcluster/src/VCluster.cpp ../../openfpm_devices/src/memory/HeapMemory.cpp ../../openfpm_devices/src/memory/PtrMemory.cpp ../../openfpm_devices/src/Memleak_check.cpp
numerics_CXXFLAGS = $(AM_CXXFLAGS) $(HDF5_CPPFLAGS) $(INCLUDES_PATH) $(BOOST_CPPFLAGS) $(SUITESPARSE_INCLUDE) $(METIS_INCLUDE) $(PARMETIS_INCLUDE) $(EIGEN_INCLUDE) -Wno-deprecated-declarations -Wno-unused-local-typedefs
numerics_CFLAGS = $(CUDA_CFLAGS)
numerics_LDADD = $(LINKLIBS) -lquadmath -lparmetis -lmetis
numerics_LDADD = $(LINKLIBS) -lparmetis -lmetis
nobase_include_HEADERS = PSE/Kernels.hpp PSE/Kernels_test_util.hpp
.cu.o :
......
......@@ -9,7 +9,9 @@
#define OPENFPM_NUMERICS_SRC_PSE_KERNELS_UNIT_TESTS_HPP_
#include "PSE/Kernels_test_util.hpp"
#if defined(__GNUG__) && !defined(__clang__)
#include <boost/multiprecision/float128.hpp>
#endif
BOOST_AUTO_TEST_SUITE( pse_kernels_unit_tests )
......@@ -36,12 +38,16 @@ BOOST_AUTO_TEST_CASE( pse_ker )
/////// Order 2 //////////////
#if defined(__GNUG__) && !defined(__clang__)
PSE_test<boost::multiprecision::float128,Lap_PSE<1,boost::multiprecision::float128,2>>(i,2,err);
y.last().add(err.linf_error);
PSE_test<boost::multiprecision::float128,Lap_PSE<1,boost::multiprecision::float128,2>>(i,4,err);
y.last().add(err.linf_error);
#endif
PSE_test<double,Lap_PSE<1,double,2>>(i,2,err);
y.last().add(err.linf_error);
......@@ -56,28 +62,35 @@ BOOST_AUTO_TEST_CASE( pse_ker )
//////// Order 4 /////////////
#if defined(__GNUG__) && !defined(__clang__)
PSE_test<boost::multiprecision::float128,Lap_PSE<1,boost::multiprecision::float128,4>>(i,2,err);
y.last().add(err.linf_error);
PSE_test<boost::multiprecision::float128,Lap_PSE<1,boost::multiprecision::float128,4>>(i,4,err);
y.last().add(err.linf_error);
//////// Order 6 /////////////
PSE_test<boost::multiprecision::float128,Lap_PSE<1,boost::multiprecision::float128,6>>(i,2,err);
y.last().add(err.linf_error);
PSE_test<boost::multiprecision::float128,Lap_PSE<1,boost::multiprecision::float128,6>>(i,4,err);
y.last().add(err.linf_error);
//////// Order 8 /////////////
PSE_test<boost::multiprecision::float128,Lap_PSE<1,boost::multiprecision::float128,8>>(i,8,err);
y.last().add(err.linf_error);
PSE_test<boost::multiprecision::float128,Lap_PSE<1,boost::multiprecision::float128,8>>(i,16,err);
y.last().add(err.linf_error);
#endif
}
// Check the result
......
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