portelli/Grid
1
0
Fork 0
mirror of https://github.com/paboyle/Grid.git synced 2025-04-09 21:50:45 +01:00
Code Releases Activity

Remove warning in tensor layout comparison. Make default names and index names visible for PerambTensor and NoiseTensor

Browse Source
This commit is contained in:
Michael Marshall 2019-12-20 13:53:27 +00:00
parent df2b0c4e79
commit 0ca1992151
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Grid/serialisation/BaseIO.h
View File

@ -318,7 +318,7 @@ namespace Grid {
TotalDims[TensorRank + i] = Traits::Dimension(i); TotalDims[TensorRank + i] = Traits::Dimension(i);
// If the Tensor isn't in Row-Major order, then we'll need to copy it's data // If the Tensor isn't in Row-Major order, then we'll need to copy it's data
const bool CopyData{NumElements > 1 && ETensor::Layout != Eigen::StorageOptions::RowMajor}; const bool CopyData{NumElements > 1 && static_cast<int>( ETensor::Layout ) != static_cast<int>( Eigen::StorageOptions::RowMajor )};
const Scalar * pWriteBuffer; const Scalar * pWriteBuffer;
std::vector<Scalar> CopyBuffer; std::vector<Scalar> CopyBuffer;
const Index TotalNumElements = NumElements * Traits::count; const Index TotalNumElements = NumElements * Traits::count;

4
Hadrons/NamedTensor.hpp
View File

@ -159,9 +159,9 @@ using LapEvecs = Grid::Hadrons::EigenPack<LatticeColourVector>;
class NoiseTensor : public NamedTensor<Complex, 4> class NoiseTensor : public NamedTensor<Complex, 4>
{ {
public:
static const std::string Name__; static const std::string Name__;
static const std::array<std::string, 4> DefaultIndexNames__; static const std::array<std::string, 4> DefaultIndexNames__;
public:
// Default constructor (assumes tensor will be loaded from file) // Default constructor (assumes tensor will be loaded from file)
EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE NoiseTensor() : NamedTensor{Name__, DefaultIndexNames__} {} EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE NoiseTensor() : NamedTensor{Name__, DefaultIndexNames__} {}
@ -173,9 +173,9 @@ class NoiseTensor : public NamedTensor<Complex, 4>
class PerambTensor : public NamedTensor<SpinVector, 6> class PerambTensor : public NamedTensor<SpinVector, 6>
{ {
public:
static const std::string Name__; static const std::string Name__;
static const std::array<std::string, 6> DefaultIndexNames__; static const std::array<std::string, 6> DefaultIndexNames__;
public:
// Default constructor (assumes tensor will be loaded from file) // Default constructor (assumes tensor will be loaded from file)
EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE PerambTensor() : NamedTensor{Name__, DefaultIndexNames__} {} EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE PerambTensor() : NamedTensor{Name__, DefaultIndexNames__} {}