Commit f467ebb6 authored by MIJIEUX Thomas's avatar MIJIEUX Thomas

remove useless semicolons

parent f74ca063
......@@ -37,9 +37,9 @@ FIND_PACKAGE(OpenMP)
# (regarder éventuellement Simgrid/boost etc)
if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ferror-limit=2")
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ferror-limit=2 -pedantic")
elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fmax-errors=2 -Wno-psabi")
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fmax-errors=2 -Wno-psabi -pedantic")
elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel")
# using Intel C++
elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
......
......@@ -100,6 +100,6 @@ inline std::ostream& operator<<(std::ostream &o, const Algorithm<bgcr::Arnoldi>
return (o << "BGCR");
}
}; // end namespace fabulous
} // end namespace fabulous
#endif // FABULOUS_ALGO_TYPE_HPP
......@@ -7,8 +7,8 @@
namespace fabulous {
namespace bgcr {
template<class S> class BGCR;
};
};
}
}
#include "fabulous/data/Block.hpp"
#include "fabulous/data/Base.hpp"
......@@ -228,7 +228,7 @@ public:
}
}; // end class BGCR
}; // end namespace bgcr
}; // end namespace fabulous
} // end namespace bgcr
} // end namespace fabulous
#endif // FABULOUS_BGCR_HPP
......@@ -7,8 +7,8 @@
namespace fabulous {
namespace bgmres {
template<class S> class BGMRes;
};
};
}
}
#include "fabulous/data/Block.hpp"
#include "fabulous/data/Base.hpp"
......@@ -244,7 +244,7 @@ public:
}; // end class BGMRes
}; // end namespace bgmres
}; // end namespace fabulous
} // end namespace bgmres
} // end namespace fabulous
#endif // FABULOUS_BGMRES_HPP
......@@ -2,10 +2,10 @@
#define FABULOUS_EQUATION_HPP
namespace fabulous {
namespace bgmres { template<class S> class BGMRes; };
namespace bgcr { template<class S> class BGCR; };
namespace bgmres { template<class S> class BGMRes; }
namespace bgcr { template<class S> class BGCR; }
template<class Matrix, class S> class Equation;
};
}
#include "fabulous/utils/Arithmetic.hpp"
#include "fabulous/data/Block.hpp"
......@@ -71,6 +71,6 @@ inline Equation<Matrix, S> equation(
}
}; // end namespace fabulous
} // end namespace fabulous
#endif // FABULOUS_EQUATION_HPP
......@@ -2,8 +2,8 @@
#define FABULOUS_PARAMETERS_HPP
namespace fabulous {
namespace bgmres { template<class S> class BGMRes; };
namespace bgcr { template<class S> class BGCR; };
namespace bgmres { template<class S> class BGMRes; }
namespace bgcr { template<class S> class BGCR; }
/**
* \brief Hold parameters for BGMRES algorithm
......@@ -34,6 +34,6 @@ inline Parameters parameters(int max_mvp, int max_space)
return Parameters{max_mvp, max_space};
}
}; // end namespace fabulous
} // end namespace fabulous
#endif // FABULOUS_PARAMETERS_HPP
......@@ -40,7 +40,7 @@ Logger<P> solve(Equation &eq, const Algo &algo, Parameters param,
return solver.get_logger();
}
}; // end namespace bgmres
} // end namespace bgmres
namespace bgcr {
......@@ -58,7 +58,7 @@ Logger<P> solve(Equation &eq, const Algo &algo,
return solver.get_logger();
}
}; // end namespace bcgr
}; // end namespace fabulous
} // end namespace bcgr
} // end namespace fabulous
#endif // FABULOUS_SOLVE_HPP
......@@ -6,8 +6,8 @@
namespace fabulous {
namespace bgcr {
template<class S> class Arnoldi;
};
};
}
}
#include "fabulous/data/Base.hpp"
#include "fabulous/data/Block.hpp"
......@@ -377,7 +377,7 @@ public:
}
};
}; // end namespace bgcr
}; // end namespace fabulous
} // end namespace bgcr
} // end namespace fabulous
#endif // FABULOUS_ARNOLDI2_HPP
......@@ -4,8 +4,8 @@
namespace fabulous {
namespace bgmres {
template<class HESSENBERG, class S> class ArnoldiDR;
};
};
}
}
#include "fabulous/data/Base.hpp"
#include "fabulous/data/Block.hpp"
......@@ -293,7 +293,7 @@ public:
};
}; // end namespace bgmres
}; // end namespace fabulous
} // end namespace bgmres
} // end namespace fabulous
#endif // FABULOUS_ARNOLDI_DR_HPP
......@@ -4,8 +4,8 @@
namespace fabulous {
namespace bgmres {
template<class HESSENBERG, class S> class ArnoldiIB;
};
};
}
}
#include "fabulous/data/Base.hpp"
#include "fabulous/data/BlockWP.hpp"
......@@ -467,7 +467,7 @@ public:
}; // end class ArnoldiIB
}; // end namespace bgmres
}; // end namespace fabulous
} // end namespace bgmres
} // end namespace fabulous
#endif // FABULOUS_ARNOLDI_IB_HPP
......@@ -4,8 +4,8 @@
namespace fabulous {
namespace bgmres {
template<class HESSENBERG, class S> class ArnoldiIBDR;
};
};
}
}
#include "fabulous/data/Base.hpp"
#include "fabulous/data/BlockWP.hpp"
......@@ -25,7 +25,7 @@ namespace bgmres {
*
* the GELS kernel is used to solve the LeastSquare problem on the projected matrix
*/
template<class HESSENBERG, class S >
template<class HESSENBERG, class S>
class ArnoldiIBDR
{
static_assert(
......@@ -499,7 +499,7 @@ public:
}; // end class ArnoldiIBDR
}; // end namespace bgmres
}; // end namespace fabulous
} // end namespace bgmres
} // end namespace fabulous
#endif // FABULOUS_ARNOLDI_IB_DR_HPP
......@@ -3,7 +3,7 @@
namespace fabulous {
template<class S> class Base;
};
}
#include "fabulous/utils/Utils.hpp"
#include "fabulous/kernel/blas.hpp"
......@@ -106,6 +106,6 @@ public:
}; // end class Base
}; // end namespace fabulous
} // end namespace fabulous
#endif // FABULOUS_BASE_HPP
......@@ -10,7 +10,7 @@
namespace fabulous {
template<class> class Block;
};
}
#define FABULOUS_INHERITS_BLOCK(Type_) \
typedef ::fabulous::Block<Type_> super; \
......@@ -23,7 +23,7 @@ template<class> class Block;
using super::at; \
using typename super::value_type; \
using typename super::primary_type; \
using typename super::P; \
using typename super::P \
#include "fabulous/utils/Arithmetic.hpp"
......@@ -482,6 +482,6 @@ std::ostream& operator<<(std::ostream &o, const Block<U> &b)
return o;
}
}; // end namespace fabulous
} // end namespace fabulous
#endif // FABULOUS_BLOCK_HPP
......@@ -3,7 +3,7 @@
namespace fabulous {
template<class> class BlockWP;
};
}
#include "fabulous/kernel/blas.hpp"
#include "fabulous/kernel/flops.hpp"
......@@ -16,7 +16,7 @@ namespace fabulous {
*
* This use a cursor to know where P ends and W starts is needed.
*/
template< class S >
template<class S>
class BlockWP : public Block<S>
{
private:
......@@ -161,6 +161,6 @@ public:
}; // end class BlockWP
}; // end namespace fabulous
} // end namespace fabulous
#endif // FABULOUS_BLOCK_WP_HPP
......@@ -10,7 +10,7 @@
namespace fabulous {
template<class> class MorseDesc;
template<class> class morse_desc_impl;
};
}
#include "fabulous/utils/Chameleon.hpp"
#include "fabulous/utils/Arithmetic.hpp"
......@@ -143,6 +143,6 @@ public:
}
}; // end class MorseDesc
}; // end namespace fabulous;
} // end namespace fabulous
#endif // FABULOUS_MORSE_DESC_HPP
......@@ -11,10 +11,10 @@
#include <morse.h>
namespace fabulous {
template <class> class TileMapper;
template <class> class HessenbergTileMapper;
template <class> class ClassicTileMapper;
};
template<class> class TileMapper;
template<class> class HessenbergTileMapper;
template<class> class ClassicTileMapper;
}
#include "fabulous/utils/Error.hpp"
......@@ -169,6 +169,6 @@ public:
}
}; // end class ClassicTileMapper
}; // end namespace fabulous
} // end namespace fabulous
#endif // FABULOUS_TILE_MAPPER_HPP
......@@ -192,7 +192,7 @@ public:
};
}; // end namespace experimental
}; // end namespace fabulous;
} // end namespace experimental
} // end namespace fabulous
#endif // FABULOUS_MORSE_DESC_HPP
......@@ -188,7 +188,7 @@ public:
inline operator const MORSE_desc_t*(){ return get(); }
};
}; // end namespace experimental
}; // end namespace fabulous;
} // end namespace experimental
} // end namespace fabulous
#endif // FABULOUS_MORSE_DESC_HPP
......@@ -190,7 +190,7 @@ public:
};
}; // end namespace experimental
}; // end namespace fabulous;
} // end namespace experimental
} // end namespace fabulous
#endif // FABULOUS_MORSE_DESC_HPP
......@@ -17,8 +17,8 @@
namespace fabulous {
namespace bgmres {
template<class S> class HessChamQR;
};
};
}
}
#include "fabulous/utils/Arithmetic.hpp"
#include "fabulous/utils/Error.hpp"
......@@ -367,8 +367,8 @@ public:
}; // end class HessChamQR
}; // end namespace bgmres
}; // end namespace fabulous
} // end namespace bgmres
} // end namespace fabulous
#endif // FABULOUS_USE_CHAMELEON
......
......@@ -6,8 +6,8 @@
namespace fabulous {
namespace bgmres {
template<class> class HessChamTLDR;
};
};
}
}
#include "fabulous/kernel/chameleon-toplevel.hpp"
#include "fabulous/data/Block.hpp"
......@@ -199,8 +199,8 @@ public:
}; // end class HessChamTLDR
}; // end namespace bgmres
}; // end namespace fabulous
} // end namespace bgmres
} // end namespace fabulous
#endif // FABULOUS_USE_CHAMELEON
......
......@@ -4,8 +4,8 @@
namespace fabulous {
namespace bgmres {
template<class S> class HessDR;
};
};
}
}
#include "fabulous/kernel/blas.hpp"
#include "fabulous/kernel/gels.hpp"
......@@ -195,7 +195,7 @@ public:
}; // end class HessDR
}; // end namespace bgmres
}; // end namespace fabulous
} // end namespace bgmres
} // end namespace fabulous
#endif // FABULOUS_HESS_DR_HPP
......@@ -7,8 +7,8 @@
namespace fabulous {
namespace bgmres {
template<class> class HessIB;
};
};
}
}
#include "fabulous/data/BlockWP.hpp"
#include "fabulous/kernel/blas.hpp"
......@@ -24,7 +24,7 @@ namespace bgmres {
* This hold the matrix denoted as \f$\mathscr{F}\f$ in the paper.
*
*/
template< class S >
template<class S>
class HessIB : public Block<S>
{
public:
......@@ -374,7 +374,7 @@ public:
}; // end class HessIB
}; // end namespace bgmres
}; // end namespace fabulous
} // end namespace bgmres
} // end namespace fabulous
#endif // FABULOUS_HESS_IB_HPP
......@@ -7,8 +7,8 @@
namespace fabulous {
namespace bgmres {
template<class> class HessIBDR;
};
};
}
}
#include "fabulous/data/BlockWP.hpp"
#include "fabulous/kernel/blas.hpp"
......@@ -464,7 +464,7 @@ public:
}; // end class HessIBDR
}; // end namespace bgmres
}; // end namespace fabulous
} // end namespace bgmres
} // end namespace fabulous
#endif // FABULOUS_HESS_IB_DR_HPP
......@@ -4,8 +4,8 @@
namespace fabulous {
namespace bgmres {
template<class> class HessQR;
};
};
}
}
#include "fabulous/kernel/blas.hpp"
#include "fabulous/kernel/qrf.hpp"
......@@ -65,7 +65,7 @@ private:
_logger.notify_facto_begin();
/* STEP 1: Loop over each block in last column to
apply already computed Householders */
apply already computed Householders */
char Trans = Arithmetik<S>::ltrans;
int k = _nb_block_col-1;
......@@ -90,7 +90,7 @@ private:
Block<S> A = this->macro_sub_block(k, k, 2, 1);
int err = lapacke::geqrf( A.get_nb_row(), A.get_nb_col(),
A.get_ptr(), A.get_leading_dim(), tau);
A.get_ptr(), A.get_leading_dim(), tau);
if (err != 0)
FABULOUS_FATAL_ERROR("return values of geqrf (last block) is"<<err);
......@@ -231,7 +231,7 @@ public:
}; // end class HessQR
}; // end namespace bgmres
}; // end namespace fabulous
} // end namespace bgmres
} // end namespace fabulous
#endif // FABULOUS_HESS_QR_HPP
......@@ -4,8 +4,8 @@
namespace fabulous {
namespace bgmres {
template<class> class HessQRDR;
};
};
}
}
#include "fabulous/kernel/blas.hpp"
#include "fabulous/kernel/qrf.hpp"
......@@ -306,7 +306,7 @@ public:
}; // end class HessQRDR
}; // end namespace bgmres
}; // end namespace fabulous
} // end namespace bgmres
} // end namespace fabulous
#endif // FABULOUS_HESS_QR_DR_HPP
......@@ -7,8 +7,8 @@
namespace fabulous {
namespace bgmres {
template<class> class HessQRIBDR;
};
};
}
}
#include "fabulous/data/BlockWP.hpp"
#include "fabulous/kernel/blas.hpp"
......@@ -714,7 +714,7 @@ public:
}; // end class HessQRIBDR
}; // end namespace bgmres
}; // end namespace fabulous
} // end namespace bgmres
} // end namespace fabulous
#endif // FABULOUS_HESS_QR_IB_DR_HPP
......@@ -131,8 +131,8 @@ int64_t OutOfPlaceQRFacto(Block<S> &B, Block<S> &Q, Block<S> &R, Matrix &A)
return InPlaceQRFactoMGS_User(Q, R, A);
}
}; // end namespace QR
} // end namespace QR
}; // end namespace fabulous
} // end namespace fabulous
#endif // FABULOUS_QR_HPP
......@@ -322,7 +322,7 @@ inline int trsm(char side, int m, int n, std::complex<double> alpha,
); \
} \
FABULOUS_ARITHMETIC_LIST(FABULOUS_SPECIALIZE_LACPY);
FABULOUS_ARITHMETIC_LIST(FABULOUS_SPECIALIZE_LACPY)
/************* TRSM ********************/
......@@ -336,7 +336,7 @@ FABULOUS_ARITHMETIC_LIST(FABULOUS_SPECIALIZE_LACPY);
); \
} \
FABULOUS_ARITHMETIC_LIST(FABULOUS_SPECIALIZE_TRSM);
FABULOUS_ARITHMETIC_LIST(FABULOUS_SPECIALIZE_TRSM)
#else // FABULOUS_LAPACKE_NANCHECK
......@@ -352,7 +352,7 @@ FABULOUS_ARITHMETIC_LIST(FABULOUS_SPECIALIZE_TRSM);
); \
} \
FABULOUS_ARITHMETIC_LIST(FABULOUS_SPECIALIZE_LACPY);
FABULOUS_ARITHMETIC_LIST(FABULOUS_SPECIALIZE_LACPY)
/************* TRSM ********************/
......@@ -366,12 +366,12 @@ FABULOUS_ARITHMETIC_LIST(FABULOUS_SPECIALIZE_LACPY);
); \
} \
FABULOUS_ARITHMETIC_LIST(FABULOUS_SPECIALIZE_TRSM);
FABULOUS_ARITHMETIC_LIST(FABULOUS_SPECIALIZE_TRSM)
#endif // FABULOUS_LAPACKE_NANCHECK
}; // end namespace lapacke
}; // end namespace fabulous
} // end namespace lapacke
} // end namespace fabulous
#endif // FABULOUS_BLAS_HPP
......@@ -51,10 +51,10 @@ int gels(int m, int n, int nrhs, U *A, int lda, U *B, int ldb)
return err; \
}
FABULOUS_ARITHMETIC_LIST(FABULOUS_SPECIALIZE_TL_CHAM_GELS);
FABULOUS_ARITHMETIC_LIST(FABULOUS_SPECIALIZE_TL_CHAM_GELS)
}; // end namespace toplevel;
}; // end namespace chameleon;
}; // end namespace fabulous;
} // end namespace toplevel
} // end namespace chameleon
} // end namespace fabulous
#endif // FABULOUS_CHAMELEON_KERNELS_TOP_LEVEL_HPP
......@@ -17,8 +17,8 @@ namespace fabulous {
*
* This is the interface for the '*_Tile_Async' functions of chameleon.
*/
namespace chameleon
{
namespace chameleon {
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
......@@ -141,7 +141,7 @@ int lacpy(MORSE_enum uplo,
return err; \
} \
FABULOUS_ARITHMETIC_LIST(FABULOUS_SPECIALIZE_CHAM_GELS);
FABULOUS_ARITHMETIC_LIST(FABULOUS_SPECIALIZE_CHAM_GELS)
/*************************************/
/**************** QRF ****************/
......@@ -158,7 +158,7 @@ FABULOUS_ARITHMETIC_LIST(FABULOUS_SPECIALIZE_CHAM_GELS);
return MORSE_##prefix_##geqrf_Tile_Async(A, T, seq, &r); \
}
FABULOUS_ARITHMETIC_LIST(FABULOUS_SPECIALIZE_CHAM_GEQRF);
FABULOUS_ARITHMETIC_LIST(FABULOUS_SPECIALIZE_CHAM_GEQRF)
/*************************************/
/*************** MQR *****************/
......@@ -176,7 +176,7 @@ FABULOUS_ARITHMETIC_LIST(FABULOUS_SPECIALIZE_CHAM_GEQRF);
); \
} \
FABULOUS_ARITHMETIC_LIST(FABULOUS_SPECIALIZE_CHAM_MQR);
FABULOUS_ARITHMETIC_LIST(FABULOUS_SPECIALIZE_CHAM_MQR)
/*************************************/
/************** TRSM *****************/
......@@ -194,9 +194,7 @@ FABULOUS_ARITHMETIC_LIST(FABULOUS_SPECIALIZE_CHAM_MQR);
); \
} \
FABULOUS_ARITHMETIC_LIST(FABULOUS_SPECIALIZE_CHAM_TRSM);
FABULOUS_ARITHMETIC_LIST(FABULOUS_SPECIALIZE_CHAM_TRSM)
/*************************************/
/************** LACPY ****************/
......@@ -210,11 +208,11 @@ FABULOUS_ARITHMETIC_LIST(FABULOUS_SPECIALIZE_CHAM_TRSM);
return MORSE_##prefix_##lacpy_Tile_Async(uplo, A, B, seq, &r); \
} \
FABULOUS_ARITHMETIC_LIST(FABULOUS_SPECIALIZE_CHAM_LACPY);
FABULOUS_ARITHMETIC_LIST(FABULOUS_SPECIALIZE_CHAM_LACPY)
}; // end namespace chameleon;
} // end namespace chameleon
}; // end namespace fabulous;
} // end namespace fabulous
#endif // FABULOUS_CHAMELEON_KERNELS_HPP
......@@ -80,7 +80,7 @@ int64_t orgqr_flops(int m, int n, int k)
return (2L*m*n*k) - (2.0/3.0) * (k*k*k);
}
};
};
} // end namespace lapacke
} // end namespace fabulous
#endif // FABULOUS_FLOPS_HPP
......@@ -44,7 +44,7 @@ int gels(int m, int n, int nrhs, S *A, int lda, S *B, int ldb)
m, n, nbRHS, A, lda, B, ldb); \
} \
FABULOUS_ARITHMETIC_LIST(FABULOUS_SPECIALIZE_GELS);
FABULOUS_ARITHMETIC_LIST(FABULOUS_SPECIALIZE_GELS)
#else // FABULOUS_LAPACKE_NANCHECK
......@@ -75,12 +75,12 @@ FABULOUS_ARITHMETIC_LIST(FABULOUS_SPECIALIZE_GELS);
return info; \
} \
FABULOUS_ARITHMETIC_LIST(FABULOUS_SPECIALIZE_GELS);
FABULOUS_ARITHMETIC_LIST(FABULOUS_SPECIALIZE_GELS)
#endif // FABULOUS_LAPACKE_NANCHECK
}; // end namespace lapacke
} // end namespace lapacke
}; // end namespace fabulous
} // end namespace fabulous
#endif // FABULOUS_GELS_HPP
......@@ -297,7 +297,7 @@ inline int ggev(int n,
#endif // FABULOUS_LAPACKE_NANCHECK
}; // end namespace lapacke
}; // end namespace fabulous
} // end namespace lapacke
} // end namespace fabulous
#endif // FABULOUS_GGEV_HPP
......@@ -92,7 +92,7 @@ int ormqr(char trans, int m, int n, int k,
A, lda, tau.data()); \
} \
FABULOUS_ARITHMETIC_LIST(FABULOUS_SPECIALIZE_GEQRF);
FABULOUS_ARITHMETIC_LIST(FABULOUS_SPECIALIZE_GEQRF)