Merge pull request #1729 from Idclip/various_improvements

Various improvements

Author: Idclip

.github/workflows/weekly.yml

@@ -317,10 +317,7 @@ jobs:
     - name: llvm
       run: ./ci/install_llvm_windows.sh ${{ matrix.config.crt }}
     - name: install
-      run: |
-        vcpkg update
-        vcpkg install zlib tbb cppunit blosc python3 \
-          boost-iostreams boost-system boost-any boost-uuid boost-interprocess boost-algorithm pybind11
+      run: ./ci/install_windows.sh
     - name: build
       run: >
         ./ci/build.sh -v

CMakeLists.txt

@@ -357,27 +357,16 @@ include(cmake/config/OpenVDBCXX.cmake)
 
 #########################################################################
 
-# Configure malloc library. Use Jemalloc for Linux and non-Maya, otherwise Tbbmalloc.
-# * On Mac OSX, linking against Jemalloc < 4.3.0 seg-faults with this error:
-#     malloc: *** malloc_zone_unregister() failed for 0xaddress
-#   Houdini 17.5 and older ships with Jemalloc 3.6.0, so we make Tbbmalloc the default
-#   on Mac OSX (https://github.com/jemalloc/jemalloc/issues/420). Later versions of
-#   Jemalloc are thought to work, but haven't been tested.
-# * On Windows, we follow SideFX's example in using Tbbmalloc due to the challenges
-#   of injecting into the Windows runtime to replace the system allocator.
-
-if((OPENVDB_BUILD_BINARIES OR OPENVDB_BUILD_UNITTESTS) AND CONCURRENT_MALLOC STREQUAL "Auto")
-  if(WIN32 OR APPLE OR USE_MAYA)
+# Configure malloc library. Use Jemalloc if available, tbbmalloc otherwise
+
+if(CONCURRENT_MALLOC STREQUAL "Auto")
+  find_package(Jemalloc QUIET)
+  if(NOT TARGET Jemalloc::jemalloc)
+    message(WARNING "Unable to find Jemalloc, attempting to fall back to TBB malloc.
+      It is recommended to use Jemalloc for optimum performance.")
     set(CONCURRENT_MALLOC "Tbbmalloc")
   else()
-    find_package(Jemalloc QUIET)
-    if(NOT TARGET Jemalloc::jemalloc)
-      message(WARNING "Unable to find Jemalloc, attempting to fall back to TBB malloc.
-        It is recommended to use Jemalloc for optimum performance.")
-      set(CONCURRENT_MALLOC "Tbbmalloc")
-    else()
-      set(CONCURRENT_MALLOC "Jemalloc")
-    endif()
+    set(CONCURRENT_MALLOC "Jemalloc")
   endif()
 endif()
 

ci/install_macos.sh

@@ -14,6 +14,7 @@ brew install openexr
 brew install pybind11 # also installs the dependent python version
 brew install tbb
 brew install zlib
+brew install jemalloc
 
 # Alias python version installed by pybind11 to path
 py_version=$(brew info pybind11 --json | \

ci/install_windows.sh

@@ -3,6 +3,6 @@
 set -ex
 
 vcpkg update
-vcpkg install zlib libpng openexr tbb gtest blosc glfw3 glew python3 \
-    boost-iostreams boost-any boost-uuid boost-interprocess boost-algorithm pybind11 \
+vcpkg install zlib libpng openexr tbb gtest blosc glfw3 glew python3 jemalloc \
+    boost-iostreams boost-interprocess boost-algorithm pybind11 \
     --clean-after-build

openvdb/openvdb/unittest/TestStreamCompression.cc

@@ -20,15 +20,9 @@
 #include <boost/interprocess/mapped_region.hpp>
 #include <boost/iostreams/device/array.hpp>
 #include <boost/iostreams/stream.hpp>
-#include <boost/uuid/uuid_generators.hpp>
-#include <boost/uuid/uuid_io.hpp>
-#include <boost/version.hpp> // for BOOST_VERSION
 
 #ifdef _WIN32
 #include <boost/interprocess/detail/os_file_functions.hpp> // open_existing_file(), close_file()
-// boost::interprocess::detail was renamed to boost::interprocess::ipcdetail in Boost 1.48.
-// Ensure that both namespaces exist.
-namespace boost { namespace interprocess { namespace detail {} namespace ipcdetail {} } }
 #include <windows.h>
 #else
 #include <sys/types.h> // for struct stat
@@ -43,16 +37,6 @@ namespace boost { namespace interprocess { namespace detail {} namespace ipcdeta
 
 #ifdef OPENVDB_USE_BLOSC
 #include <blosc.h>
-// A Blosc optimization introduced in 1.11.0 uses a slightly smaller block size for
-// HCR codecs (LZ4, ZLIB, ZSTD), which otherwise fails a few regression test cases
-#if BLOSC_VERSION_MAJOR > 1 || (BLOSC_VERSION_MAJOR == 1 && BLOSC_VERSION_MINOR > 10)
-#define BLOSC_HCR_BLOCKSIZE_OPTIMIZATION
-#endif
-// Blosc 1.14+ writes backwards-compatible data by default.
-// http://blosc.org/posts/new-forward-compat-policy/
-#if BLOSC_VERSION_MAJOR > 1 || (BLOSC_VERSION_MAJOR == 1 &&  BLOSC_VERSION_MINOR >= 14)
-#define BLOSC_BACKWARDS_COMPATIBLE
-#endif
 #endif
 
 #ifdef OPENVDB_USE_DELAYED_LOADING
@@ -74,7 +58,6 @@ class ProxyMappedFile
             mLastWriteTime = 0;
             const char* regionFilename = mMap.get_name();
 #ifdef _WIN32
-            using namespace boost::interprocess::detail;
             using namespace boost::interprocess::ipcdetail;
             using openvdb::Index64;
 

openvdb_ax/openvdb_ax/test/CMakeLists.txt

@@ -39,7 +39,18 @@ else()
   set(OPENVDBAX_LIB openvdb_ax)
 endif()
 
+set(OPENVDB_AX_TEST_DEPENDENT_LIBS ${OPENVDBAX_LIB})
+
+if(CONCURRENT_MALLOC STREQUAL "Jemalloc")
+  find_package(Jemalloc REQUIRED)
+  list(APPEND OPENVDB_AX_TEST_DEPENDENT_LIBS Jemalloc::jemalloc)
+elseif(CONCURRENT_MALLOC STREQUAL "Tbbmalloc")
+  find_package(TBB ${MINIMUM_TBB_VERSION} REQUIRED COMPONENTS tbbmalloc)
+  list(APPEND OPENVDB_AX_TEST_DEPENDENT_LIBS TBB::tbbmalloc)
+endif()
+
 find_package(CppUnit ${MINIMUM_CPPUNIT_VERSION} REQUIRED)
+list(APPEND OPENVDB_AX_TEST_DEPENDENT_LIBS CppUnit::cppunit)
 
 set(TEST_SOURCE_FILES
   ast/TestScanners.cc
@@ -99,9 +110,7 @@ set(TEST_SOURCE_FILES
   main.cc
   )
 
-add_executable(vdb_ax_test
-  ${TEST_SOURCE_FILES}
-)
+add_executable(vdb_ax_test ${TEST_SOURCE_FILES})
 
 # @note  From Clang 14, fp-contract has been switched to ON by default. Docs in
 #  Clang versions before 14 state that fp-contract is ON, but it is in fact off.
@@ -119,13 +128,8 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "App
       COMPILE_OPTIONS "-ffp-contract=off")
 endif()
 
-target_link_libraries(vdb_ax_test
-  ${OPENVDBAX_LIB}
-  CppUnit::cppunit
-)
-target_include_directories(vdb_ax_test
-  PRIVATE ../ .
-)
+target_link_libraries(vdb_ax_test ${OPENVDB_AX_TEST_DEPENDENT_LIBS})
+target_include_directories(vdb_ax_test PRIVATE ../ .)
 
 if(OPENVDB_AX_TEST_PROFILE)
   target_compile_definitions(vdb_ax_test PRIVATE "-DPROFILE")

openvdb_houdini/openvdb_houdini/AXUtils.h

@@ -394,7 +394,7 @@ hax_chramp(const openvdb::ax::FunctionOptions& op)
            const void* const data)
     {
         const openvdb::ax::CustomData* const customData =
-            static_cast<const openvdb::ax::CustomData* const>(data);
+            static_cast<const openvdb::ax::CustomData*>(data);
         const std::string nameString(name);
 
         const openvdb::Metadata::ConstPtr& meta = customData->getData(nameString);

openvdb_houdini/openvdb_houdini/CMakeLists.txt

@@ -304,6 +304,12 @@ foreach(DSO_NAME ${OPENVDB_DSO_NAMES})
   add_library(${DSO_NAME} SHARED ${DSO_NAME}.cc)
   target_link_libraries(${DSO_NAME} PUBLIC openvdb_houdini)
 
+  if(OPENVDB_ENABLE_RPATH)
+    set_target_properties(${DSO_NAME}
+      PROPERTIES INSTALL_RPATH
+        "${CMAKE_INSTALL_RPATH};${OPENVDB_HOUDINI_BIN_INSTALL_PREFIX};${OPENVDB_HOUDINI_LIB_INSTALL_PREFIX}")
+  endif()
+
   # Call houdini_configure_target to setup the sesi tag information. We set
   # INSTDIR to the project build directory and configure the actuall install
   # paths ourselves (otherwise cmake will configure the build to build directly

openvdb_houdini/openvdb_houdini/SOP_OpenVDB_Activate.cc

@@ -529,8 +529,6 @@ class sop_FillSDFOp
     template <typename NodeT>
     bool operator()(NodeT &node, size_t idx) const
     {
-        using ChildT = typename NodeT::ChildNodeType;
-
         for (auto iter = node.beginChildAll(); iter; ++iter)
         {
             typename NodeT::ChildNodeType    *child;

openvdb_houdini/openvdb_houdini/SOP_OpenVDB_Extrapolate.cc

@@ -576,7 +576,6 @@ SOP_OpenVDB_Extrapolate::Cache::process(
     using namespace openvdb::tools;
 
     using SamplerT = openvdb::tools::GridSampler<ExtGridT, openvdb::tools::BoxSampler>;
-    using ExtValueT = typename ExtGridT::ValueType;
 
     typename FSGridT::Ptr fsGrid = openvdb::gridPtrCast<FSGridT>(lsPrim->getGridPtr());