Skip to content
Permalink
Browse files

Adapting for latest changes in Blaze

  • Loading branch information...
hkaiser committed Aug 19, 2019
1 parent ebfe572 commit b913dc4afec87e47ba948d1e184e83867b2761b3
Showing with 76 additions and 138 deletions.
  1. +1 −2 blaze_tensor/math/dense/DenseArray.h
  2. +2 −3 blaze_tensor/math/dense/DenseTensor.h
  3. +1 −1 blaze_tensor/math/dense/InitializerTensor.h
  4. +6 −9 blaze_tensor/math/dense/StaticTensor.h
  5. +1 −1 blaze_tensor/math/dense/UniformTensor.h
  6. +3 −5 blaze_tensor/math/expressions/DArrNormExpr.h
  7. +0 −1 blaze_tensor/math/expressions/DArrReduceExpr.h
  8. +4 −6 blaze_tensor/math/expressions/DTensNormExpr.h
  9. +0 −1 blaze_tensor/math/expressions/DTensReduceExpr.h
  10. +1 −2 blaze_tensor/math/typetraits/IsColumnMajorTensor.h
  11. +1 −2 blaze_tensor/math/typetraits/IsColumnSlice.h
  12. +1 −2 blaze_tensor/math/typetraits/IsColumnSliceMatrix.h
  13. +1 −2 blaze_tensor/math/typetraits/IsDenseArray.h
  14. +1 −2 blaze_tensor/math/typetraits/IsDenseTensor.h
  15. +1 −2 blaze_tensor/math/typetraits/IsDilatedSubmatrix.h
  16. +1 −2 blaze_tensor/math/typetraits/IsDilatedSubtensor.h
  17. +1 −2 blaze_tensor/math/typetraits/IsDilatedSubvector.h
  18. +1 −2 blaze_tensor/math/typetraits/IsMatExpandExpr.h
  19. +1 −2 blaze_tensor/math/typetraits/IsNdArray.h
  20. +1 −2 blaze_tensor/math/typetraits/IsPageSlice.h
  21. +1 −2 blaze_tensor/math/typetraits/IsPageSliceMatrix.h
  22. +1 −2 blaze_tensor/math/typetraits/IsQuatSlice.h
  23. +1 −2 blaze_tensor/math/typetraits/IsQuatSliceTensor.h
  24. +1 −3 blaze_tensor/math/typetraits/IsRavelExpr.h
  25. +1 −2 blaze_tensor/math/typetraits/IsRowMajorArray.h
  26. +1 −2 blaze_tensor/math/typetraits/IsRowMajorTensor.h
  27. +1 −2 blaze_tensor/math/typetraits/IsRowSlice.h
  28. +1 −2 blaze_tensor/math/typetraits/IsRowSliceMatrix.h
  29. +1 −2 blaze_tensor/math/typetraits/IsSubtensor.h
  30. +1 −2 blaze_tensor/math/typetraits/IsTensMapExpr.h
  31. +1 −2 blaze_tensor/math/typetraits/IsTensMatSchurExpr.h
  32. +1 −2 blaze_tensor/math/typetraits/IsTensScalarDivExpr.h
  33. +1 −2 blaze_tensor/math/typetraits/IsTensScalarMultExpr.h
  34. +1 −2 blaze_tensor/math/typetraits/IsTensSerialExpr.h
  35. +1 −2 blaze_tensor/math/typetraits/IsTensTensAddExpr.h
  36. +1 −2 blaze_tensor/math/typetraits/IsTensTensMapExpr.h
  37. +1 −2 blaze_tensor/math/typetraits/IsTensTensMultExpr.h
  38. +1 −2 blaze_tensor/math/typetraits/IsTensTensSubExpr.h
  39. +1 −2 blaze_tensor/math/typetraits/IsTensTransExpr.h
  40. +1 −2 blaze_tensor/math/typetraits/IsTensVecMultExpr.h
  41. +1 −2 blaze_tensor/math/typetraits/IsTensor.h
  42. +4 −6 blaze_tensor/math/views/DilatedSubmatrix.h
  43. +6 −8 blaze_tensor/math/views/DilatedSubtensor.h
  44. +4 −5 blaze_tensor/math/views/DilatedSubvector.h
  45. +6 −8 blaze_tensor/math/views/Subtensor.h
  46. +0 −1 blaze_tensor/math/views/columnslice/BaseTemplate.h
  47. +0 −1 blaze_tensor/math/views/pageslice/BaseTemplate.h
  48. +0 −1 blaze_tensor/math/views/quatslice/BaseTemplate.h
  49. +0 −1 blaze_tensor/math/views/rowslice/BaseTemplate.h
  50. +0 −1 blaze_tensor/math/views/subtensor/BaseTemplate.h
  51. +1 −2 blazetest/blazetest/mathtest/dmatexpand/OperationTest.h
  52. +1 −2 blazetest/blazetest/mathtest/dmatravel/OperationTest.h
  53. +1 −2 blazetest/blazetest/mathtest/dtensdmatschur/OperationTest.h
  54. +1 −2 blazetest/blazetest/mathtest/dtensdtensadd/OperationTest.h
  55. +1 −2 blazetest/blazetest/mathtest/dtensdvecmult/OperationTest.h
  56. +1 −2 blazetest/blazetest/mathtest/dtensravel/OperationTest.h
