Merge branch 'master' into v9.1.0_rc

Author: richhones

.github/workflows/weekly.yml

@@ -537,18 +537,38 @@ jobs:
         git clone https://github.com/lvc/abi-compliance-checker abi-compliance-checker
         cd abi-compliance-checker && git checkout 7c175c45a8ba9ac41b8e47d8ebbab557b623b18e && cd -
     - name: build_latest
-      run: |
-        CXXFLAGS=-Og ./ci/build.sh --build-dir=build_latest -v --build-type=Debug --target=openvdb_shared --components=\"core\" --cargs=\'-DUSE_EXPLICIT_INSTANTIATION=OFF\'
+      run: >
+        CXXFLAGS=-Og ./ci/build.sh -v
+        --build-dir=build_latest
+        --build-type=Debug
+        --target=openvdb_shared
+        --components=\"core\"
+        --cargs=\'-DUSE_EXPLICIT_INSTANTIATION=OFF\'
+    - name: checkout_v9
+      run: git checkout v9.0.0
     - name: build_9
-      run: |
-        git checkout v9.0.0
-        CXXFLAGS=-Og ./ci/build.sh -v --build-type=Debug --target=openvdb_shared --components=\"core\" --cargs=\'-DUSE_EXPLICIT_INSTANTIATION=OFF\'
-    - name: abi_check
-      # -strict treats warnings as errors
+      run: >
+        CXXFLAGS=-Og ./ci/build.sh -v
+        --build-type=Debug
+        --target=openvdb_shared
+        --components=\"core\"
+        --cargs=\'-DUSE_EXPLICIT_INSTANTIATION=OFF\'
+    - name: abi_dump
       run: |
         abi-dumper/abi-dumper.pl build_latest/openvdb/openvdb/libopenvdb.so -o ABI-1.dump -lver 1
         abi-dumper/abi-dumper.pl        build/openvdb/openvdb/libopenvdb.so -o ABI-2.dump -lver 2
-        abi-compliance-checker/abi-compliance-checker.pl -l OPENVDB -old ABI-2.dump -new ABI-1.dump -strict
+    - name: abi_check
+      # -strict treats warnings as errors
+      # -extended checks all member data
+      # we check everything _not_ in openvdb::**::internal namespace
+      run: >
+        abi-compliance-checker/abi-compliance-checker.pl -l OPENVDB
+        -old ABI-2.dump
+        -new ABI-1.dump
+        -skip-internal-symbols "\d(openvdb.*internal)"
+        -skip-internal-types "(openvdb.*internal)::"
+        -strict
+        -extended
     - name: upload_report
       uses: actions/upload-artifact@v3
       if: always()

openvdb/openvdb/points/PointRasterizeFrustum.h

@@ -13,6 +13,7 @@
 #include <openvdb/math/Ray.h>
 #include <openvdb/math/DDA.h>
 #include <openvdb/util/NullInterrupter.h>
+#include <openvdb/thread/Threading.h>
 #include <openvdb/tools/GridTransformer.h> // for tools::resampleToMatch()
 #include <openvdb/tools/Interpolation.h>
 #include <openvdb/points/PointCount.h>

openvdb/openvdb/points/impl/PointRasterizeFrustumImpl.h

@@ -331,7 +331,7 @@ struct RasterizeOp
     void operator()(const PointLeafT& leaf, size_t) const
     {
         if (mInterrupter && mInterrupter->wasInterrupted()) {
-            tbb::task::self().cancel_group_execution();
+            thread::cancelGroupExecution();
             return;
         }
 

openvdb/openvdb/unittest/TestPointRasterizeFrustum.cc

@@ -1798,7 +1798,7 @@ struct HaltOnSecondInterrupt : public util::NullInterrupter
         mInterrupt = true;
         return false;
     }
-    tbb::atomic<bool> mInterrupt = false;
+    std::atomic<bool> mInterrupt{false};
 };
 
 } // namespace
@@ -2332,127 +2332,130 @@ TEST_F(TestPointRasterizeFrustum, testStreaming)
 #ifndef ONLY_RASTER_FLOAT
     // memory tests
 
