This commit includes the changes to the build system, updated hashes to the actual new libraries as well as a required test update. * DPC++ 6.2.0 RC * freetype 2.13.3 * HIP 6.4.5010 * IGC 2.16.0 * ISPC 1.28.0 * libharu 2.4.5 * libpng 1.6.50 * libvpx 1.15.2 * libxml2 2.14.5 * LLVM 20.1.8 * Manifold 3.2.1 * MaterialX 1.39.3 * OpenColorIO 2.4.2 * openexr 3.3.5 * OpenImageIO 3.0.9.1 * openjpeg 2.5.3 * OpenShadingLanguage 1.14.7.0 * openssl 3.5.2 * Python 3.11.13 * Rubber Band 4.0.0 * ShaderC 2025.3 * sqlite 3.50.4 * USD 25.08 * Wayland 1.24.0 Ref #138940 Co-authored-by: Ray Molenkamp <github@lazydodo.com> Co-authored-by: Jesse Yurkovich <jesse.y@gmail.com> Co-authored-by: Brecht Van Lommel <brecht@blender.org> Co-authored-by: Nikita Sirgienko <nikita.sirgienko@intel.com> Co-authored-by: Sybren A. Stüvel <sybren@blender.org> Co-authored-by: Kace <lakacey03@gmail.com> Co-authored-by: Sebastian Parborg <sebastian@blender.org> Co-authored-by: Anthony Roberts <anthony.roberts@linaro.org> Co-authored-by: Jonas Holzman <jonas@holzman.fr> Pull Request: https://projects.blender.org/blender/blender/pulls/144479
152 lines
4.5 KiB
CMake
152 lines
4.5 KiB
CMake
# SPDX-FileCopyrightText: 2019-2022 Blender Authors
|
|
#
|
|
# SPDX-License-Identifier: GPL-2.0-or-later
|
|
|
|
set(OIDN_EXTRA_ARGS
|
|
-DCMAKE_BUILD_TYPE=Release
|
|
-DOIDN_APPS=OFF
|
|
-DTBB_ROOT=${LIBDIR}/tbb
|
|
-DISPC_EXECUTABLE=${LIBDIR}/ispc/bin/ispc
|
|
-DOIDN_FILTER_RTLIGHTMAP=OFF
|
|
-DPython_EXECUTABLE=${PYTHON_BINARY}
|
|
)
|
|
if(APPLE)
|
|
set(OIDN_EXTRA_ARGS
|
|
${OIDN_EXTRA_ARGS}
|
|
-DOIDN_DEVICE_METAL=ON
|
|
)
|
|
else()
|
|
set(OIDN_EXTRA_ARGS
|
|
${OIDN_EXTRA_ARGS}
|
|
-DOIDN_DEVICE_CPU=ON
|
|
-DLEVEL_ZERO_ROOT=${LIBDIR}/level-zero
|
|
)
|
|
|
|
# x64 platforms support SyCL and HIP, ARM64 doesn't
|
|
if(NOT BLENDER_PLATFORM_ARM)
|
|
set(OIDN_EXTRA_ARGS
|
|
${OIDN_EXTRA_ARGS}
|
|
-DOIDN_DEVICE_SYCL=ON
|
|
-DOIDN_DEVICE_SYCL_AOT=OFF
|
|
-DOIDN_DEVICE_CUDA=ON
|
|
-DOIDN_DEVICE_HIP=ON)
|
|
elseif(UNIX)
|
|
set(OIDN_EXTRA_ARGS
|
|
${OIDN_EXTRA_ARGS}
|
|
-DOIDN_DEVICE_CUDA=ON)
|
|
endif()
|
|
endif()
|
|
|
|
if(WIN32 AND NOT BLENDER_PLATFORM_ARM)
|
|
set(OIDN_EXTRA_ARGS
|
|
${OIDN_EXTRA_ARGS}
|
|
-DTBB_DEBUG_LIBRARY=${LIBDIR}/tbb/lib/tbb.lib
|
|
-DTBB_DEBUG_LIBRARY_MALLOC=${LIBDIR}/tbb/lib/tbbmalloc.lib
|
|
-DCMAKE_CXX_COMPILER=${LIBDIR}/dpcpp/bin/clang++.exe
|
|
-DCMAKE_C_COMPILER=${LIBDIR}/dpcpp/bin/clang.exe
|
|
-DCMAKE_DEBUG_POSTFIX=_d
|
|
)
|
|
if(DEFINED ENV{ROCM_PATH})
|
|
# Older ROCM shipped a /bin/hipconfig (no extension) and oidn
|
|
# uses it to validate a valid rocm folder, given this file
|
|
# is no longer shipped work around it for now by passing the
|
|
# path ourselves, so we don't have to rely on their find rocm
|
|
# functionality.
|
|
cmake_path(CONVERT $ENV{ROCM_PATH} TO_CMAKE_PATH_LIST ROCM_PATH NORMALIZE)
|
|
list(APPEND OIDN_EXTRA_ARGS -DROCM_PATH=${ROCM_PATH})
|
|
endif()
|
|
set(OIDN_CMAKE_FLAGS ${DEFAULT_CLANG_CMAKE_FLAGS}
|
|
-DCMAKE_CXX_COMPILER=${LIBDIR}/dpcpp/bin/clang++.exe
|
|
-DCMAKE_C_COMPILER=${LIBDIR}/dpcpp/bin/clang.exe
|
|
-DCMAKE_SHARED_LINKER_FLAGS=-L"${LIBDIR}/dpcpp/lib"
|
|
-DCMAKE_EXE_LINKER_FLAGS=-L"${LIBDIR}/dpcpp/lib"
|
|
)
|
|
else()
|
|
if(NOT (APPLE OR WIN32 OR BLENDER_PLATFORM_ARM))
|
|
set(OIDN_EXTRA_ARGS
|
|
${OIDN_EXTRA_ARGS}
|
|
-DCMAKE_CXX_COMPILER=${LIBDIR}/dpcpp/bin/clang++
|
|
-DCMAKE_C_COMPILER=${LIBDIR}/dpcpp/bin/clang
|
|
-DCMAKE_FIND_ROOT_PATH=${LIBDIR}/ocloc
|
|
)
|
|
endif()
|
|
set(OIDN_CMAKE_FLAGS ${DEFAULT_CMAKE_FLAGS})
|
|
endif()
|
|
|
|
set(ODIN_PATCH_COMMAND
|
|
${PATCH_CMD} --verbose -p 1 -N -d
|
|
${BUILD_DIR}/openimagedenoise/src/external_openimagedenoise <
|
|
${PATCH_DIR}/oidn.diff
|
|
)
|
|
|
|
if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
|
|
# Replace `attrib.memoryType` with `attrib.type`.
|
|
# See: https://github.com/ROCm/HIP/pull/2164
|
|
set(ODIN_PATCH_COMMAND ${ODIN_PATCH_COMMAND} &&
|
|
sed -i "s/(attrib\\.memoryType)/(attrib.type)/g"
|
|
${BUILD_DIR}/openimagedenoise/src/external_openimagedenoise/devices/hip/hip_device.cpp
|
|
)
|
|
endif()
|
|
|
|
ExternalProject_Add(external_openimagedenoise
|
|
URL file://${PACKAGE_DIR}/${OIDN_FILE}
|
|
DOWNLOAD_DIR ${DOWNLOAD_DIR}
|
|
URL_HASH ${OIDN_HASH_TYPE}=${OIDN_HASH}
|
|
PREFIX ${BUILD_DIR}/openimagedenoise
|
|
CMAKE_GENERATOR ${PLATFORM_ALT_GENERATOR}
|
|
|
|
CMAKE_ARGS
|
|
-DCMAKE_INSTALL_PREFIX=${LIBDIR}/openimagedenoise
|
|
${OIDN_CMAKE_FLAGS}
|
|
${OIDN_EXTRA_ARGS}
|
|
|
|
PATCH_COMMAND ${ODIN_PATCH_COMMAND}
|
|
INSTALL_DIR ${LIBDIR}/openimagedenoise
|
|
)
|
|
|
|
unset(ODIN_PATCH_COMMAND)
|
|
|
|
add_dependencies(
|
|
external_openimagedenoise
|
|
external_tbb
|
|
external_ispc
|
|
external_python
|
|
)
|
|
|
|
if(NOT (APPLE OR WIN32 OR BLENDER_PLATFORM_ARM))
|
|
add_dependencies(
|
|
external_openimagedenoise
|
|
external_dpcpp
|
|
external_ocloc
|
|
)
|
|
endif()
|
|
|
|
if(NOT (APPLE OR BLENDER_PLATFORM_ARM))
|
|
add_dependencies(
|
|
external_openimagedenoise
|
|
external_level-zero
|
|
)
|
|
endif()
|
|
|
|
if(WIN32)
|
|
if(BUILD_MODE STREQUAL Release)
|
|
ExternalProject_Add_Step(external_openimagedenoise after_install
|
|
COMMAND ${CMAKE_COMMAND} -E copy_directory
|
|
${LIBDIR}/openimagedenoise/bin
|
|
${HARVEST_TARGET}/openimagedenoise/bin
|
|
COMMAND ${CMAKE_COMMAND} -E copy_directory
|
|
${LIBDIR}/openimagedenoise/lib
|
|
${HARVEST_TARGET}/openimagedenoise/lib
|
|
COMMAND ${CMAKE_COMMAND} -E copy_directory
|
|
${LIBDIR}/openimagedenoise/include
|
|
${HARVEST_TARGET}/openimagedenoise/include
|
|
|
|
DEPENDEES install
|
|
)
|
|
endif()
|
|
else()
|
|
harvest(external_openimagedenoise openimagedenoise/include openimagedenoise/include "*")
|
|
harvest_rpath_lib(external_openimagedenoise openimagedenoise/lib openimagedenoise/lib "*${SHAREDLIBEXT}*")
|
|
harvest(external_openimagedenoise openimagedenoise/lib/cmake/OpenImageDenoise-${OIDN_VERSION} openimagedenoise/lib/cmake/OpenImageDenoise "*.cmake")
|
|
endif()
|