Merge branch 'main' into cpp17

UnitTest/UnitTest.vcxproj

@@ -328,6 +328,10 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="..\modules\c++\sys\unittests\test_ximd.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="..\modules\c++\types\unittests\test_complex.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>

UnitTest/UnitTest.vcxproj.filters

@@ -258,6 +258,9 @@
     <ClCompile Include="..\modules\drivers\highfive\unittests\tests_high_five_base.cpp">
       <Filter>hdf5.lite</Filter>
     </ClCompile>
+    <ClCompile Include="..\modules\c++\sys\unittests\test_ximd.cpp">
+      <Filter>sys</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="pch.h" />

UnitTest/sys.cpp

@@ -1,6 +1,8 @@
 #include "pch.h"
 #include "CppUnitTest.h"
 
+#include <coda_oss/numbers.h>
+
 #include <import/sys.h>
 #include <sys/Runnable.h>
 #include <sys/Thread.h>
@@ -21,6 +23,7 @@
 #include <sys/DateTime.h>
 #include <sys/Conf.h>
 #include <sys/Path.h>
+#include <sys/Ximd.h>
 
 namespace sys
 {
@@ -56,4 +59,8 @@ TEST_CLASS(test_path){ public:
 #include "sys/unittests/test_path.cpp"
 };
 
+TEST_CLASS(test_ximd){ public:
+#include "sys/unittests/test_ximd.cpp"
+};
+
 }

modules/c++/coda-oss.vcxproj

@@ -285,6 +285,7 @@
     <ClInclude Include="sys\include\sys\ThreadWin32.h" />
     <ClInclude Include="sys\include\sys\TimeStamp.h" />
     <ClInclude Include="sys\include\sys\UTCDateTime.h" />
+    <ClInclude Include="sys\include\sys\Ximd.h" />
     <ClInclude Include="tiff\include\tiff\Common.h" />
     <ClInclude Include="tiff\include\tiff\FileReader.h" />
     <ClInclude Include="tiff\include\tiff\FileWriter.h" />

modules/c++/sys/include/sys/Ximd.h

