Merge branch 'master' into fix_IteratorRange

Author: kmuseth

cmake/FindBlosc.cmake

@@ -191,10 +191,12 @@ list(APPEND _BLOSC_LIBRARYDIR_SEARCH_DIRS
 # Library suffix handling
 
 set(_BLOSC_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES})
+set(_BLOSC_ORIG_CMAKE_FIND_LIBRARY_PREFIXES ${CMAKE_FIND_LIBRARY_PREFIXES})
 
 if(MSVC)
   if(BLOSC_USE_STATIC_LIBS)
     set(CMAKE_FIND_LIBRARY_SUFFIXES ".lib")
+    set(CMAKE_FIND_LIBRARY_PREFIXES "${CMAKE_FIND_LIBRARY_PREFIXES};lib")
   endif()
 else()
   if(BLOSC_USE_STATIC_LIBS)
@@ -247,7 +249,9 @@ endforeach()
 # Reset library suffix
 
 set(CMAKE_FIND_LIBRARY_SUFFIXES ${_BLOSC_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES})
+set(CMAKE_FIND_LIBRARY_PREFIXES ${_BLOSC_ORIG_CMAKE_FIND_LIBRARY_PREFIXES})
 unset(_BLOSC_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES)
+unset(_BLOSC_ORIG_CMAKE_FIND_LIBRARY_PREFIXES)
 
 if(Blosc_LIBRARY_DEBUG AND Blosc_LIBRARY_RELEASE)
   # if the generator is multi-config or if CMAKE_BUILD_TYPE is set for

openvdb/openvdb/tree/LeafManager.h

@@ -586,7 +586,12 @@ class LeafManager
         using LeafParentT = typename CopyConstness<TreeType, NonConstLeafParentT>::Type;
 
         std::deque<LeafParentT*> leafParents;
-        mTree->getNodes(leafParents);
+        if constexpr(std::is_same<NonConstLeafParentT, RootNodeType>::value) {
+            leafParents.emplace_back(&mTree->root());
+        }
+        else {
+            mTree->getNodes(leafParents);
+        }
 
         // Compute the leaf counts for each node
 

openvdb/openvdb/tree/Tree.h

@@ -576,8 +576,8 @@ class Tree: public TreeBase
     /// array.reserve(tree.leafCount());//this is a fast preallocation.
     /// tree.getNodes(array);
     /// @endcode
-    template<typename ArrayT> void getNodes(ArrayT& array) { mRoot.getNodes(array); }
-    template<typename ArrayT> void getNodes(ArrayT& array) const { mRoot.getNodes(array); }
+    template<typename ArrayT> void getNodes(ArrayT& array);
+    template<typename ArrayT> void getNodes(ArrayT& array) const;
     //@}
 
     /// @brief Steals all nodes of a certain type from the tree and
@@ -1273,6 +1273,30 @@ Tree<RootNodeType>::writeBuffers(std::ostream &os, bool saveFloatAsHalf) const
 }
 
 
+template<typename RootNodeType>
+template<typename ArrayT>
+inline void
+Tree<RootNodeType>::getNodes(ArrayT& array)
+{
+    using NodeT = typename std::remove_pointer<typename ArrayT::value_type>::type;
+    static_assert(!std::is_same<NodeT, RootNodeType>::value,
+        "getNodes() does not work for the RootNode. Use Tree::root()");
+    mRoot.getNodes(array);
+}
+
+
+template<typename RootNodeType>
+template<typename ArrayT>
+inline void
+Tree<RootNodeType>::getNodes(ArrayT& array) const
+{
+    using NodeT = typename std::remove_pointer<typename ArrayT::value_type>::type;
+    static_assert(!std::is_same<NodeT, const RootNodeType>::value,
+        "getNodes() does not work for the RootNode. Use Tree::root()");
+    mRoot.getNodes(array);
+}
+
+
 template<typename RootNodeType>
 inline void
 Tree<RootNodeType>::clear()

openvdb/openvdb/unittest/TestLeafManager.cc

@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: MPL-2.0
 
 #include <openvdb/Types.h>
+#include <openvdb/TypeList.h>
 #include <openvdb/tree/LeafManager.h>
 #include <openvdb/util/CpuTimer.h>
 #include "util.h" // for unittest_util::makeSphere()
@@ -304,3 +305,39 @@ TEST_F(TestLeafManager, testReduce)
     }
     EXPECT_EQ(FloatTree::LeafNodeType::numValues(), n);
 }
