mirror of
https://github.com/paboyle/Grid.git
synced 2025-04-09 21:50:45 +01:00
Merge pull request #280 from mmphys/bugfix/ET_go_home
Bugfix/et go home
This commit is contained in:
commit
224cbf0453
@ -87,11 +87,7 @@ namespace Grid {
|
|||||||
template<typename Scalar_, typename Dimensions_, int Options_, typename IndexType>
|
template<typename Scalar_, typename Dimensions_, int Options_, typename IndexType>
|
||||||
struct is_tensor_fixed<Eigen::TensorFixedSize<Scalar_, Dimensions_, Options_, IndexType>>
|
struct is_tensor_fixed<Eigen::TensorFixedSize<Scalar_, Dimensions_, Options_, IndexType>>
|
||||||
: public std::true_type {};
|
: public std::true_type {};
|
||||||
template<typename Scalar_, typename Dimensions_, int Options_, typename IndexType,
|
template<typename T> struct is_tensor_fixed<Eigen::TensorMap<T>> : public std::true_type {};
|
||||||
int MapOptions_, template <class> class MapPointer_>
|
|
||||||
struct is_tensor_fixed<Eigen::TensorMap<Eigen::TensorFixedSize<Scalar_, Dimensions_,
|
|
||||||
Options_, IndexType>, MapOptions_, MapPointer_>>
|
|
||||||
: public std::true_type {};
|
|
||||||
|
|
||||||
// Is this a variable-size Eigen tensor
|
// Is this a variable-size Eigen tensor
|
||||||
template<typename T, typename V = void> struct is_tensor_variable : public std::false_type {};
|
template<typename T, typename V = void> struct is_tensor_variable : public std::false_type {};
|
||||||
|
@ -432,12 +432,10 @@ namespace Grid {
|
|||||||
std::vector<T> strToVec(const std::string s)
|
std::vector<T> strToVec(const std::string s)
|
||||||
{
|
{
|
||||||
std::istringstream sstr(s);
|
std::istringstream sstr(s);
|
||||||
T buf;
|
|
||||||
std::vector<T> v;
|
std::vector<T> v;
|
||||||
|
|
||||||
while(!sstr.eof())
|
for(T buf; sstr >> buf;)
|
||||||
{
|
{
|
||||||
sstr >> buf;
|
|
||||||
v.push_back(buf);
|
v.push_back(buf);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user