portelli/Grid
1
0
Fork 0
mirror of https://github.com/paboyle/Grid.git synced 2025-06-19 00:07:05 +01:00
Code Releases Activity

Remove compiler errors and warnings

Browse Source
This commit is contained in:
Peter Boyle
2019-07-18 14:47:02 +01:00
parent 08904f830e
commit a23dc295ac
13 changed files with 60 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Grid/Grid_Eigen_Dense.h
View File

@ -25,6 +25,7 @@
#endif
#include <Grid/Eigen/Dense>
#include <Grid/Eigen/unsupported/CXX11/Tensor>
/* NVCC restore */
#ifdef __NVCC__REDEFINE__

6
Grid/algorithms/iterative/LocalCoherenceLanczos.h
View File

@ -359,7 +359,11 @@ public:
ImplicitlyRestartedLanczos<FineField> IRL(ChebyOp,Op,Nstop,Nk,Nm,resid,MaxIt,betastp,MinRes);
FineField src(_FineGrid); src=1.0; src.Checkerboard() = _checkerboard;
FineField src(_FineGrid);
typedef typename FineField::scalar_type Scalar;
// src=1.0;
src=Scalar(1.0);
src.Checkerboard() = _checkerboard;
int Nconv;
IRL.calc(evals_fine,subspace,src,Nconv,false);

2
Grid/qcd/utils/A2Autils.h
View File

@ -1,6 +1,6 @@
#pragma once
//#include <Grid/Hadrons/Global.hpp>
#include <Grid/Eigen/unsupported/CXX11/Tensor>
#include <Grid/Grid_Eigen_Tensor.h>
NAMESPACE_BEGIN(Grid);

2
Grid/serialisation/BaseIO.h
View File

@ -33,7 +33,7 @@ Author: Guido Cossu <guido.cossu@ed.ac.uk>
#include <type_traits>
#include <Grid/tensors/Tensors.h>
#include <Grid/serialisation/VectorUtils.h>
#include <Grid/Eigen/unsupported/CXX11/Tensor>
#include <Grid/Grid_Eigen_Tensor.h>
namespace Grid {
namespace EigenIO {

2
Grid/simd/Grid_vector_types.h
View File

@ -236,7 +236,7 @@ public:
accelerator Grid_simd() = default;
accelerator_inline Grid_simd(const Grid_simd &rhs) : v(rhs.v){}; // compiles in movaps
accelerator_inline Grid_simd(const Grid_simd &&rhs) : v(rhs.v){};
accelerator Grid_simd(const Real a) { vsplat(*this, Scalar_type(a)); };
accelerator_inline Grid_simd(const Real a) { vsplat(*this, Scalar_type(a)); };
// Enable if complex type
template <typename S = Scalar_type> accelerator_inline
Grid_simd(const typename std::enable_if<is_complex<S>::value, S>::type a) {

1
Grid/stencil/GeneralLocalStencil.h
View File

@ -84,7 +84,6 @@ public:
Coordinate NbrCoor;
for(Integer site=0;site<osites;site++){
for(Integer ii=0;ii<npoints;ii++){
Integer Nbr;
Integer lex = site*npoints+ii;
GeneralStencilEntry SE;
////////////////////////////////////////////////

2
Grid/tensors/Tensor_class.h
View File

@ -191,7 +191,7 @@ public:
static accelerator_inline constexpr int Nsimd(void) { return sizeof(vector_type)/sizeof(scalar_type); }
template <class T, typename std::enable_if<!isGridTensor<T>::value, T>::type * = nullptr>
strong_inline auto operator=(T arg) -> iVector<vtype, N> {
accelerator_inline auto operator=(T arg) -> iVector<vtype, N> {
zeroit(*this);
for (int i = 0; i < N; i++) _internal[i] = arg;
return *this;

4
Grid/util/Lexicographic.h
View File

@ -29,7 +29,7 @@ namespace Grid{
}
template<class coor_t>
static accelerator_inline void IndexFromCoorReversed (const coor_t& coor,int &index,const coor_t &dims){
static inline void IndexFromCoorReversed (const coor_t& coor,int &index,const coor_t &dims){
int nd=dims.size();
int stride=1;
index=0;
@ -39,7 +39,7 @@ namespace Grid{
}
}
template<class coor_t>
static accelerator_inline void CoorFromIndexReversed (coor_t& coor,int index,const coor_t &dims){
static inline void CoorFromIndexReversed (coor_t& coor,int index,const coor_t &dims){
int nd= dims.size();
coor.resize(nd);
for(int d=nd-1;d>=0;d--){