@@ -53,9 +53,8 @@
#include <blaze/math/typetraits/IsRestricted.h>
#include <blaze/util/Assert.h>
#include <blaze/util/EnableIf.h>
#include <blaze/util/FalseType.h>
#include <blaze/util/IntegralConstant.h>
#include <blaze/util/mpl/If.h>
#include <blaze/util/TrueType.h>
#include <blaze/util/Types.h>
#include <blaze/util/typetraits/IsBuiltin.h>
#include <blaze/util/typetraits/IsNumeric.h>
@@ -53,10 +53,9 @@
#include <blaze/math/typetraits/IsRestricted.h>
#include <blaze/util/Assert.h>
#include <blaze/util/EnableIf.h>
#include <blaze/util/FalseType.h>
#include <blaze/util/mpl/If.h>
#include <blaze/util/TrueType.h>
#include <blaze/util/IntegralConstant.h>
#include <blaze/util/Types.h>
#include <blaze/util/mpl/If.h>
#include <blaze/util/typetraits/IsBuiltin.h>
#include <blaze/util/typetraits/IsNumeric.h>

@@ -54,7 +54,7 @@
#include <blaze/util/constraints/Pointer.h>
#include <blaze/util/constraints/Reference.h>
#include <blaze/util/constraints/Volatile.h>
#include <blaze/util/TrueType.h>
#include <blaze/util/IntegralConstant.h>
#include <blaze/util/Types.h>
#include <blaze/util/MaybeUnused.h>

@@ -95,11 +95,9 @@
#include <blaze/util/Assert.h>
#include <blaze/util/DisableIf.h>
#include <blaze/util/EnableIf.h>
#include <blaze/util/FalseType.h>
#include <blaze/util/IntegralConstant.h>
#include <blaze/util/Memory.h>
#include <blaze/util/StaticAssert.h>
#include <blaze/util/TrueType.h>
#include <blaze/util/Types.h>
#include <blaze/util/MaybeUnused.h>
#include <blaze/util/algorithms/Max.h>
@@ -110,7 +108,6 @@
#include <blaze/util/constraints/Reference.h>
#include <blaze/util/constraints/Vectorizable.h>
#include <blaze/util/constraints/Volatile.h>
#include <blaze/util/mpl/PtrdiffT.h>
#include <blaze/util/typetraits/AlignmentOf.h>
#include <blaze/util/typetraits/IsNumeric.h>
#include <blaze/util/typetraits/IsSame.h>
@@ -3227,17 +3224,17 @@ inline auto StaticTensor<Type,O,M,N>::schurAssign( const DenseTensor<MT>& rhs )
/*! \cond BLAZE_INTERNAL */
template< typename T, size_t O, size_t M, size_t N >
struct Size< StaticTensor<T,O,M,N>, 0UL >
: public PtrdiffT<O>
: public Ptrdiff_t<O>
{};

