Build: Don't use bundled zstd for blosc #121197

Lukas Stockner · 2024-04-29T03:08:04+02:00

Lukas Stockner commented

2024-04-29 03:08:04 +02:00

By default, blosc builds its own zstd which gets linked into libopenvdb, which in turns ends up overriding the explicitly built and linked zstd (at least on Linux).

This results in e.g. multithreading not being available, even though it's enabled in zstd.cmake.

By default, blosc builds its own zstd which gets linked into libopenvdb, which in turns ends up overriding the explicitly built and linked zstd (at least on Linux). This results in e.g. multithreading not being available, even though it's enabled in `zstd.cmake`.

Ray molenkamp was assigned by Lukas Stockner

2024-04-29 03:08:04 +02:00

Lukas Stockner added 1 commit 2024-04-29 03:08:15 +02:00

Build: Don't use bundled zstd for blosc fd105260da

By default, blosc builds its own zstd which gets linked into libopenvdb,
which in turns ends up overriding the explicitly built and linked zstd.

Lukas Stockner added this to the Platforms, Builds Tests & Devices project 2024-04-29 03:08:22 +02:00

Alaska requested review from Ray molenkamp 2024-04-29 10:52:00 +02:00

Ray molenkamp was unassigned by Lukas Stockner

2024-04-29 12:59:55 +02:00

Ray molenkamp requested changes 2024-05-02 21:31:19 +02:00

Ray molenkamp left a comment

More of a status update than a review, I'm still looking into this, and this still needs work (but i'll do it, just time is a bit scarce currently)

This breaks things pretty badly on windows as the filenames are different between the platforms, so the following bit will be needed regardless of.... the next issue

diff --git a/build_files/build_environment/cmake/blosc.cmake b/build_files/build_environment/cmake/blosc.cmake
index 7807431cfc2..4409f619b68 100644
--- a/build_files/build_environment/cmake/blosc.cmake
+++ b/build_files/build_environment/cmake/blosc.cmake
@@ -6,7 +6,7 @@ set(BLOSC_EXTRA_ARGS
   -DZLIB_INCLUDE_DIR=${LIBDIR}/zlib/include/
   -DZLIB_LIBRARY=${LIBDIR}/zlib/lib/${ZLIB_LIBRARY}
   -DZSTD_INCLUDE_DIR=${LIBDIR}/zstd/include/
-  -DZSTD_LIBRARY=${LIBDIR}/zstd/lib/libzstd${LIBEXT}
+  -DZSTD_LIBRARY=${LIBDIR}/zstd/lib/${ZSTD_LIBRARY}
   -DBUILD_TESTS=OFF
   -DBUILD_BENCHMARKS=OFF
   -DCMAKE_DEBUG_POSTFIX=_d
diff --git a/build_files/build_environment/cmake/options.cmake b/build_files/build_environment/cmake/options.cmake
index 47bf54338fb..05f4fdb3b54 100644
--- a/build_files/build_environment/cmake/options.cmake
+++ b/build_files/build_environment/cmake/options.cmake
@@ -273,8 +273,10 @@ if(WIN32)
   else()
     set(ZLIB_LIBRARY zlibstatic${LIBEXT})
   endif()
+  set(ZSTD_LIBRARY zstd_static${LIBEXT})
 else()
   set(ZLIB_LIBRARY libz${LIBEXT})
+  set(ZSTD_LIBRARY libzstd${LIBEXT})
 endif()

 if(MSVC)

with that in, openvdb doesn't link zstd, so it craps out with a linker error, now openvdb does have config option called BLOSC_USE_EXTERNAL_SOURCES but that assumes all of the deps are build with external sources and it can't find zl4 and snappy, which is where i had to leave things cause something else came along .

I'll try to circle back to this and get this in working order, but likely not this week.

More of a status update than a review, I'm still looking into this, and this still needs work (but i'll do it, just time is a bit scarce currently) This breaks things pretty badly on windows as the filenames are different between the platforms, so the following bit will be needed regardless of.... the next issue ```diff diff --git a/build_files/build_environment/cmake/blosc.cmake b/build_files/build_environment/cmake/blosc.cmake index 7807431cfc2..4409f619b68 100644 --- a/build_files/build_environment/cmake/blosc.cmake +++ b/build_files/build_environment/cmake/blosc.cmake @@ -6,7 +6,7 @@ set(BLOSC_EXTRA_ARGS -DZLIB_INCLUDE_DIR=${LIBDIR}/zlib/include/ -DZLIB_LIBRARY=${LIBDIR}/zlib/lib/${ZLIB_LIBRARY} -DZSTD_INCLUDE_DIR=${LIBDIR}/zstd/include/ - -DZSTD_LIBRARY=${LIBDIR}/zstd/lib/libzstd${LIBEXT} + -DZSTD_LIBRARY=${LIBDIR}/zstd/lib/${ZSTD_LIBRARY} -DBUILD_TESTS=OFF -DBUILD_BENCHMARKS=OFF -DCMAKE_DEBUG_POSTFIX=_d diff --git a/build_files/build_environment/cmake/options.cmake b/build_files/build_environment/cmake/options.cmake index 47bf54338fb..05f4fdb3b54 100644 --- a/build_files/build_environment/cmake/options.cmake +++ b/build_files/build_environment/cmake/options.cmake @@ -273,8 +273,10 @@ if(WIN32) else() set(ZLIB_LIBRARY zlibstatic${LIBEXT}) endif() + set(ZSTD_LIBRARY zstd_static${LIBEXT}) else() set(ZLIB_LIBRARY libz${LIBEXT}) + set(ZSTD_LIBRARY libzstd${LIBEXT}) endif() if(MSVC) ``` with that in, openvdb doesn't link zstd, so it craps out with a linker error, now openvdb does have config option called `BLOSC_USE_EXTERNAL_SOURCES` but that assumes _all_ of the deps are build with external sources and it can't find zl4 and snappy, which is where i had to leave things cause something else came along . I'll try to circle back to this and get this in working order, but likely not this week.

Lukas Stockner commented

2024-05-02 21:33:48 +02:00

Hi, thanks for the info and for looking into it! This isn't urgent or anything, the PR where I wanted to use the multithreading support has many other issues 😅

I mostly figured I'd open this to avoid any surprises in the future, e.g. when we try to version-bump zstd and then later find out that we're still actually shipping the old version.

Hi, thanks for the info and for looking into it! This isn't urgent or anything, the PR where I wanted to use the multithreading support has many other issues 😅 I mostly figured I'd open this to avoid any surprises in the future, e.g. when we try to version-bump zstd and then later find out that we're still actually shipping the old version.

Merge conflict checking is in progress. Try again in few moments.

View command line instructions.

Checkout

From your project repository, check out a new branch and test the changes.

git fetch -u fix-zstd-conflict:LukasStockner-fix-zstd-conflict

git checkout LukasStockner-fix-zstd-conflict

Sign in to join this conversation.

No reviewers

No Label

Download

What's New

Blender Studio

Manual

Developers Blog

Documentation

Benchmark

Blender Conference

Development Fund

One-time Donations

Build: Don't use bundled zstd for blosc #121197

Checkout