Improve shapetype propagation

LibRapid · Aug 20, 2023 · e4aeb73 · e4aeb73
1 parent 479d7c7
commit e4aeb73
Show file tree

Hide file tree

Showing 4 changed files with 321 additions and 281 deletions.
diff --git a/librapid/include/librapid/array/arrayContainer.hpp b/librapid/include/librapid/array/arrayContainer.hpp
@@ -50,6 +50,7 @@ namespace librapid {
 			using Scalar							   = typename TypeInfo<StorageType_>::Scalar;
 			using Packet							   = std::false_type;
 			using Backend							   = typename TypeInfo<StorageType_>::Backend;
+			using ShapeType							   = ShapeType_;
 			static constexpr int64_t packetWidth	   = 1;
 			static constexpr bool supportsArithmetic   = TypeInfo<Scalar>::supportsArithmetic;
 			static constexpr bool supportsLogical	   = TypeInfo<Scalar>::supportsLogical;

diff --git a/librapid/include/librapid/array/assignOps.hpp b/librapid/include/librapid/array/assignOps.hpp
@@ -124,15 +124,15 @@ namespace librapid {
             using Function = detail::Function<descriptor::Trivial, Functor_, Args...>;
             using Scalar =
               typename array::ArrayContainer<ShapeType_, Storage<StorageScalar>>::Scalar;
-            constexpr int64_t packetWidth = typetraits::TypeInfo<Scalar>::packetWidth;
+            constexpr size_t packetWidth = typetraits::TypeInfo<Scalar>::packetWidth;
 
             constexpr bool allowVectorisation =
               typetraits::TypeInfo<
                 detail::Function<descriptor::Trivial, Functor_, Args...>>::allowVectorisation &&
               Function::argsAreSameType;
 
-            const int64_t size       = function.shape().size();
-            const int64_t vectorSize = size - (size % packetWidth);
+            const size_t size       = function.shape().size();
+            const size_t vectorSize = size - (size % packetWidth);
 
 			LIBRAPID_ASSUME(vectorSize % packetWidth == 0);