@@ -0,0 +1,276 @@
+/* =========================================================================
+ * This file is part of sys-c++ 
+ * =========================================================================
+ * 
+ * (C) Copyright 2004 - 2014, MDA Information Systems LLC
+ * © Copyright 2024, Maxar Technologies, Inc.
+ *
+ * sys-c++ is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public 
+ * License along with this program; If not, 
+ * see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#pragma once 
+
+/*!
+ *  \brief A simple (poor man's) "implemtation" of std::experimental::simd
+ * for development/testing purposes.
+ *
+ * `std::experimental::simd` needs G++11 and C++20 and the "vectorclass"
+ * library needs C++17.  "Rolling our own" using `std::array` lets developers
+ * try out some things without needing actual SIMD code.
+ *
+ */
+
+#include "Dbg.h"
+
+// This is intended for development/testing purposes, so enable by default only for debug.
+#ifndef CODA_OSS_Ximd_ENABLED
+#define CODA_OSS_Ximd_ENABLED CODA_OSS_DEBUG
+#endif
+
+#if CODA_OSS_Ximd_ENABLED
+
+#include <array>
+#include <type_traits>
+#include <functional>
+#include <cmath>
+
+namespace sys
+{
+namespace ximd
+{
+
+// Need a class for the "broadcast" constructor (not impelemented).
+// Also helps to avoid overloading `std::array`.
+template <typename T, int N = 4>
+struct Ximd final
+{
+    static_assert(std::is_arithmetic<T>::value, "T must be arithmetic");
+    // static_assert(std::is_same<T, std::remove_cv<T>::type>::value, "no `const` for T");
+
+    using value_type = T;
+    using reference = T&;
+
+    Ximd() = default;
+    // This is the same as the "generater" overload below ... avoid enable_if gunk for now.
+     template<typename U>
+     Ximd(U v) noexcept
+    {
+        *this = generate([&](size_t) { return v; });
+    }
+    template <typename U>
+    Ximd(const Ximd<U>& other) noexcept
+    {
+        *this = other;
+    }
+    template <typename U>
+    Ximd(const U* mem)
+    {
+        copy_from(mem);
+    }
+
+    // https://en.cppreference.com/w/cpp/experimental/simd/simd/simd
+    // this is the same as `U&& v` above; avoid enable_if gunk for now.
+    template <typename G>
+    static auto generate(G&& generator) noexcept
+    {
+        Ximd retval;
+        // This is where all the "magic" (would) happen.
+        for (size_t i = 0; i < size(); i++)
+        {
+            retval[i] = generator(i);
+        }
+        return retval;
+    }
+    template <typename G>
+    explicit Ximd(G&& generator, nullptr_t) noexcept
+    {
+        *this = generate(generator);
+    }
+
+    reference operator[](size_t pos) noexcept
+    {
+        return value[pos];
+    }
+    value_type operator[](size_t pos) const noexcept
+    {
+        return value[pos];
+    }
+
+    static constexpr size_t size() noexcept
+    {
+        return N;
+    }
+
+    template <typename U>
+    void copy_from(const U* mem)
+    {
+        *this = Ximd::generate([&](size_t i) { return mem[i]; });
+    }
+    template <typename U>
+    void copy_to(U* mem) const
+    {
+        for (size_t i = 0; i < size(); i++)
+        {
+            mem[i] = (*this)[i];
+        }
+    }
+
+    Ximd& operator++() noexcept
+    {
+        *this = Ximd::generate([&](size_t i) { return ++value[i]; });
+        return *this;
+    }
+    Ximd operator++(int) noexcept
+    {
+        auto tmp = *this;
+        ++(*this);
+        return tmp;
+    }
+
+private:
+    std::array<value_type, N> value{};
+};
+
+// template<typename T, int N>
+// using fixed_size_ximd = Ximd<T, N>;
+//
+// template<typename T, int N>
+// using native_ximd = Ximd<T>;
+
+using ximd_mask = Ximd<bool>;
+
+template <typename T>
+inline auto operator+(const Ximd<T>& lhs, const Ximd<T>& rhs) noexcept
+{
+    return Ximd<T>::generate([&](size_t i) { return lhs[i] + rhs[i]; });
+}
+template <typename T>
+inline auto operator+(const Ximd<T>& lhs, typename Ximd<T>::value_type rhs) noexcept
+{
+    return lhs + Ximd<T>(rhs);
+}
+template <typename T>
+inline auto operator-(const Ximd<T>& lhs, const Ximd<T>& rhs) noexcept
+{
+    return Ximd<T>::generate([&](size_t i) { return lhs[i] - rhs[i]; });
+}
+template <typename T>
+inline auto operator-(const Ximd<T>& lhs, typename Ximd<T>::value_type rhs) noexcept
+{
+    return lhs - Ximd<T>(rhs);
+}
+template <typename T>
+inline auto operator*(const Ximd<T>& lhs, const Ximd<T>& rhs) noexcept
+{
+    return Ximd<T>::generate([&](size_t i) { return lhs[i] * rhs[i]; });
+}
+template <typename T>
+inline auto operator/(const Ximd<T>& lhs, typename Ximd<T>::value_type rhs) noexcept
+{
+    return lhs / Ximd<T>(rhs);
+}
+template <typename T>
+inline auto operator/(const Ximd<T>& lhs, const Ximd<T>& rhs) noexcept
+{
+    return Ximd<T>::generate([&](size_t i) { return lhs[i] / rhs[i]; });
+}
+
+template <typename T>
+inline auto& operator+=(Ximd<T>& lhs, const Ximd<T>& rhs) noexcept
+{
+    lhs = lhs + rhs;
+    return lhs;
+}
+template <typename T>
+inline auto& operator-=(Ximd<T>& lhs, const Ximd<T>& rhs) noexcept
+{
+    lhs = lhs - rhs;
+    return lhs;
+}
+
+template <typename T>
+inline auto operator==(const Ximd<T>& lhs, const Ximd<T>& rhs) noexcept
+{
+    return ximd_mask::generate([&](size_t i) { return lhs[i] == rhs[i]; });
+}
+template <typename T>
+inline auto operator==(const Ximd<T>& lhs, typename Ximd<T>::value_type rhs) noexcept
+{
+    return lhs == Ximd<T>(rhs);
+}
+template <typename T>
+inline auto operator!=(const Ximd<T>& lhs, const Ximd<T>& rhs) noexcept
+{
+    return ximd_mask::generate([&](size_t i) { return lhs[i] != rhs[i]; });
+}
+template <typename T>
+inline auto operator!=(const Ximd<T>& lhs, typename Ximd<T>::value_type rhs) noexcept
+{
+    return lhs != Ximd<T>(rhs);
+}
+template <typename T>
+inline auto operator<(const Ximd<T>& lhs, const Ximd<T>& rhs) noexcept
+{
+    return ximd_mask::generate([&](size_t i) { return lhs[i] < rhs[i]; });
+}
+template <typename T>
+inline auto operator<(const Ximd<T>& lhs, typename Ximd<T>::value_type rhs) noexcept
+{
+    return lhs < Ximd<T>(rhs);
+}
+template <typename T>
+inline auto operator<=(const Ximd<T>& lhs, const Ximd<T>& rhs) noexcept
+{
+    return ximd_mask::generate([&](size_t i) { return lhs[i] <= rhs[i]; });
+}
+template <typename T>
+inline auto operator>(const Ximd<T>& lhs, const Ximd<T>& rhs) noexcept
+{
+    return ximd_mask::generate([&](size_t i) { return lhs[i] > rhs[i]; });
+}
+template <typename T>
+inline auto operator>(const Ximd<T>& lhs, typename Ximd<T>::value_type rhs) noexcept
+{
+    return lhs > Ximd<T>(rhs);
+}
+
+inline bool any_of(const ximd_mask& m)
+{
+    for (size_t i = 0; i < m.size(); i++)
+    {
+        if (m[i])
+        {
+            return true;
+        }
+    }
+    return false;
+}
+
+template <typename T>
+inline auto atan2(const Ximd<T>& real, const Ximd<T>& imag)
+{
+    return Ximd<T>::generate([&](size_t i) { return std::atan2(real[i], imag[i]); });
+}
+template <typename T>
+inline auto round(const Ximd<T>& v)
+{
+    return Ximd<T>::generate([&](size_t i) { return std::round(v[i]); });
+}
+
+} // ximd
+} // sys
+
+#endif