Moved util/Simd.h to simd/Simd.h and fixed license

Signed-off-by: Nick Avramoussis <4256455+Idclip@users.noreply.github.com>

Author: Idclip

openvdb/openvdb/CMakeLists.txt

@@ -601,6 +601,10 @@ set(OPENVDB_LIBRARY_THREAD_INCLUDE_FILES
   thread/Threading.h
 )
 
+set(OPENVDB_LIBRARY_SIMD_INCLUDE_FILES
+  simd/Simd.h
+)
+
 list(APPEND OPENVDB_LIBRARY_MATH_INCLUDE_FILES
   ${CMAKE_SOURCE_DIR}/ext/imath/openvdb/math/Half.h)
 list(APPEND OPENVDB_LIBRARY_SOURCE_FILES
@@ -811,6 +815,7 @@ install(FILES ${OPENVDB_LIBRARY_TOOLS_IMPL_INCLUDE_FILES} DESTINATION ${OPENVDB_
 install(FILES ${OPENVDB_LIBRARY_TREE_INCLUDE_FILES} DESTINATION ${OPENVDB_INSTALL_INCLUDEDIR}/openvdb/tree)
 install(FILES ${OPENVDB_LIBRARY_UTIL_INCLUDE_FILES} DESTINATION ${OPENVDB_INSTALL_INCLUDEDIR}/openvdb/util)
 install(FILES ${OPENVDB_LIBRARY_THREAD_INCLUDE_FILES} DESTINATION ${OPENVDB_INSTALL_INCLUDEDIR}/openvdb/thread)
+install(FILES ${OPENVDB_LIBRARY_SIMD_INCLUDE_FILES} DESTINATION ${OPENVDB_INSTALL_INCLUDEDIR}/openvdb/simd)
 
 if(USE_VCL)
   install(DIRECTORY ${CMAKE_SOURCE_DIR}/ext/vcl/openvdb DESTINATION ${OPENVDB_INSTALL_INCLUDEDIR})

openvdb/openvdb/points/PointRasterizeSDF.h

@@ -79,7 +79,7 @@
 #include <openvdb/thread/Threading.h>
 #include <openvdb/util/NullInterrupter.h>
 #include <openvdb/util/Assert.h>
-#include <openvdb/util/Simd.h>
+#include <openvdb/simd/Simd.h>
 
 #include <unordered_map>
 

openvdb/openvdb/points/impl/PointRasterizeSDFImpl.h

@@ -187,7 +187,6 @@ struct SignedDistanceFieldTransfer :
 #if OPENVDB_DISABLE_BATCHED_TRANSFERS
         return 1;
 #else
-        using namespace openvdb::util;
         using NativeT = typename simd::SimdNativeT<RealT>::Type;
         return simd::SimdTraits<NativeT>::size;
 #endif
@@ -443,7 +442,6 @@ struct SphericalTransfer :
         const std::array<int64_t, BaseT::template GetBatchSize<Real>()>& points,
         const CoordBBox& bounds)
     {
-        using namespace openvdb::util;
         using SimdT  = typename simd::SimdT<RealT, Size>::Type;
         using SimdIT = typename simd::SimdT<int64_t, Size>::Type;
 
@@ -542,8 +540,6 @@ struct SphericalTransfer :
                     const IdT& ids,
                     const CoordBBox& intersection)
     {
-        using namespace openvdb::util;
-
         OPENVDB_ASSERT(simd::horizontal_and(simd::is_finite(r)));
         OPENVDB_ASSERT(simd::horizontal_and(simd::is_finite(Px)));
         OPENVDB_ASSERT(simd::horizontal_and(simd::is_finite(Py)));

openvdb/openvdb/util/Simd.h openvdb/openvdb/simd/Simd.hopenvdb/openvdb/util/Simd.h renamed to openvdb/openvdb/simd/Simd.h

@@ -1,5 +1,5 @@
 // Copyright Contributors to the OpenVDB Project
-// SPDX-License-Identifier: MPL-2.0
+// SPDX-License-Identifier: Apache-2.0
 ///
 /// @author Nick Avramoussis
 ///
@@ -9,14 +9,14 @@
 ///   proof the underlying SIMD wrapper in use, and to provide extended
 ///   functionality (such as traits and matching tuple/scalar API for writing
 ///   generic tools), manual SIMD usage should be restricted to the
-///   openvdb::util::simd namespace.
+///   openvdb::simd namespace.
 ///
 /// @note OpenVDB currently supports SIMD usage of intel x86 intrinsics via
 ///   Agner Fog's VCL wrapper library.
 ///
 
-#ifndef OPENVDB_UTIL_SIMD_HAS_BEEN_INCLUDED
-#define OPENVDB_UTIL_SIMD_HAS_BEEN_INCLUDED
+#ifndef OPENVDB_SIMD_SIMD_HAS_BEEN_INCLUDED
+#define OPENVDB_SIMD_SIMD_HAS_BEEN_INCLUDED
 
 #include <openvdb/version.h>
 #include <openvdb/math/Tuple.h>
@@ -55,7 +55,6 @@
 namespace openvdb {
 OPENVDB_USE_VERSION_NAMESPACE
 namespace OPENVDB_VERSION_NAME {
-namespace util {
 namespace simd {
 
 #ifdef OPENVDB_USE_VCL
@@ -355,7 +354,7 @@ template <typename T> struct SimdTraits; // fwd declare
 ///
 /// template <typename T>
 /// T Lerp(const T a, const T b, const T t) {
-///   using namespace openvdb::util::simd;
+///   using namespace openvdb::simd;
 ///   return add(mul(sub(T(1), t), a), mul(t, b));
 /// }
 
@@ -614,8 +613,7 @@ inline int horizontal_count(const bool a) { return a ? 1 : 0; }
 #undef OPENVDB_ENABLE_IF_VCL
 
 } // namespace simd
-} // namespace util
 } // namespace OPENVDB_VERSION_NAME
 } // namespace openvdb
 
-#endif // OPENVDB_UTIL_SIMD_HAS_BEEN_INCLUDED
+#endif // OPENVDB_SIMD_SIMD_HAS_BEEN_INCLUDED

openvdb/openvdb/version.h.in

@@ -151,7 +151,7 @@
 /* Denotes whether VDB was built with VCL support */
 #ifndef OPENVDB_USE_VCL
 #cmakedefine OPENVDB_USE_VCL
-// The namespace to use for VCL. See openvdb/util/Simd.h
+// The namespace to use for VCL. See openvdb/simd/Simd.h
 #define OPENVDB_VCL_NAMESPACE openvdb_ext_vcl
 #endif