diff --git a/RELEASE.md b/RELEASE.md index 6c0e6ed2..7074ef53 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -76,6 +76,7 @@ - ``TimingMode::Auto`` changed to ``TimingMode::AUTO_TIMING``, ``TimingMode::Trigger`` changed to ``TimingMode::TRIGGER_EXPOSURE`` ### Bugfixes: +- Mismatched operators inhibited vectorization in gcc of NDArray math operators - ``RawFile`` and ``File`` reject raw files with frame padding disabled unless the frame discard policy is ``discardpartial``. The constructor reports the master path before opening data subfiles. Legacy ``.raw`` master files now diff --git a/include/aare/ArrayExpr.hpp b/include/aare/ArrayExpr.hpp index 368f691f..8eab0d2e 100644 --- a/include/aare/ArrayExpr.hpp +++ b/include/aare/ArrayExpr.hpp @@ -29,7 +29,7 @@ class ArrayAdd : public ArrayExpr, Ndim> { ArrayAdd(const A &arr1, const B &arr2) : arr1_(arr1), arr2_(arr2) { assert(arr1.size() == arr2.size()); } - auto operator[](int i) const { return arr1_[i] + arr2_[i]; } + auto operator[](size_t i) const { return arr1_[i] + arr2_[i]; } size_t size() const { return arr1_.size(); } std::array shape() const { return arr1_.shape(); } }; @@ -43,7 +43,7 @@ class ArraySub : public ArrayExpr, Ndim> { ArraySub(const A &arr1, const B &arr2) : arr1_(arr1), arr2_(arr2) { assert(arr1.size() == arr2.size()); } - auto operator[](int i) const { return arr1_[i] - arr2_[i]; } + auto operator[](size_t i) const { return arr1_[i] - arr2_[i]; } size_t size() const { return arr1_.size(); } std::array shape() const { return arr1_.shape(); } }; @@ -57,7 +57,7 @@ class ArrayMul : public ArrayExpr, Ndim> { ArrayMul(const A &arr1, const B &arr2) : arr1_(arr1), arr2_(arr2) { assert(arr1.size() == arr2.size()); } - auto operator[](int i) const { return arr1_[i] * arr2_[i]; } + auto operator[](size_t i) const { return arr1_[i] * arr2_[i]; } size_t size() const { return arr1_.size(); } std::array shape() const { return arr1_.shape(); } }; @@ -71,7 +71,7 @@ class ArrayDiv : public ArrayExpr, Ndim> { ArrayDiv(const A &arr1, const B &arr2) : arr1_(arr1), arr2_(arr2) { assert(arr1.size() == arr2.size()); } - auto operator[](int i) const { return arr1_[i] / arr2_[i]; } + auto operator[](size_t i) const { return arr1_[i] / arr2_[i]; } size_t size() const { return arr1_.size(); } std::array shape() const { return arr1_.shape(); } };