-    FloatGrid::Ptr density1, density2, density3;
-    Vec3SGrid::Ptr velocity1, velocity2, velocity3;
+    if (io::Archive::isDelayedLoadingEnabled() && io::Archive::hasBloscCompression()) {
 
-    const size_t mb = 1024*1024;
-    const size_t tinyMemory = static_cast<size_t>(0.1*mb);
+        FloatGrid::Ptr density1, density2, density3;
+        Vec3SGrid::Ptr velocity1, velocity2, velocity3;
 
-    size_t initialMemory;
+        const size_t mb = 1024*1024;
+        const size_t tinyMemory = static_cast<size_t>(0.1*mb);
 
-    { // memory test 1 - retain caches and streaming disabled
-        Rasterizer rasterizer(settings);
-
-        rasterizer.addPoints(points, /*stream=*/false);
-        rasterizer.addPoints(points2, /*stream=*/false);
-
-        initialMemory = rasterizer.memUsage();
+        size_t initialMemory;
 
-        EXPECT_TRUE(initialMemory > size_t(4*mb) && initialMemory < size_t(16*mb));
+        { // memory test 1 - retain caches and streaming disabled
+            Rasterizer rasterizer(settings);
 
-        EXPECT_EQ(size_t(2), rasterizer.size());
+            rasterizer.addPoints(points, /*stream=*/false);
+            rasterizer.addPoints(points2, /*stream=*/false);
 
-        velocity1 = rasterizer.rasterizeAttribute<Vec3SGrid, Vec3s>("v");
-        EXPECT_EQ(Index64(219780), velocity1->activeVoxelCount());
+            initialMemory = rasterizer.memUsage();
 
-        EXPECT_TRUE(rasterizer.memUsage() > size_t(71*mb) &&
-            rasterizer.memUsage() < size_t(91*mb));
+            EXPECT_TRUE(initialMemory > size_t(4*mb) && initialMemory < size_t(16*mb));
 
-        density1 = rasterizer.rasterizeDensity("density");
-        EXPECT_EQ(Index64(219780), density1->activeVoxelCount());
+            EXPECT_EQ(size_t(2), rasterizer.size());
 
-        // no data is discarded so expect a fairly high memory footprint
+            velocity1 = rasterizer.rasterizeAttribute<Vec3SGrid, Vec3s>("v");
+            EXPECT_EQ(Index64(219780), velocity1->activeVoxelCount());
 
-        EXPECT_TRUE(rasterizer.memUsage() > size_t(80*mb) &&
-            rasterizer.memUsage() < size_t(100*mb));
-    }
+            EXPECT_TRUE(rasterizer.memUsage() > size_t(71*mb) &&
+                rasterizer.memUsage() < size_t(91*mb));
 
-    { // memory test 2 - retain caches and streaming enabled
+            density1 = rasterizer.rasterizeDensity("density");
+            EXPECT_EQ(Index64(219780), density1->activeVoxelCount());
 
-        { // reopen file and deep copy while setting transform
-            io::File file(filename);
-            file.open();
-            openvdb::GridBase::Ptr baseGrid = file.readGrid("points");
-            file.close();
+            // no data is discarded so expect a fairly high memory footprint
 
-            points = openvdb::gridPtrCast<PointDataGrid>(baseGrid);
-            points2 = points->deepCopy();
-            points2->setTransform(transform);
+            EXPECT_TRUE(rasterizer.memUsage() > size_t(80*mb) &&
+                rasterizer.memUsage() < size_t(100*mb));
         }
 
-        Rasterizer rasterizer(settings);
+        { // memory test 2 - retain caches and streaming enabled
 
-        rasterizer.addPoints(points, /*stream=*/true);
-        rasterizer.addPoints(points2, /*stream=*/true);
+            { // reopen file and deep copy while setting transform
+                io::File file(filename);
+                file.open();
+                openvdb::GridBase::Ptr baseGrid = file.readGrid("points");
+                file.close();
 
-        EXPECT_EQ(initialMemory, rasterizer.memUsage());
+                points = openvdb::gridPtrCast<PointDataGrid>(baseGrid);
+                points2 = points->deepCopy();
+                points2->setTransform(transform);
+            }
 
-        EXPECT_EQ(size_t(2), rasterizer.size());
+            Rasterizer rasterizer(settings);
 
-        velocity2 = rasterizer.rasterizeAttribute<Vec3SGrid, Vec3s>("v");
-        EXPECT_EQ(Index64(219780), velocity2->activeVoxelCount());
+            rasterizer.addPoints(points, /*stream=*/true);
+            rasterizer.addPoints(points2, /*stream=*/true);
 
-        size_t postRasterMemory = rasterizer.memUsage();
+            EXPECT_EQ(initialMemory, rasterizer.memUsage());
 
-        EXPECT_TRUE(postRasterMemory > size_t(70*mb) && postRasterMemory < size_t(85*mb));
+            EXPECT_EQ(size_t(2), rasterizer.size());
 
-        density2 = rasterizer.rasterizeDensity("density");
-        EXPECT_EQ(Index64(219780), density2->activeVoxelCount());
+            velocity2 = rasterizer.rasterizeAttribute<Vec3SGrid, Vec3s>("v");
+            EXPECT_EQ(Index64(219780), velocity2->activeVoxelCount());
 
-        // as data is being streamed, second attribute shouldn't change memory usage very much
+            size_t postRasterMemory = rasterizer.memUsage();
 
-        EXPECT_TRUE(rasterizer.memUsage() < (postRasterMemory + tinyMemory));
-    }
+            EXPECT_TRUE(postRasterMemory > size_t(70*mb) && postRasterMemory < size_t(85*mb));
 
-    { // memory test 3 - release caches and streaming enabled
+            density2 = rasterizer.rasterizeDensity("density");
+            EXPECT_EQ(Index64(219780), density2->activeVoxelCount());
 
-        { // reopen file and deep copy while setting transform
-            io::File file(filename);
-            file.open();
-            openvdb::GridBase::Ptr baseGrid = file.readGrid("points");
-            file.close();
+            // as data is being streamed, second attribute shouldn't change memory usage very much
 
-            points = openvdb::gridPtrCast<PointDataGrid>(baseGrid);
-            points2 = points->deepCopy();
-            points2->setTransform(transform);
+            EXPECT_TRUE(rasterizer.memUsage() < (postRasterMemory + tinyMemory));
         }
 
-        auto points3 = points->deepCopy();
-        auto points4 = points2->deepCopy();
+        { // memory test 3 - release caches and streaming enabled
+
+            { // reopen file and deep copy while setting transform
+                io::File file(filename);
+                file.open();
+                openvdb::GridBase::Ptr baseGrid = file.readGrid("points");
+                file.close();
 
-        Settings settings2(*frustum);
-        settings2.threshold = 0.0f;
+                points = openvdb::gridPtrCast<PointDataGrid>(baseGrid);
+                points2 = points->deepCopy();
+                points2->setTransform(transform);
+            }
+
+            auto points3 = points->deepCopy();
+            auto points4 = points2->deepCopy();
 
-        Mask mask2(*frustum, nullptr, BBoxd(), /*clipToFrustum=*/false);
+            Settings settings2(*frustum);
+            settings2.threshold = 0.0f;
 
-        Rasterizer rasterizer(settings2, mask2);
+            Mask mask2(*frustum, nullptr, BBoxd(), /*clipToFrustum=*/false);
 
-        rasterizer.addPoints(points, /*stream=*/true);
-        rasterizer.addPoints(points2, /*stream=*/true);
+            Rasterizer rasterizer(settings2, mask2);
 
-        EXPECT_EQ(initialMemory, rasterizer.memUsage());
-        EXPECT_EQ(size_t(2), rasterizer.size());
+            rasterizer.addPoints(points, /*stream=*/true);
+            rasterizer.addPoints(points2, /*stream=*/true);
 
-        density3 = rasterizer.rasterizeDensity("density", RasterMode::ACCUMULATE, true);
-        EXPECT_EQ(Index64(219780), density3->activeVoxelCount());
+            EXPECT_EQ(initialMemory, rasterizer.memUsage());
+            EXPECT_EQ(size_t(2), rasterizer.size());
 
-        // all voxel data, attribute data and caches are being discarded,
-        // so memory after rasterizing shouldn't change very much
+            density3 = rasterizer.rasterizeDensity("density", RasterMode::ACCUMULATE, true);
+            EXPECT_EQ(Index64(219780), density3->activeVoxelCount());
 
-        EXPECT_TRUE(rasterizer.memUsage() < (initialMemory + tinyMemory));
+            // all voxel data, attribute data and caches are being discarded,
+            // so memory after rasterizing shouldn't change very much
 
-        // deep-copies of delay-loaded point grids need to be used for repeat rasterization
+            EXPECT_TRUE(rasterizer.memUsage() < (initialMemory + tinyMemory));
 
-        rasterizer.clear();
-        rasterizer.addPoints(points3, /*stream=*/true);
-        rasterizer.addPoints(points4, /*stream=*/true);
+            // deep-copies of delay-loaded point grids need to be used for repeat rasterization
 
-        EXPECT_EQ(size_t(2), rasterizer.size());
+            rasterizer.clear();
+            rasterizer.addPoints(points3, /*stream=*/true);
+            rasterizer.addPoints(points4, /*stream=*/true);
 
-        EXPECT_TRUE(rasterizer.memUsage() < (initialMemory + tinyMemory));
+            EXPECT_EQ(size_t(2), rasterizer.size());
 
-        velocity3 = rasterizer.rasterizeAttribute<Vec3SGrid, Vec3s>("v", RasterMode::ACCUMULATE, true);
-        EXPECT_EQ(Index64(219780), velocity3->activeVoxelCount());
+            EXPECT_TRUE(rasterizer.memUsage() < (initialMemory + tinyMemory));
+
+            velocity3 = rasterizer.rasterizeAttribute<Vec3SGrid, Vec3s>("v", RasterMode::ACCUMULATE, true);
+            EXPECT_EQ(Index64(219780), velocity3->activeVoxelCount());
+        }
     }
 #endif