Skip to content

Commit

Permalink
Adapting for latest changes in Blaze
Browse files Browse the repository at this point in the history
  • Loading branch information
@hkaiser
hkaiser committed Aug 19, 2019
1 parent ebfe572 commit b913dc4
Show file tree
Hide file tree
Showing 56 changed files with 76 additions and 138 deletions.
3 changes: 1 addition & 2 deletions blaze_tensor/math/dense/DenseArray.h
View file
Expand Up @@ -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>
Expand Down
5 changes: 2 additions & 3 deletions blaze_tensor/math/dense/DenseTensor.h
View file
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion blaze_tensor/math/dense/InitializerTensor.h
View file
Expand Up @@ -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>

Expand Down
15 changes: 6 additions & 9 deletions blaze_tensor/math/dense/StaticTensor.h
View file
Expand Up @@ -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>
Expand All @@ -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>
Expand Down Expand Up @@ -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 */
//*************************************************************************************************
Expand All @@ -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 */
//*************************************************************************************************
Expand Down
2 changes: 1 addition & 1 deletion blaze_tensor/math/dense/UniformTensor.h
View file
Expand Up @@ -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>
Expand Down
8 changes: 3 additions & 5 deletions blaze_tensor/math/expressions/DArrNormExpr.h
View file
Expand Up @@ -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>
Expand Down Expand Up @@ -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> > );
//**********************************************************************************************
};
Expand Down
1 change: 0 additions & 1 deletion blaze_tensor/math/expressions/DArrReduceExpr.h
View file
Expand Up @@ -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>
Expand Down
10 changes: 4 additions & 6 deletions blaze_tensor/math/expressions/DTensNormExpr.h
View file
Expand Up @@ -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>
Expand Down Expand Up @@ -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> > );
//**********************************************************************************************
};
Expand Down Expand Up @@ -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 */
//*************************************************************************************************
Expand Down
1 change: 0 additions & 1 deletion blaze_tensor/math/expressions/DTensReduceExpr.h
View file
Expand Up @@ -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>
Expand Down
3 changes: 1 addition & 2 deletions blaze_tensor/math/typetraits/IsColumnMajorTensor.h
View file
Expand Up @@ -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>
Expand Down
3 changes: 1 addition & 2 deletions blaze_tensor/math/typetraits/IsColumnSlice.h
View file
Expand Up @@ -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>

Expand Down
3 changes: 1 addition & 2 deletions blaze_tensor/math/typetraits/IsColumnSliceMatrix.h
View file
Expand Up @@ -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 {
Expand Down
3 changes: 1 addition & 2 deletions blaze_tensor/math/typetraits/IsDenseArray.h
View file
Expand Up @@ -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>

Expand Down
3 changes: 1 addition & 2 deletions blaze_tensor/math/typetraits/IsDenseTensor.h
View file
Expand Up @@ -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>

Expand Down
3 changes: 1 addition & 2 deletions blaze_tensor/math/typetraits/IsDilatedSubmatrix.h
View file
Expand Up @@ -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>

Expand Down
3 changes: 1 addition & 2 deletions blaze_tensor/math/typetraits/IsDilatedSubtensor.h
View file
Expand Up @@ -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>

Expand Down
3 changes: 1 addition & 2 deletions blaze_tensor/math/typetraits/IsDilatedSubvector.h
View file
Expand Up @@ -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>

Expand Down
3 changes: 1 addition & 2 deletions blaze_tensor/math/typetraits/IsMatExpandExpr.h
View file
Expand Up @@ -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>

Expand Down
3 changes: 1 addition & 2 deletions blaze_tensor/math/typetraits/IsNdArray.h
View file
Expand Up @@ -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>

Expand Down
3 changes: 1 addition & 2 deletions blaze_tensor/math/typetraits/IsPageSlice.h
View file
Expand Up @@ -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>

Expand Down
3 changes: 1 addition & 2 deletions blaze_tensor/math/typetraits/IsPageSliceMatrix.h
View file
Expand Up @@ -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 {
Expand Down
3 changes: 1 addition & 2 deletions blaze_tensor/math/typetraits/IsQuatSlice.h
View file
Expand Up @@ -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>

Expand Down
3 changes: 1 addition & 2 deletions blaze_tensor/math/typetraits/IsQuatSliceTensor.h
View file
Expand Up @@ -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>
Expand Down
4 changes: 1 addition & 3 deletions blaze_tensor/math/typetraits/IsRavelExpr.h
View file
Expand Up @@ -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>

Expand Down
3 changes: 1 addition & 2 deletions blaze_tensor/math/typetraits/IsRowMajorArray.h
View file
Expand Up @@ -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>
Expand Down
3 changes: 1 addition & 2 deletions blaze_tensor/math/typetraits/IsRowMajorTensor.h
View file
Expand Up @@ -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>
Expand Down
3 changes: 1 addition & 2 deletions blaze_tensor/math/typetraits/IsRowSlice.h
View file
Expand Up @@ -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>

Expand Down
3 changes: 1 addition & 2 deletions blaze_tensor/math/typetraits/IsRowSliceMatrix.h
View file
Expand Up @@ -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 {
Expand Down
3 changes: 1 addition & 2 deletions blaze_tensor/math/typetraits/IsSubtensor.h
View file
Expand Up @@ -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>

Expand Down
3 changes: 1 addition & 2 deletions blaze_tensor/math/typetraits/IsTensMapExpr.h
View file
Expand Up @@ -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>

Expand Down

0 comments on commit b913dc4

Please sign in to comment.