template< typename T, size_t O, size_t M, size_t N >
struct Size< StaticTensor<T,O,M,N>, 1UL >
: public PtrdiffT<M>
: public Ptrdiff_t<M>
{};

template< typename T, size_t O, size_t M, size_t N >
struct Size< StaticTensor<T,O,M,N>, 2UL >
: public PtrdiffT<N>
: public Ptrdiff_t<N>
{};
/*! \endcond */
//*************************************************************************************************
@@ -3255,17 +3252,17 @@ struct Size< StaticTensor<T,O,M,N>, 2UL >
/*! \cond BLAZE_INTERNAL */
template< typename T, size_t O, size_t M, size_t N >
struct MaxSize< StaticTensor<T,O,M,N>, 0UL >
: public PtrdiffT<O>
: public Ptrdiff_t<O>
{};

template< typename T, size_t O, size_t M, size_t N >
struct MaxSize< StaticTensor<T,O,M,N>, 1UL >
: public PtrdiffT<M>
: public Ptrdiff_t<M>
{};

template< typename T, size_t O, size_t M, size_t N >
struct MaxSize< StaticTensor<T,O,M,N>, 2UL >
: public PtrdiffT<N>
: public Ptrdiff_t<N>
{};
/*! \endcond */
//*************************************************************************************************
@@ -82,7 +82,7 @@
#include <blaze/system/Thresholds.h>
#include <blaze/util/Assert.h>
#include <blaze/util/EnableIf.h>
#include <blaze/util/TrueType.h>
#include <blaze/util/IntegralConstant.h>
#include <blaze/util/Types.h>
#include <blaze/util/MaybeUnused.h>
#include <blaze/util/constraints/Const.h>
@@ -71,14 +71,12 @@
#include <blaze/math/typetraits/UnderlyingBuiltin.h>
#include <blaze/system/Optimizations.h>
#include <blaze/util/Assert.h>
#include <blaze/util/FalseType.h>
#include <blaze/util/IntegralConstant.h>
#include <blaze/util/FunctionTrace.h>
#include <blaze/util/StaticAssert.h>
#include <blaze/util/TrueType.h>
#include <blaze/util/TypeList.h>
#include <blaze/util/Types.h>
#include <blaze/util/mpl/And.h>
#include <blaze/util/mpl/Bool.h>
#include <blaze/util/mpl/If.h>
#include <blaze/util/typetraits/HasMember.h>
#include <blaze/util/typetraits/RemoveConst.h>
@@ -118,8 +116,8 @@ struct DArrNormHelper
( useOptimizedKernels &&
CT::simdEnabled &&
If_t< HasSIMDEnabled_v<Abs> && HasSIMDEnabled_v<Power>
, And< GetSIMDEnabled<Abs,ET>, GetSIMDEnabled<Power,ET> >
, And< HasLoad<Abs>, HasLoad<Power> > >::value &&
, And_t< GetSIMDEnabled<Abs,ET>, GetSIMDEnabled<Power,ET> >
, And_t< HasLoad<Abs>, HasLoad<Power> > >::value &&
HasSIMDAdd_v< ElementType_t<CT>, ElementType_t<CT> > );
//**********************************************************************************************
};
@@ -66,7 +66,6 @@
#include <blaze/util/FunctionTrace.h>
#include <blaze/util/mpl/If.h>
#include <blaze/util/StaticAssert.h>
#include <blaze/util/Template.h>
#include <blaze/util/Types.h>
#include <blaze/util/typetraits/HasMember.h>
#include <blaze/util/typetraits/IsSame.h>
@@ -70,13 +70,11 @@
#include <blaze/math/typetraits/UnderlyingBuiltin.h>
#include <blaze/system/Optimizations.h>
#include <blaze/util/Assert.h>
#include <blaze/util/FalseType.h>
#include <blaze/util/IntegralConstant.h>
#include <blaze/util/FunctionTrace.h>
#include <blaze/util/mpl/And.h>
#include <blaze/util/mpl/Bool.h>
#include <blaze/util/mpl/If.h>
#include <blaze/util/StaticAssert.h>
#include <blaze/util/TrueType.h>
#include <blaze/util/TypeList.h>
#include <blaze/util/Types.h>
#include <blaze/util/typetraits/HasMember.h>
@@ -115,8 +113,8 @@ struct DTensNormHelper
( useOptimizedKernels &&
CT::simdEnabled &&
If_t< HasSIMDEnabled_v<Abs> && HasSIMDEnabled_v<Power>
, And< GetSIMDEnabled<Abs,ET>, GetSIMDEnabled<Power,ET> >
, And< HasLoad<Abs>, HasLoad<Power> > >::value &&
, And_t< GetSIMDEnabled<Abs,ET>, GetSIMDEnabled<Power,ET> >
, And_t< HasLoad<Abs>, HasLoad<Power> > >::value &&
HasSIMDAdd_v< ElementType_t<CT>, ElementType_t<CT> > );
//**********************************************************************************************
};
@@ -331,7 +329,7 @@ template< typename MT // Type of the dense tensor
, typename Root > // Type of the root operation
decltype(auto) norm_backend( const DenseTensor<MT>& dm, Abs abs, Power power, Root root )
{
return norm_backend( ~dm, abs, power, root, Bool< DTensNormHelper<MT,Abs,Power>::value >() );
return norm_backend( ~dm, abs, power, root, Bool_t< DTensNormHelper<MT,Abs,Power>::value >() );
}
/*! \endcond */
//*************************************************************************************************
@@ -66,7 +66,6 @@
#include <blaze/util/FunctionTrace.h>
#include <blaze/util/mpl/If.h>
#include <blaze/util/StaticAssert.h>
#include <blaze/util/Template.h>
#include <blaze/util/Types.h>
#include <blaze/util/typetraits/HasMember.h>
#include <blaze/util/typetraits/IsSame.h>
@@ -42,8 +42,7 @@
//*************************************************************************************************

