Commit 9e743fb5 authored by MIJIEUX Thomas's avatar MIJIEUX Thomas

Header guard and class/namespace typesetting

parent cef9e757
......@@ -2,7 +2,7 @@
#define FABULOUS_EQUATION_HPP
namespace fabulous {
template< class S > class BGMRes;
template<class S> class BGMRes;
template<class Matrix, class S> class Equation;
};
......@@ -15,7 +15,8 @@ namespace fabulous {
* \brief Tuple container for A, X, B and epsilon
*/
template<class Matrix, class S>
class Equation {
class Equation
{
public:
using value_type = typename Arithmetik<S>::value_type;
using primary_type = typename Arithmetik<S>::primary_type;
......
......@@ -20,7 +20,8 @@ public:
_max_mvp(max_mvp), _max_space(max_space)
{
}
};
}; // end class Parameters
/**
* \brief Helper function to build Parameters object
......@@ -32,6 +33,6 @@ Parameters parameters(int max_mvp, int max_space)
return Parameters{max_mvp, max_space};
}
}; // namespace fabulous
}; // end namespace fabulous
#endif // FABULOUS_PARAMETERS_HPP
......@@ -38,6 +38,6 @@ inline Logger<P> solve(Equation &eq, const Algo &algo, Parameters param,
return solver.get_logger();
}
};
}; // end namespace fabulous
#endif // FABULOUS_SOLVE_HPP
......@@ -279,8 +279,9 @@ public:
print_footer();
return convergence;
}
};
}; // namespace fabulous
}; // end namespace fabulous
#endif // FABULOUS_ARNOLDI_DR_HPP
......@@ -478,8 +478,9 @@ public:
print_footer();
return convergence;
}
};
}; // namespace fabulous
}; // end class ArnoldiIB
}; // end namespace fabulous
#endif // FABULOUS_ARNOLDI_IB_HPP
......@@ -487,8 +487,9 @@ public:
print_footer();
return convergence;
}
};
}; // namespace fabulous
}; // end class ArnoldiIBDR
}; // end namespace fabulous
#endif // FABULOUS_ARNOLDI_IB_DR_HPP
......@@ -450,6 +450,6 @@ std::ostream& operator<<(std::ostream &o, const Block<U> &b)
return o;
}
}; // namespace fabulous
}; // end namespace fabulous
#endif // FABULOUS_BLOCK_HPP
......@@ -5,7 +5,7 @@ namespace fabulous {
template<class> class BlockWP;
};
#include "./Block.hpp"
#include "fabulous/data/Block.hpp"
namespace fabulous {
......
......@@ -442,6 +442,6 @@ public:
}
};
}; // namespace fabulous
}; // end namespace fabulous
#endif // FABULOUS_HESS_IB_DR_HPP
......@@ -98,6 +98,7 @@ public:
}
LapackKernI::orgqr(M, N, N, Q.get_ptr(), LD, tau.data());
}
}; // end struct Algorithm
}; // end namespace fabulous
......
......@@ -202,6 +202,6 @@ FABULOUS_ARITHMETIC_LIST(FABULOUS_SPECIALIZE_CHAM_TRSM);
FABULOUS_ARITHMETIC_LIST(FABULOUS_SPECIALIZE_CHAM_LACPY);
}; // namespace fabulous;
}; // end namespace fabulous;
#endif // FABULOUS_CHAMELEON_INTERFACE_H
#endif // FABULOUS_CHAMELEON_INTERFACE_HPP
......@@ -44,6 +44,7 @@ struct ChameleonKernTopLevelI
}
#pragma GCC diagnostic pop
}; // end struct ChameleonKernTopLevelI
/*************************************/
......
......@@ -241,9 +241,10 @@ struct LapackKernI
}
#pragma GCC diagnostic pop
}; // end class LapackKernI
}; // namespace fabulous
}; // end namespace fabulous
#define FABULOUS_LAPACK_INTERFACE_INC__
......
......@@ -204,7 +204,6 @@ inline void LapackKernI::dot(int N,
cblas_zdotc_sub(N, X, incX, Y, incY, ret);
}
};
}; // end namespace fabulous
#endif // FABULOUS_LAPACK_INTERFACE_CBLAS_HPP
......@@ -9,11 +9,9 @@
# error "LapackInterface_work.hpp was included but FABULOUS_LAPACKE_NANCHECK is set"
#endif
#include "./LapackInterface.hpp"
#include "fabulous/kernel/LapackInterface.hpp"
#include "fabulous/ext/lapacke.h"
namespace fabulous {
/********* LACPY **********/
......@@ -465,7 +463,6 @@ inline int LapackKernI::ggev(int n,
FABULOUS_ARITHMETIC_LIST(FABULOUS_SPECIALIZE_TRSM);
}; // end namespace fabulous
#endif // FABULOUS_LAPACK_INTERFACE_WORK_HPP
......@@ -47,6 +47,6 @@ private:
}
};
}; // namespace fabulous
}; // end namespace fabulous
#endif // ARNOLDI_ORTHO_BLOCK_HPP
......@@ -48,8 +48,9 @@ private:
WP.compute_C(C); // Orthogonalisation of (candidate) W against P
W.InPlaceQRFacto(D);
}
};
}; // namespace fabulous
}; // end class OrthogonalizerBlockIB
}; // end namespace fabulous
#endif // ARNOLDI_ORTHO_BLOCK_IB_HPP
......@@ -221,8 +221,9 @@ protected:
default: FABULOUS_FATAL_ERROR("Invalid orthogonalization scheme."); break;
}
}
};
}; // namespace fabulous
}; // end class OrthogonalizerBlockCOMMON
}; // end namespace fabulous
#endif // ARNOLDI_ORTHO_BLOCK_COMMON_HPP
......@@ -60,6 +60,6 @@ inline std::ostream& operator<<(std::ostream& os, const OrthoScheme ortho)
return os;
}
}; // namespace fabulous
}; // end namespace fabulous
#endif // FABULOUS_ORTHO_ENUM_HPP
......@@ -89,6 +89,6 @@ inline std::ostream& operator<<(std::ostream &o, const OrthoParam &ortho)
return o;
}
}; // namespace fabulous
}; // end namespace fabulous
#endif // FABULOUS_ORTHO_PARAM_HPP
......@@ -77,7 +77,8 @@ public:
}
H.notify_orthogonalization_end();
}
};
}; // end class Orthogonalizer
}; // end namespace fabulous
......
......@@ -266,8 +266,8 @@ private:
}
}
};
}; // end class OrthogonalizerRuheSTD
}; // namespace fabulous;
}; // end namespace fabulous;
#endif // FABULOUS_ORTHO_RUHE_HPP
......@@ -343,8 +343,9 @@ private:
default: FABULOUS_FATAL_ERROR("Invalid orthogonalization scheme\n"); break;
}
}
};
}; // namespace fabulous
}; // end class OrthogonalizerRuheIB
}; // end namespace fabulous
#endif // FABULOUS_ARNOLDI_ORTHO_RUHE_IB_HPP
......@@ -74,6 +74,6 @@ inline void dump_descriptor(const MORSE_desc_t *desc)
desc->register_mat );
}
};
}; // end namespace fabulous
#endif // FABULOUS_CHAMELEON_HPP
......@@ -8,7 +8,7 @@
#include <cstdlib>
#include <cstring>
#include "./Color.hpp"
#include "fabulous/utils/Color.hpp"
namespace fabulous {
......
#ifndef FABULOUS_MATRIX_IW_LOADER_H
#define FABULOUS_MATRIX_IW_LOADER_H
#ifndef FABULOUS_MATRIX_IW_LOADER_HPP
#define FABULOUS_MATRIX_IW_LOADER_HPP
#include <cstdlib>
#include <cstring>
......@@ -8,6 +8,10 @@
#include <iostream>
#include <fstream>
#include <sstream>
#include <vector>
#include <complex>
#include "fabulous/utils/Error.hpp"
namespace fabulous {
......@@ -86,8 +90,9 @@ public:
for (int i = 0; i < M; ++i)
A.at(i, j) = vec[j*N+i];
}
};
};
}; // end class MatrixIWLoader
}; // end namespace fabulous
#endif // FABULOUS_MATRIX_IW_LOADER_H
#endif // FABULOUS_MATRIX_IW_LOADER_HPP
#ifndef FABULOUS_MATRIX_MARKET_LOADER_H
#define FABULOUS_MATRIX_MARKET_LOADER_H
#ifndef FABULOUS_MATRIX_MARKET_LOADER_HPP
#define FABULOUS_MATRIX_MARKET_LOADER_HPP
#include <cstdlib>
#include <cstring>
......@@ -8,8 +8,12 @@
#include <fstream>
#include <sstream>
#include <type_traits>
#include <complex>
#include <vector>
#include "fabulous/utils/Error.hpp"
#include "fabulous/utils/Utils.hpp"
#include "fabulous/utils/Meta.hpp"
namespace fabulous {
......@@ -120,9 +124,9 @@ public:
LoadMatrix(A, file, filename);
file.close();
}
};
}; // end class MatrixMarketLoader
}; // namespace fabulous
}; // end namespace fabulous
#endif // FABULOUS_MATRIX_MARKET_LOADER_H
#endif // FABULOUS_MATRIX_MARKET_LOADER_HPP
#ifndef FABULOUS_RANDOM_MATRIX_LOADER_H
#define FABULOUS_RANDOM_MATRIX_LOADER_H
#ifndef FABULOUS_RANDOM_MATRIX_LOADER_HPP
#define FABULOUS_RANDOM_MATRIX_LOADER_HPP
#include <random>
#include <complex>
namespace fabulous {
template<class U,
class E = typename std::enable_if< // only real types
......@@ -27,7 +30,6 @@ U rnd(std::uniform_real_distribution<T> &dis, std::mt19937 &gen)
return U{dis(gen), dis(gen)};
}
class RandomMatrixLoader
{
private:
......@@ -46,6 +48,9 @@ public:
for (int i = 0; i < A.get_nb_row(); ++i)
A.at(i,j) = V{rnd<V>(dis, _gen)};
}
};
#endif // FABULOUS_RANDOM_MATRIX_LOADER_H
}; // end class RandomMatrixLoader
}; // end namespace fabulous
#endif // FABULOUS_RANDOM_MATRIX_LOADER_HPP
......@@ -164,6 +164,6 @@ static void print_elapsed_time(const TestRet<P> &r, const std::string &test_name
<<"\t\tMax:\t"<<r.minmax.second<<"\n";
}
};
}; // end namespace fabulous
#endif // FABULOUS_TEST_HPP
#ifndef FABULOUS_USER_INPUT_MATRIX_H
#define FABULOUS_USER_INPUT_MATRIX_H
#ifndef FABULOUS_USER_INPUT_MATRIX_HPP
#define FABULOUS_USER_INPUT_MATRIX_HPP
#include <memory>
......@@ -139,9 +139,8 @@ public:
LapackKernI::Tgemm(M, N, dim, A, lda, B, ldb, C, ldc, S{1.0}, S{0.0} );
}
};
}; // end class UserInputMatrix
}; // namespace fabulous
}; // end namespace fabulous
#endif // FABULOUS_USER_INPUT_MATRIX_H
#endif // FABULOUS_USER_INPUT_MATRIX_HPP
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