Commit 58b99919 authored by incardon's avatar incardon

Fixing compilation errors on intel compiler

parent e8f0531a
......@@ -42,12 +42,12 @@ else
if [ x"$CXX" == x"icpc" ]; then
export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/$1/OPENBLAS/lib"
sed -i "/\sLIB\s=\s-lm\s-lrt/c\LIB = -shared-intel -lm -lrt -lifcore" SuiteSparse_config/SuiteSparse_config.mk
sed -i "/INSTALL_LIB\s=\s\/usr\/local\/lib/c\INSTALL_LIB = $1\/SUITESPARSE\/lib" SuiteSparse_config/SuiteSparse_config.mk
sed -i "/INSTALL_INCLUDE\s=\s\/usr\/local\/include/c\INSTALL_INCLUDE = $1\/SUITESPARSE\/include" SuiteSparse_config/SuiteSparse_config.mk
sed -i "/\sLAPACK\s=\s-llapack/c\LAPACK = " SuiteSparse_config/SuiteSparse_config.mk
sed -i "/\sBLAS\s=\s\-lopenblas/c\BLAS = -L$1/OPENBLAS/lib -lopenblas -lpthread" SuiteSparse_config/SuiteSparse_config.mk
else
sed -i "/\sLIB\s=\s-lm\s-lrt/c\LIB\s=\s-shared-intel\s-lm\s-lrt\s-lifcore" SuiteSparse_config/SuiteSparse_config.mk
sed -i "/INSTALL_LIB\s=\s\/usr\/local\/lib/c\INSTALL_LIB = $1\/SUITESPARSE\/lib" SuiteSparse_config/SuiteSparse_config.mk
sed -i "/INSTALL_INCLUDE\s=\s\/usr\/local\/include/c\INSTALL_INCLUDE = $1\/SUITESPARSE\/include" SuiteSparse_config/SuiteSparse_config.mk
sed -i "/\sLAPACK\s=\s-llapack/c\LAPACK = " SuiteSparse_config/SuiteSparse_config.mk
......
......@@ -104,7 +104,7 @@ BOOST_AUTO_TEST_CASE( CartDecomposition_non_periodic_test)
if (found == false)
{
const openfpm::vector<size_t> pr2 = dec.template ghost_processorID<CartDecomposition<3,float>::processor_id>(p);
const openfpm::vector<size_t> pr2 = dec.ghost_processorID<CartDecomposition<3,float>::processor_id>(p);
}
BOOST_REQUIRE_EQUAL(found,true);
......@@ -184,7 +184,7 @@ BOOST_AUTO_TEST_CASE( CartDecomposition_periodic_test)
Point<3,float> p = b.rnd();
// Check that ghost_processorsID return that processor number
const openfpm::vector<size_t> & pr = dec.template ghost_processorID<CartDecomposition<3,float>::processor_id>(p);
const openfpm::vector<size_t> & pr = dec.ghost_processorID<CartDecomposition<3,float>::processor_id>(p);
bool found = false;
......@@ -196,7 +196,7 @@ BOOST_AUTO_TEST_CASE( CartDecomposition_periodic_test)
if (found == false)
{
const openfpm::vector<size_t> pr2 = dec.template ghost_processorID<CartDecomposition<3,float>::processor_id>(p);
const openfpm::vector<size_t> pr2 = dec.ghost_processorID<CartDecomposition<3,float>::processor_id>(p);
}
BOOST_REQUIRE_EQUAL(found,true);
......
......@@ -517,7 +517,7 @@ public:
if (end_v < g.size())
{
// Add an edge and set the the edge property to the size of the face (communication weight)
gp.template addEdge(start_v, end_v, v_id, end_v);
gp.addEdge(start_v, end_v, v_id, end_v);
}
}
}
......
......@@ -264,7 +264,7 @@ BOOST_AUTO_TEST_CASE( vector_dist_cl_random_vs_reorder_forces_test )
// Initialize vd
vd_initialize<dim,decltype(vd)>(vd, v_cl, k_int);
vd.template ghost_get<0>();
vd.ghost_get<0>();
//Get a cell list
......@@ -278,7 +278,7 @@ BOOST_AUTO_TEST_CASE( vector_dist_cl_random_vs_reorder_forces_test )
vd.reorder(4);
vd.template ghost_get<0>();
vd.ghost_get<0>();
auto NN2 = vd.getCellList(r_cut);
......
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