Commit 6abb6a87 authored by incardon's avatar incardon

Adding ifcore library for intel

parent a0ec2f25
...@@ -21,5 +21,3 @@ if [ $? -ne 0 ]; then ...@@ -21,5 +21,3 @@ if [ $? -ne 0 ]; then
fi fi
curl -X POST --data "payload={\"icon_emoji\": \":jenkins:\", \"username\": \"jenkins\" , \"attachments\":[{ \"title\":\"Info:\", \"color\": \"#00FF00\", \"text\":\"$2 completed succeffuly the openfpm_numerics test \" }] }" https://hooks.slack.com/services/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
...@@ -135,10 +135,16 @@ AX_LIB_PETSC() ...@@ -135,10 +135,16 @@ AX_LIB_PETSC()
AC_LANG_PUSH([C++]) AC_LANG_PUSH([C++])
AC_CHECK_HEADER(quadmath.h, , []) have_quad_lib=no
AC_CHECK_LIB(quadmath, sinq, [ AC_DEFINE(HAVE_LIBQUADMATH,[],[Have quad math lib]) have_quad_head=no
LIBQUADMATH=" -lquadmath " AC_CHECK_LIB(quadmath, sinq, [have_quad_lib=yes], [])
], []) AC_CHECK_HEADER(quadmath.h,[have_quad_head=yes],[])
if [x"have_quad_math" == x"yes" $&& x"have_quad_math" == x"yes" ]; then
AC_DEFINE(HAVE_LIBQUADMATH,[],[Have quad math lib])
LIBQUADMATH=" -lquadmath "
fi
AC_LANG_POP([C++]) AC_LANG_POP([C++])
...@@ -291,10 +297,12 @@ AX_SUITESPARSE([],[]) ...@@ -291,10 +297,12 @@ AX_SUITESPARSE([],[])
AX_EIGEN([],[]) AX_EIGEN([],[])
###### Checking for libquadmath ###### Checking for libquadmath and libifcore
AC_CHECK_LIB(ifcore, for_cpystr, [ LIBIFCORE=-lifcore ], [ LIBIFCORE= ])
AC_CHECK_LIB(quadmath, sinq, [ LIBQUADMATH=-lquadmath ], [ LIBQUADMATH= ]) AC_CHECK_LIB(quadmath, sinq, [ LIBQUADMATH=-lquadmath ], [ LIBQUADMATH= ])
AC_SUBST(LIBQUADMATH) AC_SUBST(LIBQUADMATH)
AC_SUBST(LIBIFCORE)
###### Checking for compiler flags -fext-numeric-literals ###### Checking for compiler flags -fext-numeric-literals
......
...@@ -10,5 +10,4 @@ if [ $? -ne 0 ]; then ...@@ -10,5 +10,4 @@ if [ $? -ne 0 ]; then
exit 1 ; exit 1 ;
fi fi
curl -X POST --data "payload={\"icon_emoji\": \":jenkins:\", \"username\": \"jenkins\" , \"attachments\":[{ \"title\":\"Info:\", \"color\": \"#00FF00\", \"text\":\"$2 completed succeffuly the openfpm_numerics test \" }] }" https://hooks.slack.com/services/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
LINKLIBS = $(OPENMP_LDFLAGS) $(LIBHILBERT_LIB) $(PETSC_LIB) $(SUITESPARSE_LIBS) $(LAPACK_LIBS) $(BLAS_LIBS) $(METIS_LIB) $(PARMETIS_LIB) $(DEFAULT_LIB) $(PTHREAD_LIBS) $(OPT_LIBS) $(BOOST_LDFLAGS) $(BOOST_PROGRAM_OPTIONS_LIB) $(BOOST_IOSTREAMS_LIB) $(HDF5_LDFLAGS) $(HDF5_LIBS) $(LIBQUADMATH) $(OPENMP_LDFLAGS) LINKLIBS = $(OPENMP_LDFLAGS) $(LIBHILBERT_LIB) $(PETSC_LIB) $(SUITESPARSE_LIBS) $(LAPACK_LIBS) $(BLAS_LIBS) $(METIS_LIB) $(PARMETIS_LIB) $(DEFAULT_LIB) $(PTHREAD_LIBS) $(OPT_LIBS) $(BOOST_LDFLAGS) $(BOOST_PROGRAM_OPTIONS_LIB) $(BOOST_IOSTREAMS_LIB) $(HDF5_LDFLAGS) $(HDF5_LIBS) $(LIBQUADMATH) $(OPENMP_LDFLAGS) $(LIBIFCORE)
noinst_PROGRAMS = numerics 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_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
......
...@@ -297,9 +297,9 @@ struct pos_or_prop ...@@ -297,9 +297,9 @@ struct pos_or_prop
template <typename vector> template <typename vector>
struct pos_or_prop<vector,PROP_POS> struct pos_or_prop<vector,PROP_POS>
{ {
static inline auto value(vector & v, const vect_dist_key_dx & k) -> decltype(getExpr(v.template getPos(k))) static inline auto value(vector & v, const vect_dist_key_dx & k) -> decltype(getExpr(v.getPos(k)))
{ {
return getExpr(v.template getPos(k)); return getExpr(v.getPos(k));
} }
}; };
......
...@@ -70,7 +70,7 @@ template <typename rtype, typename vector, unsigned int A, unsigned int B, unsig ...@@ -70,7 +70,7 @@ template <typename rtype, typename vector, unsigned int A, unsigned int B, unsig
{ {
auto key = it.get(); auto key = it.get();
rtype base1 = rtype(vd.template getPos(key)) + p; rtype base1 = rtype(vd.getPos(key)) + p;
rtype base2 = vd.template getProp<A>(key); rtype base2 = vd.template getProp<A>(key);
ret &= base1 == base2; ret &= base1 == base2;
...@@ -92,7 +92,7 @@ template <typename rtype, typename vector, unsigned int A, unsigned int B, unsig ...@@ -92,7 +92,7 @@ template <typename rtype, typename vector, unsigned int A, unsigned int B, unsig
{ {
auto key = it.get(); auto key = it.get();
rtype base1 = rtype(vd.template getPos(key)) - p; rtype base1 = rtype(vd.getPos(key)) - p;
rtype base2 = vd.template getProp<A>(key); rtype base2 = vd.template getProp<A>(key);
ret &= base1 == base2; ret &= base1 == base2;
...@@ -114,7 +114,7 @@ template <typename rtype, typename vector, unsigned int A, unsigned int B, unsig ...@@ -114,7 +114,7 @@ template <typename rtype, typename vector, unsigned int A, unsigned int B, unsig
{ {
auto key = it.get(); auto key = it.get();
rtype base1 = -(rtype(vd.template getPos(key)) - p); rtype base1 = -(rtype(vd.getPos(key)) - p);
rtype base2 = vd.template getProp<A>(key); rtype base2 = vd.template getProp<A>(key);
ret &= base1 == base2; ret &= base1 == base2;
......
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