#include <utility>
#include <blaze/util/FalseType.h>
#include <blaze/util/TrueType.h>
#include <blaze/util/IntegralConstant.h>

#include <blaze_tensor/math/expressions/Tensor.h>
#include <blaze_tensor/math/StorageOrder.h>
@@ -41,8 +41,7 @@
// Includes
//*************************************************************************************************

#include <blaze/util/FalseType.h>
#include <blaze/util/TrueType.h>
#include <blaze/util/IntegralConstant.h>

#include <blaze_tensor/math/views/Forward.h>

@@ -43,8 +43,7 @@

#include <blaze/math/TransposeFlag.h>
#include <blaze/math/expressions/Matrix.h>
#include <blaze/util/FalseType.h>
#include <blaze/util/TrueType.h>
#include <blaze/util/IntegralConstant.h>
#include <utility>

namespace blaze {
@@ -42,8 +42,7 @@
//*************************************************************************************************

#include <utility>
#include <blaze/util/FalseType.h>
#include <blaze/util/TrueType.h>
#include <blaze/util/IntegralConstant.h>

#include <blaze_tensor/math/expressions/DenseArray.h>

@@ -42,8 +42,7 @@
//*************************************************************************************************

#include <utility>
#include <blaze/util/FalseType.h>
#include <blaze/util/TrueType.h>
#include <blaze/util/IntegralConstant.h>

#include <blaze_tensor/math/expressions/DenseTensor.h>

@@ -43,8 +43,7 @@
//*************************************************************************************************

#include <blaze/math/views/Forward.h>
#include <blaze/util/FalseType.h>
#include <blaze/util/TrueType.h>
#include <blaze/util/IntegralConstant.h>

#include <blaze_tensor/math/views/Forward.h>

@@ -43,8 +43,7 @@
//*************************************************************************************************

#include <blaze/math/views/Forward.h>
#include <blaze/util/FalseType.h>
#include <blaze/util/TrueType.h>
#include <blaze/util/IntegralConstant.h>

#include <blaze_tensor/math/views/Forward.h>

@@ -42,8 +42,7 @@
//*************************************************************************************************

#include <blaze/math/views/Forward.h>
#include <blaze/util/FalseType.h>
#include <blaze/util/TrueType.h>
#include <blaze/util/IntegralConstant.h>

#include <blaze_tensor/math/views/Forward.h>

@@ -41,8 +41,7 @@
// Includes
//*************************************************************************************************

#include <blaze/util/FalseType.h>
#include <blaze/util/TrueType.h>
#include <blaze/util/IntegralConstant.h>

#include <blaze_tensor/math/expressions/MatExpandExpr.h>

@@ -42,8 +42,7 @@
//*************************************************************************************************

#include <utility>
#include <blaze/util/FalseType.h>
#include <blaze/util/TrueType.h>
#include <blaze/util/IntegralConstant.h>

#include <blaze_tensor/math/expressions/Array.h>

@@ -41,8 +41,7 @@
// Includes
//*************************************************************************************************

#include <blaze/util/FalseType.h>
#include <blaze/util/TrueType.h>
#include <blaze/util/IntegralConstant.h>

#include <blaze_tensor/math/views/Forward.h>

@@ -43,8 +43,7 @@

#include <blaze/math/TransposeFlag.h>
#include <blaze/math/expressions/Matrix.h>
#include <blaze/util/FalseType.h>
#include <blaze/util/TrueType.h>
#include <blaze/util/IntegralConstant.h>
#include <utility>

namespace blaze {
@@ -42,8 +42,7 @@
// Includes
//*************************************************************************************************

#include <blaze/util/FalseType.h>
#include <blaze/util/TrueType.h>
#include <blaze/util/IntegralConstant.h>

#include <blaze_tensor/math/views/Forward.h>

@@ -42,8 +42,7 @@
// Includes
//*************************************************************************************************

#include <blaze/util/FalseType.h>
#include <blaze/util/TrueType.h>
#include <blaze/util/IntegralConstant.h>
#include <utility>

#include <blaze_tensor/math/expressions/Tensor.h>
@@ -35,14 +35,12 @@

#ifndef _BLAZE_TENSOR_MATH_TYPETRAITS_ISRAVELEXPR_H_
#define _BLAZE_TENSOR_MATH_TYPETRAITS_ISRAVELEXPR_H_
TENSOR_

//*************************************************************************************************
// Includes
//*************************************************************************************************

#include <blaze/util/FalseType.h>
#include <blaze/util/TrueType.h>
#include <blaze/util/IntegralConstant.h>

#include <blaze_tensor/math/expressions/RavelExpr.h>

@@ -42,8 +42,7 @@
//*************************************************************************************************

#include <utility>
#include <blaze/util/FalseType.h>
#include <blaze/util/TrueType.h>
#include <blaze/util/IntegralConstant.h>

#include <blaze_tensor/math/expressions/Array.h>
#include <blaze_tensor/math/StorageOrder.h>
@@ -42,8 +42,7 @@
//*************************************************************************************************

#include <utility>
#include <blaze/util/FalseType.h>
#include <blaze/util/TrueType.h>
#include <blaze/util/IntegralConstant.h>

#include <blaze_tensor/math/expressions/Tensor.h>
#include <blaze_tensor/math/StorageOrder.h>
@@ -41,8 +41,7 @@
// Includes
//*************************************************************************************************

#include <blaze/util/FalseType.h>
#include <blaze/util/TrueType.h>
#include <blaze/util/IntegralConstant.h>

#include <blaze_tensor/math/views/Forward.h>

@@ -43,8 +43,7 @@

#include <blaze/math/TransposeFlag.h>
#include <blaze/math/expressions/Matrix.h>
#include <blaze/util/FalseType.h>
#include <blaze/util/TrueType.h>
#include <blaze/util/IntegralConstant.h>
#include <utility>

namespace blaze {
@@ -41,8 +41,7 @@
// Includes
//*************************************************************************************************

#include <blaze/util/FalseType.h>
#include <blaze/util/TrueType.h>
#include <blaze/util/IntegralConstant.h>

#include <blaze_tensor/math/views/Forward.h>

@@ -42,8 +42,7 @@
//*************************************************************************************************

#include <utility>
#include <blaze/util/FalseType.h>
#include <blaze/util/TrueType.h>
#include <blaze/util/IntegralConstant.h>

#include <blaze_tensor/math/expressions/TensMapExpr.h>

0 comments on commit b913dc4

Please sign in to comment.
You can’t perform that action at this time.