+
+TEST_F(TestLeafManager, testTreeConfigurations)
+{
+    using Tree2Type = openvdb::tree::Tree<
+        openvdb::tree::RootNode<
+        openvdb::tree::LeafNode<float, 3> > >;
+    using Tree3Type = openvdb::tree::Tree3<float, 4, 3>::Type;
+    using Tree4Type = openvdb::tree::Tree4<float, 5, 4, 3>::Type;
+    using Tree5Type = openvdb::tree::Tree5<float, 5, 5, 4, 3>::Type;
+
+    using TestConfigurations = openvdb::TypeList<
+        Tree2Type, Tree3Type, Tree4Type, Tree5Type
+    >;
+
+    TestConfigurations::foreach([](auto tree) {
+        using TreeType = typename std::decay<decltype(tree)>::type;
+        using LeafNodeType = typename TreeType::LeafNodeType;
+        using LeafManagerT = openvdb::tree::LeafManager<TreeType>;
+        using ConstLeafManagerT = openvdb::tree::LeafManager<const TreeType>;
+
+        // Add 20 leaf nodes and make sure they are constructed correctly
+        constexpr openvdb::Int32 Count = 20;
+
+        const openvdb::Int32 start = -(Count/2)*openvdb::Int32(LeafNodeType::DIM);
+        const openvdb::Int32 end   =  (Count/2)*openvdb::Int32(LeafNodeType::DIM);
+        for (openvdb::Int32 idx = start; idx < end; idx+=openvdb::Int32(LeafNodeType::DIM)) {
+            tree.touchLeaf(openvdb::math::Coord(idx));
+        }
+
+        EXPECT_EQ(tree.leafCount(), Count);
+        LeafManagerT manager(tree);
+        EXPECT_EQ(manager.leafCount(), Count);
+        ConstLeafManagerT cmanager(tree);
+        EXPECT_EQ(cmanager.leafCount(), Count);
+    });
+}

openvdb_ax/openvdb_ax/test/cmd/vdb_ax_test_fail_1

@@ -1,7 +1,8 @@
 usage: vdb_ax [command] [--help|-h] [-v] [<args>]
 
 CLI utility for processing OpenVDB data using AX.
-    -h, --help, -help         print help and exit
+Available [command] modes are: [execute|analyze|functions] (Default: execute).
+    -h, --help, -help         print help and exit (use [command] --help for more information)
     -v, --verbose             verbose (print timing and diagnostics)
 
 [execute] read/process/write VDB file/streams (default command):

openvdb_ax/openvdb_ax/test/cmd/vdb_ax_test_fail_3

@@ -2,7 +2,8 @@ FATAL: "--invalid-option" is not a valid option
 usage: vdb_ax [command] [--help|-h] [-v] [<args>]
 
 CLI utility for processing OpenVDB data using AX.
-    -h, --help, -help         print help and exit
+Available [command] modes are: [execute|analyze|functions] (Default: execute).
+    -h, --help, -help         print help and exit (use [command] --help for more information)
     -v, --verbose             verbose (print timing and diagnostics)
 
 [execute] read/process/write VDB file/streams (default command):

openvdb_ax/openvdb_ax/test/cmd/vdb_ax_test_pass_1

@@ -1,7 +1,8 @@
 usage: vdb_ax [command] [--help|-h] [-v] [<args>]
 
 CLI utility for processing OpenVDB data using AX.
-    -h, --help, -help         print help and exit
+Available [command] modes are: [execute|analyze|functions] (Default: execute).
+    -h, --help, -help         print help and exit (use [command] --help for more information)
     -v, --verbose             verbose (print timing and diagnostics)
 
 [execute] read/process/write VDB file/streams (default command):

openvdb_cmd/vdb_ax/main.cc

@@ -224,7 +224,7 @@ struct ProgOptions
             .addOpt("-h")
             .addOpt("--help")
             .addOpt("-help")
-            .setDoc("print help and exit. [command] -h prints extra information.")
+            .setDoc("print help and exit (use [command] --help for more information).")
             .get();
 
     // Execute options
@@ -287,6 +287,7 @@ struct ProgOptions
                     fatal("invalid option given for --opt level");
                 }
             })
+            .setDefault(openvdb::ax::CompilerOptions::OptLevel::O3)
             .get();
 
     openvdb::ax::cli::Param<size_t> mThreads =
@@ -463,7 +464,8 @@ void shortManPage [[noreturn]] (const ProgOptions& opts, int exitStatus = EXIT_F
     std::cerr <<
     "usage: " << gProgName << " [command] [--help|-h] [-v] [<args>]\n" <<
     '\n' <<
-    "CLI utility for processing OpenVDB data using AX.\n";
+    "CLI utility for processing OpenVDB data using AX.\n" <<
+    "Available [command] modes are: [execute|analyze|functions] (Default: execute).\n";
     openvdb::ax::cli::usage(std::cerr, opts.mHelp.opts(), opts.mHelp.doc(), false);
     openvdb::ax::cli::usage(std::cerr, opts.mVerbose.opts(), opts.mVerbose.doc(), false);
     std::cerr << '\n';

pendingchanges/leafmanager_root_fix.txt

@@ -0,0 +1,7 @@
+OpenVDB:
+ - Bug Fixes:
+    - Fixed a bug with LeafManager which wouldn't correctly
+    initialize its LeafNode array for single level Tree configurations
+    i.e. RootNode<LeafNode> (bug introduced in 7.2.0)
+    [Reported by @lanwatch]
+

pendingchanges/vdb_ax.txt

@@ -0,0 +1,4 @@
+AX:
+- Bug Fix:
+    Fixed an incorrect option in the `vdb_ax` command line tool where the default
+    optimization level was set to NONE instead of O3 (issue introduced in 10.0.0).