update tests

CMakeLists.txt

@@ -110,10 +110,6 @@ if(POLICY CMP0074)
   cmake_policy(SET CMP0074 NEW)
 endif()
 
-# Install CODE|SCRIPT allow the use of generator expressions.
-if(POLICY CMP0087)
-  cmake_policy(SET CMP0087 NEW)
-endif()
 #-----------------------------------------------------------------------------
 # Load some macros.
 include(build_files/cmake/macros.cmake)
@@ -353,7 +349,7 @@ mark_as_advanced(WITH_SYSTEM_GLOG)
 option(WITH_FREESTYLE     "Enable Freestyle (advanced edges rendering)" ON)
 
 # Misc
-if(WIN32 OR APPLE)
+if(WIN32)
   option(WITH_INPUT_IME "Enable Input Method Editor (IME) for complex Asian character input" ON)
 endif()
 option(WITH_INPUT_NDOF "Enable NDOF input devices (SpaceNavigator and friends)" ON)
@@ -407,14 +403,14 @@ set(CYCLES_TEST_DEVICES CPU CACHE STRING "Run regression tests on the specified
 set(CYCLES_CUDA_BINARIES_ARCH sm_30 sm_35 sm_37 sm_50 sm_52 sm_60 sm_61 sm_70 sm_75 sm_86 compute_75 CACHE STRING "CUDA architectures to build binaries for")
 mark_as_advanced(CYCLES_CUDA_BINARIES_ARCH)
 unset(PLATFORM_DEFAULT)
-option(WITH_CYCLES_LOGGING      "Build Cycles with logging support" ON)
-option(WITH_CYCLES_DEBUG_NAN    "Build Cycles with additional asserts for detecting NaNs and invalid values" OFF)
+option(WITH_CYCLES_LOGGING  "Build Cycles with logging support" ON)
+option(WITH_CYCLES_DEBUG    "Build Cycles with extra debug capabilities" OFF)
 option(WITH_CYCLES_NATIVE_ONLY  "Build Cycles with native kernel only (which fits current CPU, use for development only)" OFF)
 option(WITH_CYCLES_KERNEL_ASAN  "Build Cycles kernels with address sanitizer when WITH_COMPILER_ASAN is on, even if it's very slow" OFF)
 mark_as_advanced(WITH_CYCLES_KERNEL_ASAN)
 mark_as_advanced(WITH_CYCLES_CUBIN_COMPILER)
 mark_as_advanced(WITH_CYCLES_LOGGING)
-mark_as_advanced(WITH_CYCLES_DEBUG_NAN)
+mark_as_advanced(WITH_CYCLES_DEBUG)
 mark_as_advanced(WITH_CYCLES_NATIVE_ONLY)
 
 option(WITH_CYCLES_DEVICE_CUDA              "Enable Cycles CUDA compute support" ON)
@@ -428,10 +424,6 @@ mark_as_advanced(WITH_CYCLES_NETWORK)
 option(WITH_CUDA_DYNLOAD "Dynamically load CUDA libraries at runtime" ON)
 mark_as_advanced(WITH_CUDA_DYNLOAD)
 
-# Draw Manager
-option(WITH_DRAW_DEBUG "Add extra debug capabilities to Draw Manager" OFF)
-mark_as_advanced(WITH_DRAW_DEBUG)
-
 # LLVM
 option(WITH_LLVM                    "Use LLVM" OFF)
 if(APPLE)
@@ -612,6 +604,12 @@ if(WIN32)
   option(WITH_WINDOWS_FIND_MODULES "Use find_package to locate libraries" OFF)
   mark_as_advanced(WITH_WINDOWS_FIND_MODULES)
 
+  option(WINDOWS_USE_VISUAL_STUDIO_PROJECT_FOLDERS "Organize the visual studio projects according to source folder structure." ON)
+  mark_as_advanced(WINDOWS_USE_VISUAL_STUDIO_PROJECT_FOLDERS)
+
+  option(WINDOWS_USE_VISUAL_STUDIO_SOURCE_FOLDERS "Organize the source files in filters matching the source folders." ON)
+  mark_as_advanced(WINDOWS_USE_VISUAL_STUDIO_SOURCE_FOLDERS)
+
   option(WINDOWS_PYTHON_DEBUG "Include the files needed for debugging python scripts with visual studio 2017+." OFF)
   mark_as_advanced(WINDOWS_PYTHON_DEBUG)
 
@@ -629,18 +627,6 @@ if(WIN32)
 
 endif()
 
-if(WIN32 OR XCODE)
-  option(IDE_GROUP_SOURCES_IN_FOLDERS "Organize the source files in filters matching the source folders." ON)
-  mark_as_advanced(IDE_GROUP_SOURCES_IN_FOLDERS)
-
-  option(IDE_GROUP_PROJECTS_IN_FOLDERS "Organize the projects according to source folder structure." ON)
-  mark_as_advanced(IDE_GROUP_PROJECTS_IN_FOLDERS)
-
-  if (IDE_GROUP_PROJECTS_IN_FOLDERS)
-    set_property(GLOBAL PROPERTY USE_FOLDERS ON)
-  endif()
-endif()
-
 if(UNIX)
   # See WITH_WINDOWS_SCCACHE for Windows.
   option(WITH_COMPILER_CCACHE "Use ccache to improve rebuild times (Works with Ninja, Makefiles and Xcode)" OFF)
@@ -747,7 +733,7 @@ set_and_warn_dependency(WITH_TBB WITH_CYCLES            OFF)
 set_and_warn_dependency(WITH_TBB WITH_USD               OFF)
 set_and_warn_dependency(WITH_TBB WITH_OPENIMAGEDENOISE  OFF)
 set_and_warn_dependency(WITH_TBB WITH_OPENVDB           OFF)
-#set_and_warn_dependency(WITH_TBB WITH_MOD_FLUID         OFF)
+set_and_warn_dependency(WITH_TBB WITH_MOD_FLUID         OFF)
 
 # NanoVDB requires OpenVDB to convert the data structure
 set_and_warn_dependency(WITH_OPENVDB WITH_NANOVDB       OFF)
@@ -1239,29 +1225,15 @@ endif()
 if(WITH_OPENMP)
   if(NOT OPENMP_CUSTOM)
     find_package(OpenMP)
-
-    list(APPEND CMAKE_MODULE_PATH "${LLVM_LIBPATH}/cmake/openmp")
-    find_package(OpenMPTarget REQUIRED NVPTX)
   endif()
 
   if(OPENMP_FOUND)
     if(NOT WITH_OPENMP_STATIC)
-      message(STATUS "============ No Static OpenMP")
-      message(${OpenMPTarget_NVPTX_FLAGS})
-
       string(APPEND CMAKE_C_FLAGS " ${OpenMP_C_FLAGS}")
       string(APPEND CMAKE_CXX_FLAGS " ${OpenMP_CXX_FLAGS}")
       string(APPEND CMAKE_EXE_LINKER_FLAGS " ${OpenMP_LINKER_FLAGS}")
       string(APPEND CMAKE_MODULE_LINKER_FLAGS " ${OpenMP_LINKER_FLAGS}")
-
-      string(APPEND CMAKE_C_FLAGS " -gline-tables-only -fopenmp-targets=nvptx64-nvidia-cuda")
-      string(APPEND CMAKE_CXX_FLAGS " -gline-tables-only -fopenmp-targets=nvptx64-nvidia-cuda")
-      string(APPEND CMAKE_EXE_LINKER_FLAGS " -fopenmp-targets=nvptx64-nvidia-cuda")
-      string(APPEND CMAKE_MODULE_LINKER_FLAGS " -fopenmp-targets=nvptx64-nvidia-cuda")
-
-      set(PLATFORM_LINKLIBS "${PLATFORM_LINKLIBS};-fopenmp=libomp;-fopenmp-targets=nvptx64-nvidia-cuda")
     else()
-      message(STATUS "============= Static OpenMP")
       # Typically avoid adding flags as defines but we can't
       # pass OpenMP flags to the linker for static builds, meaning
       # we can't add any OpenMP related flags to CFLAGS variables
@@ -1612,9 +1584,6 @@ elseif(CMAKE_C_COMPILER_ID MATCHES "Clang")
   ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_UNUSED_PARAMETER -Wunused-parameter)
 
   ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_ALL -Wall)
-  # Using C++20 features while having C++17 as the project language isn't allowed by MSVC.
-  ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_CXX20_DESIGNATOR -Wc++20-designator)
-
   ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_NO_AUTOLOGICAL_COMPARE -Wno-tautological-compare)
   ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_NO_UNKNOWN_PRAGMAS     -Wno-unknown-pragmas)
   ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_NO_CHAR_SUBSCRIPTS     -Wno-char-subscripts)
@@ -1736,18 +1705,22 @@ if(WITH_PYTHON)
   endif()
 endif()
 
-# Select C++17 as the standard for C++ projects.
-set(CMAKE_CXX_STANDARD 17)
-# If C++17 is not available, downgrading to an earlier standard is NOT OK.
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
-# Do not enable compiler specific language extentions.
-set(CMAKE_CXX_EXTENSIONS OFF)
-
-# Make MSVC properly report the value of the __cplusplus preprocessor macro
-# Available MSVC 15.7 (1914) and up, without this it reports 199711L regardless
-# of the C++ standard chosen above.
-if(MSVC AND MSVC_VERSION GREATER 1913)
-  string(APPEND CMAKE_CXX_FLAGS " /Zc:__cplusplus")
+if(MSVC)
+  string(APPEND CMAKE_CXX_FLAGS " /std:c++17")
+  # Make MSVC properly report the value of the __cplusplus preprocessor macro
+  # Available MSVC 15.7 (1914) and up, without this it reports 199711L regardless
+  # of the C++ standard chosen above
+  if(MSVC_VERSION GREATER 1913)
+    string(APPEND CMAKE_CXX_FLAGS " /Zc:__cplusplus")
+  endif()
+elseif(
+  CMAKE_COMPILER_IS_GNUCC OR
+  CMAKE_C_COMPILER_ID MATCHES "Clang" OR
+  CMAKE_C_COMPILER_ID MATCHES "Intel"
+)
+  string(APPEND CMAKE_CXX_FLAGS " -std=c++17")
+else()
+  message(FATAL_ERROR "Unknown compiler ${CMAKE_C_COMPILER_ID}, can't enable C++17 build")
 endif()
 
 # Visual Studio has all standards it supports available by default
@@ -1942,7 +1915,6 @@ if(FIRST_RUN)
   info_cfg_option(WITH_IK_ITASC)
   info_cfg_option(WITH_IK_SOLVER)
   info_cfg_option(WITH_INPUT_NDOF)
-  info_cfg_option(WITH_INPUT_IME)
   info_cfg_option(WITH_INTERNATIONAL)
   info_cfg_option(WITH_OPENCOLLADA)
   info_cfg_option(WITH_OPENCOLORIO)

GNUmakefile

@@ -63,7 +63,7 @@ Package Targets
 
    * package_debian:    Build a debian package.
    * package_pacman:    Build an arch linux pacman package.
-   * package_archive:   Build an archive package.
+   * package_archive:	Build an archive package.
 
 Testing Targets
    Not associated with building Blender.
@@ -167,7 +167,7 @@ endef
 
 # This makefile is not meant for Windows
 ifeq ($(OS),Windows_NT)
-	$(error On Windows, use "cmd //c make.bat" instead of "make")
+    $(error On Windows, use "cmd //c make.bat" instead of "make")
 endif
 
 # System Vars
@@ -379,7 +379,7 @@ deps: .FORCE
 
 	@cmake -H"$(DEPS_SOURCE_DIR)" \
 	       -B"$(DEPS_BUILD_DIR)" \
-	       -DHARVEST_TARGET=$(DEPS_INSTALL_DIR)
+		   -DHARVEST_TARGET=$(DEPS_INSTALL_DIR)
 
 	@echo
 	@echo Building dependencies ...
@@ -456,8 +456,7 @@ project_eclipse: .FORCE
 check_cppcheck: .FORCE
 	$(CMAKE_CONFIG)
 	cd "$(BUILD_DIR)" ; \
-	$(PYTHON) \
-	    "$(BLENDER_DIR)/build_files/cmake/cmake_static_check_cppcheck.py" 2> \
+	$(PYTHON) "$(BLENDER_DIR)/build_files/cmake/cmake_static_check_cppcheck.py" 2> \
 	    "$(BLENDER_DIR)/check_cppcheck.txt"
 	@echo "written: check_cppcheck.txt"
 
@@ -519,9 +518,8 @@ source_archive: .FORCE
 	python3 ./build_files/utils/make_source_archive.py
 
 source_archive_complete: .FORCE
-	cmake \
-	    -S "$(BLENDER_DIR)/build_files/build_environment" -B"$(BUILD_DIR)/source_archive" \
-	    -DCMAKE_BUILD_TYPE_INIT:STRING=$(BUILD_TYPE) -DPACKAGE_USE_UPSTREAM_SOURCES=OFF
+	cmake -S "$(BLENDER_DIR)/build_files/build_environment" -B"$(BUILD_DIR)/source_archive" \
+		-DCMAKE_BUILD_TYPE_INIT:STRING=$(BUILD_TYPE) -DPACKAGE_USE_UPSTREAM_SOURCES=OFF
 # This assumes CMake is still using a default `PACKAGE_DIR` variable:
 	python3 ./build_files/utils/make_source_archive.py --include-packages "$(BUILD_DIR)/source_archive/packages"
 
@@ -529,11 +527,9 @@ source_archive_complete: .FORCE
 INKSCAPE_BIN?="inkscape"
 icons: .FORCE
 	BLENDER_BIN=$(BLENDER_BIN) INKSCAPE_BIN=$(INKSCAPE_BIN) \
-	    "$(BLENDER_DIR)/release/datafiles/blender_icons_update.py"
-	INKSCAPE_BIN=$(INKSCAPE_BIN) \
-	    "$(BLENDER_DIR)/release/datafiles/prvicons_update.py"
-	INKSCAPE_BIN=$(INKSCAPE_BIN) \
-	    "$(BLENDER_DIR)/release/datafiles/alert_icons_update.py"
+		"$(BLENDER_DIR)/release/datafiles/blender_icons_update.py"
+	BLENDER_BIN=$(BLENDER_BIN) INKSCAPE_BIN=$(INKSCAPE_BIN) \
+		"$(BLENDER_DIR)/release/datafiles/prvicons_update.py"
 
 icons_geom: .FORCE
 	BLENDER_BIN=$(BLENDER_BIN) \
@@ -547,7 +543,7 @@ update_code: .FORCE
 
 format: .FORCE
 	PATH="../lib/${OS_NCASE}_${CPU}/llvm/bin/:../lib/${OS_NCASE}_centos7_${CPU}/llvm/bin/:../lib/${OS_NCASE}/llvm/bin/:$(PATH)" \
-	    $(PYTHON) source/tools/utils_maintenance/clang_format_paths.py $(PATHS)
+		$(PYTHON) source/tools/utils_maintenance/clang_format_paths.py $(PATHS)
 
 
 # -----------------------------------------------------------------------------
@@ -557,9 +553,8 @@ format: .FORCE
 # Simple version of ./doc/python_api/sphinx_doc_gen.sh with no PDF generation.
 doc_py: .FORCE
 	ASAN_OPTIONS=halt_on_error=0:${ASAN_OPTIONS} \
-	$(BLENDER_BIN) \
-	    --background -noaudio --factory-startup \
-	    --python doc/python_api/sphinx_doc_gen.py
+	$(BLENDER_BIN) --background -noaudio --factory-startup \
+		--python doc/python_api/sphinx_doc_gen.py
 	sphinx-build -b html -j $(NPROCS) doc/python_api/sphinx-in doc/python_api/sphinx-out
 	@echo "docs written into: '$(BLENDER_DIR)/doc/python_api/sphinx-out/index.html'"
 
@@ -568,9 +563,8 @@ doc_doxy: .FORCE
 	@echo "docs written into: '$(BLENDER_DIR)/doc/doxygen/html/index.html'"
 
 doc_dna: .FORCE
-	$(BLENDER_BIN) \
-	    --background -noaudio --factory-startup \
-	    --python doc/blender_file_format/BlendFileDnaExporter_25.py
+	$(BLENDER_BIN) --background -noaudio --factory-startup \
+		--python doc/blender_file_format/BlendFileDnaExporter_25.py
 	@echo "docs written into: '$(BLENDER_DIR)/doc/blender_file_format/dna.html'"
 
 doc_man: .FORCE

build_files/build_environment/CMakeLists.txt

@@ -56,7 +56,6 @@ else()
 endif()
 
 include(cmake/zlib.cmake)
-include(cmake/zstd.cmake)
 include(cmake/openal.cmake)
 include(cmake/png.cmake)
 include(cmake/jpeg.cmake)
@@ -82,11 +81,7 @@ if(UNIX)
 endif()
 include(cmake/openimageio.cmake)
 include(cmake/tiff.cmake)
-if(WIN32)
-  include(cmake/flexbison.cmake)
-elseif(UNIX AND NOT APPLE)
-  include(cmake/flex.cmake)
-endif()
+include(cmake/flexbison.cmake)
 include(cmake/osl.cmake)
 include(cmake/tbb.cmake)
 include(cmake/openvdb.cmake)
@@ -169,7 +164,6 @@ endif()
 if(UNIX AND NOT APPLE)
   include(cmake/libglu.cmake)
   include(cmake/mesa.cmake)
-  include(cmake/wayland_protocols.cmake)
 endif()
 
 include(cmake/harvest.cmake)

build_files/build_environment/cmake/download.cmake

@@ -87,10 +87,7 @@ download_source(LIBGLU)
 download_source(MESA)
 download_source(NASM)
 download_source(XR_OPENXR_SDK)
-download_source(WL_PROTOCOLS)
 download_source(ISPC)
 download_source(GMP)
 download_source(POTRACE)
 download_source(HARU)
-download_source(ZSTD)
-download_source(FLEX)

build_files/build_environment/cmake/ffmpeg.cmake

@@ -30,7 +30,6 @@ if(WIN32)
     --enable-w32threads
     --disable-pthreads
     --enable-libopenjpeg
-    --disable-mediafoundation
   )
   if("${CMAKE_SIZEOF_VOID_P}" EQUAL "4")
     set(FFMPEG_EXTRA_FLAGS

build_files/build_environment/cmake/flex.cmake

@@ -1,28 +0,0 @@
-# ***** BEGIN GPL LICENSE BLOCK *****
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# ***** END GPL LICENSE BLOCK *****
-
-ExternalProject_Add(external_flex
-  URL file://${PACKAGE_DIR}/${FLEX_FILE}
-  URL_HASH ${FLEX_HASH_TYPE}=${FLEX_HASH}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  PREFIX ${BUILD_DIR}/flex
-  CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/flex/src/external_flex/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/flex
-  BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/flex/src/external_flex/ && make -j${MAKE_THREADS}
-  INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/flex/src/external_flex/ && make install
-  INSTALL_DIR ${LIBDIR}/flex
-)

build_files/build_environment/cmake/harvest.cmake

@@ -106,7 +106,6 @@ harvest(llvm/include llvm/include "*")
 harvest(llvm/bin llvm/bin "llvm-config")
 harvest(llvm/lib llvm/lib "libLLVM*.a")
 harvest(llvm/lib llvm/lib "libclang*.a")
-harvest(llvm/lib/clang llvm/lib/clang "*.h")
 if(APPLE)
   harvest(openmp/lib openmp/lib "*")
   harvest(openmp/include openmp/include "*.h")
@@ -127,8 +126,6 @@ if(UNIX AND NOT APPLE)
 
   harvest(xml2/include xml2/include "*.h")
   harvest(xml2/lib xml2/lib "*.a")
-
-  harvest(wayland-protocols/share/wayland-protocols wayland-protocols/share/wayland-protocols/ "*.xml")
 else()
   harvest(blosc/lib openvdb/lib "*.a")
   harvest(xml2/lib opencollada/lib "*.a")
@@ -193,8 +190,6 @@ harvest(potrace/include potrace/include "*.h")
 harvest(potrace/lib potrace/lib "*.a")
 harvest(haru/include haru/include "*.h")
 harvest(haru/lib haru/lib "*.a")
-harvest(zstd/include zstd/include "*.h")
-harvest(zstd/lib zstd/lib "*.a")
 
 if(UNIX AND NOT APPLE)
   harvest(libglu/lib mesa/lib "*.so*")

build_files/build_environment/cmake/ispc.cmake

@@ -35,7 +35,6 @@ elseif(APPLE)
   else()
     set(ISPC_EXTRA_ARGS_APPLE
       -DBISON_EXECUTABLE=/usr/local/opt/bison/bin/bison
-      -DFLEX_EXECUTABLE=/usr/local/opt/flex/bin/flex
       -DARM_ENABLED=Off
     )
   endif()
@@ -44,7 +43,6 @@ elseif(UNIX)
     -DCMAKE_C_COMPILER=${LIBDIR}/llvm/bin/clang
     -DCMAKE_CXX_COMPILER=${LIBDIR}/llvm/bin/clang++
     -DARM_ENABLED=Off
-    -DFLEX_EXECUTABLE=${LIBDIR}/flex/bin/flex
   )
 endif()
 
@@ -84,9 +82,4 @@ if(WIN32)
     external_ispc
     external_flexbison
   )
-elseif(UNIX AND NOT APPLE)
-  add_dependencies(
-    external_ispc
-    external_flex
-  )
 endif()

build_files/build_environment/cmake/llvm.cmake

@@ -30,10 +30,6 @@ if(APPLE)
   set(BUILD_CLANG_TOOLS ON)
 endif()
 
-if(UNIX AND NOT APPLE)
-  set(LLVM_BUILD_OPENMP ^^openmp)
-  set(LLVM_TARGETS ${LLVM_TARGETS} ^^NVPTX)
-endif()
 
 set(LLVM_EXTRA_ARGS
   -DLLVM_USE_CRT_RELEASE=MD
@@ -44,18 +40,10 @@ set(LLVM_EXTRA_ARGS
   -DLLVM_ENABLE_TERMINFO=OFF
   -DLLVM_BUILD_LLVM_C_DYLIB=OFF
   -DLLVM_ENABLE_UNWIND_TABLES=OFF
-  -DLLVM_ENABLE_PROJECTS=clang${LLVM_BUILD_CLANG_TOOLS_EXTRA}${LLVM_BUILD_OPENMP}
+  -DLLVM_ENABLE_PROJECTS=clang${LLVM_BUILD_CLANG_TOOLS_EXTRA}
   ${LLVM_XML2_ARGS}
 )
 
-if(UNIX AND NOT APPLE)
-  list(APPEND LLVM_EXTRA_ARGS
-    -DCLANG_OPENMP_NVPTX_DEFAULT_ARCH=sm_61
-    -DLIBOMPTARGET_NVPTX_COMPUTE_CAPABILITIES=61
-  )
-endif()
-
-
 if(WIN32)
   set(LLVM_GENERATOR "Ninja")
 else()
@@ -78,11 +66,7 @@ ExternalProject_Add(ll
 
 if(MSVC)
   if(BUILD_MODE STREQUAL Release)
-    set(LLVM_HARVEST_COMMAND
-      ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/llvm/lib ${HARVEST_TARGET}/llvm/lib &&
-      ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/llvm/include ${HARVEST_TARGET}/llvm/include &&
-      ${CMAKE_COMMAND} -E copy ${LIBDIR}/llvm/bin/clang-format.exe ${HARVEST_TARGET}/llvm/bin/clang-format.exe
-    )
+    set(LLVM_HARVEST_COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/llvm/ ${HARVEST_TARGET}/llvm/ )
   else()
     set(LLVM_HARVEST_COMMAND
       ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/llvm/lib/ ${HARVEST_TARGET}/llvm/debug/lib/ &&

build_files/build_environment/cmake/openimagedenoise.cmake

@@ -45,6 +45,7 @@ ExternalProject_Add(external_openimagedenoise
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
   URL_HASH ${OIDN_HASH_TYPE}=${OIDN_HASH}
   PREFIX ${BUILD_DIR}/openimagedenoise
+  PATCH_COMMAND ${PATCH_CMD} -p 1 -N -d ${BUILD_DIR}/openimagedenoise/src/external_openimagedenoise < ${PATCH_DIR}/oidn.diff
   CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openimagedenoise ${DEFAULT_CMAKE_FLAGS} ${OIDN_EXTRA_ARGS}
   INSTALL_DIR ${LIBDIR}/openimagedenoise
 )

build_files/build_environment/cmake/openmp.cmake

@@ -16,20 +16,15 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-if(APPLE)
-  set(OPENMP_PATCH_COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/openmp/src/external_openmp < ${PATCH_DIR}/openmp.diff)
-else()
-  set(OPENMP_PATCH_COMMAND)
-endif()
 
 ExternalProject_Add(external_openmp
   URL file://${PACKAGE_DIR}/${OPENMP_FILE}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
   URL_HASH ${OPENMP_HASH_TYPE}=${OPENMP_HASH}
   PREFIX ${BUILD_DIR}/openmp
-  PATCH_COMMAND ${OPENMP_PATCH_COMMAND}
+  PATCH_COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/openmp/src/external_openmp < ${PATCH_DIR}/openmp.diff
   CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openmp ${DEFAULT_CMAKE_FLAGS}
-  INSTALL_COMMAND cd ${BUILD_DIR}/openmp/src/external_openmp-build && install_name_tool -id @rpath/libomp.dylib runtime/src/libomp.dylib && make install
+  INSTALL_COMMAND cd ${BUILD_DIR}/openmp/src/external_openmp-build && install_name_tool -id @executable_path/../Resources/lib/libomp.dylib runtime/src/libomp.dylib && make install
   INSTALL_DIR ${LIBDIR}/openmp
 )
 

build_files/build_environment/cmake/osl.cmake

@@ -20,10 +20,12 @@ if(WIN32)
   set(OSL_CMAKE_CXX_STANDARD_LIBRARIES "kernel32${LIBEXT} user32${LIBEXT} gdi32${LIBEXT} winspool${LIBEXT} shell32${LIBEXT} ole32${LIBEXT} oleaut32${LIBEXT} uuid${LIBEXT} comdlg32${LIBEXT} advapi32${LIBEXT} psapi${LIBEXT}")
   set(OSL_FLEX_BISON -DFLEX_EXECUTABLE=${LIBDIR}/flexbison/win_flex.exe -DBISON_EXECUTABLE=${LIBDIR}/flexbison/win_bison.exe)
   set(OSL_SIMD_FLAGS -DOIIO_NOSIMD=1 -DOIIO_SIMD=sse2)
+  SET(OSL_PLATFORM_FLAGS -DLINKSTATIC=ON)
 else()
   set(OSL_CMAKE_CXX_STANDARD_LIBRARIES)
   set(OSL_FLEX_BISON)
   set(OSL_OPENIMAGEIO_LIBRARY "${LIBDIR}/openimageio/lib/${LIBPREFIX}OpenImageIO${LIBEXT};${LIBDIR}/openimageio/lib/${LIBPREFIX}OpenImageIO_Util${LIBEXT};${LIBDIR}/png/lib/${LIBPREFIX}png16${LIBEXT};${LIBDIR}/jpg/lib/${LIBPREFIX}jpeg${LIBEXT};${LIBDIR}/tiff/lib/${LIBPREFIX}tiff${LIBEXT};${LIBDIR}/openexr/lib/${LIBPREFIX}IlmImf${OPENEXR_VERSION_POSTFIX}${LIBEXT}")
+  SET(OSL_PLATFORM_FLAGS)
 endif()
 
 set(OSL_ILMBASE_CUSTOM_LIBRARIES "${LIBDIR}/openexr/lib/Imath${OPENEXR_VERSION_POSTFIX}.lib^^${LIBDIR}/openexr/lib/Half{OPENEXR_VERSION_POSTFIX}.lib^^${LIBDIR}/openexr/lib/IlmThread${OPENEXR_VERSION_POSTFIX}.lib^^${LIBDIR}/openexr/lib/Iex${OPENEXR_VERSION_POSTFIX}.lib")
@@ -49,13 +51,12 @@ set(OSL_EXTRA_ARGS
   -DOpenImageIO_ROOT=${LIBDIR}/openimageio/
   -DOSL_BUILD_TESTS=OFF
   -DOSL_BUILD_MATERIALX=OFF
-  -DPNG_ROOT=${LIBDIR}/png
   -DZLIB_LIBRARY=${LIBDIR}/zlib/lib/${ZLIB_LIBRARY}
   -DZLIB_INCLUDE_DIR=${LIBDIR}/zlib/include/
   ${OSL_FLEX_BISON}
   -DCMAKE_CXX_STANDARD_LIBRARIES=${OSL_CMAKE_CXX_STANDARD_LIBRARIES}
   -DBUILD_SHARED_LIBS=OFF
-  -DLINKSTATIC=ON
+  ${OSL_PLATFORM_FLAGS}
   -DOSL_BUILD_PLUGINS=OFF
   -DSTOP_ON_WARNING=OFF
   -DUSE_LLVM_BITCODE=OFF
@@ -68,9 +69,13 @@ set(OSL_EXTRA_ARGS
   ${OSL_SIMD_FLAGS}
   -Dpugixml_ROOT=${LIBDIR}/pugixml
   -DUSE_PYTHON=OFF
-  -DCMAKE_CXX_STANDARD=14
 )
 
+# Apple arm64 uses LLVM 11, LLVM 10+ requires C++14
+if (APPLE AND "${CMAKE_OSX_ARCHITECTURES}" STREQUAL "arm64")
+  list(APPEND OSL_EXTRA_ARGS -DCMAKE_CXX_STANDARD=14)
+endif()
+
 ExternalProject_Add(external_osl
   URL file://${PACKAGE_DIR}/${OSL_FILE}
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
@@ -88,20 +93,10 @@ add_dependencies(
   ll
   external_openexr
   external_zlib
+  external_flexbison
   external_openimageio
   external_pugixml
 )
-if(WIN32)
-  add_dependencies(
-    external_osl
-    external_flexbison
-  )
-elseif(UNIX AND NOT APPLE)
-  add_dependencies(
-    external_osl
-    external_flex
-  )
-endif()
 
 if(WIN32)
   if(BUILD_MODE STREQUAL Release)

build_files/build_environment/cmake/png.cmake

@@ -23,7 +23,7 @@ set(PNG_EXTRA_ARGS
 )
 
 if(BLENDER_PLATFORM_ARM)
-  set(PNG_EXTRA_ARGS ${PNG_EXTRA_ARGS} -DPNG_HARDWARE_OPTIMIZATIONS=ON -DPNG_ARM_NEON=on -DCMAKE_SYSTEM_PROCESSOR="aarch64")
+  set(PNG_EXTRA_ARGS ${PNG_EXTRA_ARGS} -DPNG_HARDWARE_OPTIMIZATIONS=ON -DPNG_ARM_NEON=ON -DCMAKE_SYSTEM_PROCESSOR="aarch64")
 endif()
 
 ExternalProject_Add(external_png

build_files/build_environment/cmake/versions.cmake

@@ -152,28 +152,35 @@ set(OPENCOLORIO_HASH 1a2e3478b6cd9a1549f24e1b2205e3f0)
 set(OPENCOLORIO_HASH_TYPE MD5)
 set(OPENCOLORIO_FILE OpenColorIO-${OPENCOLORIO_VERSION}.tar.gz)
 
-set(LLVM_VERSION 12.0.0)
-set(LLVM_URI https://github.com/llvm/llvm-project/releases/download/llvmorg-${LLVM_VERSION}/llvm-project-${LLVM_VERSION}.src.tar.xz)
-set(LLVM_HASH 5a4fab4d7fc84aefffb118ac2c8a4fc0)
-set(LLVM_HASH_TYPE MD5)
-set(LLVM_FILE llvm-project-${LLVM_VERSION}.src.tar.xz)
+if(BLENDER_PLATFORM_ARM)
+  # Newer version required by ISPC with arm support.
+  set(LLVM_VERSION 11.0.1)
+  set(LLVM_URI https://github.com/llvm/llvm-project/releases/download/llvmorg-${LLVM_VERSION}/llvm-project-${LLVM_VERSION}.src.tar.xz)
+  set(LLVM_HASH e700af40ab83463e4e9ab0ba3708312e)
+  set(LLVM_HASH_TYPE MD5)
+  set(LLVM_FILE llvm-project-${LLVM_VERSION}.src.tar.xz)
 
-if(APPLE)
-  # Cloth physics test is crashing due to this bug:
-  # https://bugs.llvm.org/show_bug.cgi?id=50579
   set(OPENMP_VERSION 9.0.1)
+  set(OPENMP_URI https://github.com/llvm/llvm-project/releases/download/llvmorg-${OPENMP_VERSION}/openmp-${OPENMP_VERSION}.src.tar.xz)
   set(OPENMP_HASH 6eade16057edbdecb3c4eef9daa2bfcf)
+  set(OPENMP_HASH_TYPE MD5)
+  set(OPENMP_FILE openmp-${OPENMP_VERSION}.src.tar.xz)
 else()
-  set(OPENMP_VERSION ${LLVM_VERSION})
-  set(OPENMP_HASH ac48ce3e4582ccb82f81ab59eb3fc9dc)
-endif()
-set(OPENMP_URI https://github.com/llvm/llvm-project/releases/download/llvmorg-${OPENMP_VERSION}/openmp-${OPENMP_VERSION}.src.tar.xz)
-set(OPENMP_HASH_TYPE MD5)
-set(OPENMP_FILE openmp-${OPENMP_VERSION}.src.tar.xz)
+  set(LLVM_VERSION 9.0.1)
+  set(LLVM_URI https://github.com/llvm/llvm-project/releases/download/llvmorg-${LLVM_VERSION}/llvm-project-${LLVM_VERSION}.tar.xz)
+  set(LLVM_HASH b4268e733dfe352960140dc07ef2efcb)
+  set(LLVM_HASH_TYPE MD5)
+  set(LLVM_FILE llvm-project-${LLVM_VERSION}.tar.xz)
 
-set(OPENIMAGEIO_VERSION 2.2.15.1)
+  set(OPENMP_URI https://github.com/llvm/llvm-project/releases/download/llvmorg-${LLVM_VERSION}/openmp-${LLVM_VERSION}.src.tar.xz)
+  set(OPENMP_HASH 6eade16057edbdecb3c4eef9daa2bfcf)
+  set(OPENMP_HASH_TYPE MD5)
+  set(OPENMP_FILE openmp-${LLVM_VERSION}.src.tar.xz)
+endif()
+
+set(OPENIMAGEIO_VERSION 2.1.15.0)
 set(OPENIMAGEIO_URI https://github.com/OpenImageIO/oiio/archive/Release-${OPENIMAGEIO_VERSION}.tar.gz)
-set(OPENIMAGEIO_HASH 3db5c5f0b3dc91597c75e5df09eb9072)
+set(OPENIMAGEIO_HASH f03aa5e3ac4795af04771ee4146e9832)
 set(OPENIMAGEIO_HASH_TYPE MD5)
 set(OPENIMAGEIO_FILE OpenImageIO-${OPENIMAGEIO_VERSION}.tar.gz)
 
@@ -183,9 +190,9 @@ set(TIFF_HASH 2165e7aba557463acc0664e71a3ed424)
 set(TIFF_HASH_TYPE MD5)
 set(TIFF_FILE tiff-${TIFF_VERSION}.tar.gz)
 
-set(OSL_VERSION 1.11.14.1)
+set(OSL_VERSION 1.11.10.0)
 set(OSL_URI https://github.com/imageworks/OpenShadingLanguage/archive/Release-${OSL_VERSION}.tar.gz)
-set(OSL_HASH 1abd7ce40481771a9fa937f19595d2f2)
+set(OSL_HASH dfdc23597aeef083832cbada62211756)
 set(OSL_HASH_TYPE MD5)
 set(OSL_FILE OpenShadingLanguage-${OSL_VERSION}.tar.gz)
 
@@ -209,9 +216,9 @@ set(OPENVDB_HASH 01b490be16cc0e15c690f9a153c21461)
 set(OPENVDB_HASH_TYPE MD5)
 set(OPENVDB_FILE openvdb-${OPENVDB_VERSION}.tar.gz)
 
-set(NANOVDB_GIT_UID dc37d8a631922e7bef46712947dc19b755f3e841)
+set(NANOVDB_GIT_UID e62f7a0bf1e27397223c61ddeaaf57edf111b77f)
 set(NANOVDB_URI https://github.com/AcademySoftwareFoundation/openvdb/archive/${NANOVDB_GIT_UID}.tar.gz)
-set(NANOVDB_HASH e7b9e863ec2f3b04ead171dec2322807)
+set(NANOVDB_HASH 90919510bc6ccd630fedc56f748cb199)
 set(NANOVDB_HASH_TYPE MD5)
 set(NANOVDB_FILE nano-vdb-${NANOVDB_GIT_UID}.tar.gz)
 
@@ -363,18 +370,12 @@ set(PUGIXML_HASH 0c208b0664c7fb822bf1b49ad035e8fd)
 set(PUGIXML_HASH_TYPE MD5)
 set(PUGIXML_FILE pugixml-${PUGIXML_VERSION}.tar.gz)
 
-set(FLEXBISON_VERSION 2.5.24)
+set(FLEXBISON_VERSION 2.5.5)
 set(FLEXBISON_URI http://prdownloads.sourceforge.net/winflexbison/win_flex_bison-${FLEXBISON_VERSION}.zip)
-set(FLEXBISON_HASH 6b549d43e34ece0e8ed05af92daa31c4)
+set(FLEXBISON_HASH d87a3938194520d904013abef3df10ce)
 set(FLEXBISON_HASH_TYPE MD5)
 set(FLEXBISON_FILE win_flex_bison-${FLEXBISON_VERSION}.zip)
 
-set(FLEX_VERSION 2.6.4)
-set(FLEX_URI https://github.com/westes/flex/releases/download/v${FLEX_VERSION}/flex-${FLEX_VERSION}.tar.gz)
-set(FLEX_HASH 2882e3179748cc9f9c23ec593d6adc8d)
-set(FLEX_HASH_TYPE MD5)
-set(FLEX_FILE flex-${FLEX_VERSION}.tar.gz)
-
 # Libraries to keep Python modules static on Linux.
 
 # NOTE: bzip.org domain does no longer belong to BZip 2 project, so we download
@@ -431,9 +432,9 @@ set(USD_HASH 1dd1e2092d085ed393c1f7c450a4155a)
 set(USD_HASH_TYPE MD5)
 set(USD_FILE usd-v${USD_VERSION}.tar.gz)
 
-set(OIDN_VERSION 1.4.1)
+set(OIDN_VERSION 1.4.0)
 set(OIDN_URI https://github.com/OpenImageDenoise/oidn/releases/download/v${OIDN_VERSION}/oidn-${OIDN_VERSION}.src.tar.gz)
-set(OIDN_HASH df4007b0ab93b1c41cdf223b075d01c0)
+set(OIDN_HASH 421824019becc5b664a22a2b98332bc5)
 set(OIDN_HASH_TYPE MD5)
 set(OIDN_FILE oidn-${OIDN_VERSION}.src.tar.gz)
 
@@ -443,10 +444,10 @@ set(LIBGLU_HASH 151aef599b8259efe9acd599c96ea2a3)
 set(LIBGLU_HASH_TYPE MD5)
 set(LIBGLU_FILE glu-${LIBGLU_VERSION}.tar.xz)
 
-set(MESA_VERSION 21.1.5)
+set(MESA_VERSION 20.3.4)
 set(MESA_URI ftp://ftp.freedesktop.org/pub/mesa/mesa-${MESA_VERSION}.tar.xz)
-set(MESA_HASH 022c7293074aeeced2278c872db4fa693147c70f8595b076cf3f1ef81520766d)
-set(MESA_HASH_TYPE SHA256)
+set(MESA_HASH 556338446aef8ae947a789b3e0b5e056)
+set(MESA_HASH_TYPE MD5)
 set(MESA_FILE mesa-${MESA_VERSION}.tar.xz)
 
 set(NASM_VERSION 2.15.02)
@@ -455,23 +456,25 @@ set(NASM_HASH aded8b796c996a486a56e0515c83e414116decc3b184d88043480b32eb0a8589)
 set(NASM_HASH_TYPE SHA256)
 set(NASM_FILE nasm-${NASM_VERSION}.tar.gz)
 
-set(XR_OPENXR_SDK_VERSION 1.0.17)
+set(XR_OPENXR_SDK_VERSION 1.0.14)
 set(XR_OPENXR_SDK_URI https://github.com/KhronosGroup/OpenXR-SDK/archive/release-${XR_OPENXR_SDK_VERSION}.tar.gz)
-set(XR_OPENXR_SDK_HASH bf0fd8828837edff01047474e90013e1)
+set(XR_OPENXR_SDK_HASH 0df6b2fd6045423451a77ff6bc3e1a75)
 set(XR_OPENXR_SDK_HASH_TYPE MD5)
 set(XR_OPENXR_SDK_FILE OpenXR-SDK-${XR_OPENXR_SDK_VERSION}.tar.gz)
 
-set(WL_PROTOCOLS_VERSION 1.21)
-set(WL_PROTOCOLS_FILE wayland-protocols-${WL_PROTOCOLS_VERSION}.tar.gz)
-set(WL_PROTOCOLS_URI https://gitlab.freedesktop.org/wayland/wayland-protocols/-/archive/${WL_PROTOCOLS_VERSION}/${WL_PROTOCOLS_FILE})
-set(WL_PROTOCOLS_HASH af5ca07e13517cdbab33504492cef54a)
-set(WL_PROTOCOLS_HASH_TYPE MD5)
-
-set(ISPC_VERSION v1.16.0)
-set(ISPC_URI https://github.com/ispc/ispc/archive/${ISPC_VERSION}.tar.gz)
-set(ISPC_HASH 2e3abedbc0ea9aaec17d6562c632454d)
-set(ISPC_HASH_TYPE MD5)
-set(ISPC_FILE ispc-${ISPC_VERSION}.tar.gz)
+if(BLENDER_PLATFORM_ARM)
+  # Unreleased version with macOS arm support.
+  set(ISPC_URI https://github.com/ispc/ispc/archive/f5949c055eb9eeb93696978a3da4bfb3a6a30b35.zip)
+  set(ISPC_HASH d382fea18d01dbd0cd05d9e1ede36d7d)
+  set(ISPC_HASH_TYPE MD5)
+  set(ISPC_FILE f5949c055eb9eeb93696978a3da4bfb3a6a30b35.zip)
+else()
+  set(ISPC_VERSION v1.14.1)
+  set(ISPC_URI https://github.com/ispc/ispc/archive/${ISPC_VERSION}.tar.gz)
+  set(ISPC_HASH 968fbc8dfd16a60ba4e32d2e0e03ea7a)
+  set(ISPC_HASH_TYPE MD5)
+  set(ISPC_FILE ispc-${ISPC_VERSION}.tar.gz)
+endif()
 
 set(GMP_VERSION 6.2.0)
 set(GMP_URI https://gmplib.org/download/gmp/gmp-${GMP_VERSION}.tar.xz)
@@ -491,11 +494,5 @@ set(HARU_HASH 4f916aa49c3069b3a10850013c507460)
 set(HARU_HASH_TYPE MD5)
 set(HARU_FILE libharu-${HARU_VERSION}.tar.gz)
 
-set(ZSTD_VERSION 1.5.0)
-set(ZSTD_URI https://github.com/facebook/zstd/releases/download/v${ZSTD_VERSION}/zstd-${ZSTD_VERSION}.tar.gz)
-set(ZSTD_HASH 5194fbfa781fcf45b98c5e849651aa7b3b0a008c6b72d4a0db760f3002291e94)
-set(ZSTD_HASH_TYPE SHA256)
-set(ZSTD_FILE zstd-${ZSTD_VERSION}.tar.gz)
-
 set(SSE2NEON_GIT https://github.com/DLTcollab/sse2neon.git)
 set(SSE2NEON_GIT_HASH fe5ff00bb8d19b327714a3c290f3e2ce81ba3525)

build_files/build_environment/cmake/wayland_protocols.cmake

@@ -1,27 +0,0 @@
-# ***** BEGIN GPL LICENSE BLOCK *****
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# ***** END GPL LICENSE BLOCK *****
-
-ExternalProject_Add(external_wayland_protocols
-  URL file://${PACKAGE_DIR}/${WL_PROTOCOLS_FILE}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${WL_PROTOCOLS_HASH_TYPE}=${WL_PROTOCOLS_HASH}
-  PREFIX ${BUILD_DIR}/wayland-protocols
-  CONFIGURE_COMMAND meson --prefix ${LIBDIR}/wayland-protocols . ../external_wayland_protocols -Dtests=false
-  BUILD_COMMAND ninja
-  INSTALL_COMMAND ninja install
-)

build_files/build_environment/cmake/zstd.cmake

@@ -1,51 +0,0 @@
-# ***** BEGIN GPL LICENSE BLOCK *****
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# ***** END GPL LICENSE BLOCK *****
-
-set(ZSTD_EXTRA_ARGS
-  -DZSTD_BUILD_PROGRAMS=OFF
-  -DZSTD_BUILD_SHARED=OFF
-  -DZSTD_BUILD_STATIC=ON
-  -DZSTD_BUILD_TESTS=OFF
-  -DZSTD_LEGACY_SUPPORT=OFF
-  -DZSTD_LZ4_SUPPORT=OFF
-  -DZSTD_LZMA_SUPPORT=OFF
-  -DZSTD_MULTITHREAD_SUPPORT=ON
-  -DZSTD_PROGRAMS_LINK_SHARED=OFF
-  -DZSTD_USE_STATIC_RUNTIME=OFF
-  -DZSTD_ZLIB_SUPPORT=OFF
-)
-
-ExternalProject_Add(external_zstd
-  URL file://${PACKAGE_DIR}/${ZSTD_FILE}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH ${ZSTD_HASH_TYPE}=${ZSTD_HASH}
-  PREFIX ${BUILD_DIR}/zstd
-  SOURCE_SUBDIR build/cmake
-  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/zstd ${DEFAULT_CMAKE_FLAGS} ${ZSTD_EXTRA_ARGS}
-  INSTALL_DIR ${LIBDIR}/zstd
-)
-
-if(WIN32)
-  if(BUILD_MODE STREQUAL Release)
-    ExternalProject_Add_Step(external_zstd after_install
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/zstd/lib/zstd_static${LIBEXT} ${HARVEST_TARGET}/zstd/lib/zstd_static${LIBEXT}
-      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/zstd/include/ ${HARVEST_TARGET}/zstd/include/
-      DEPENDEES install
-    )
-  endif()
-endif()

build_files/build_environment/install_deps.sh

@@ -474,25 +474,25 @@ OPENEXR_FORCE_REBUILD=false
 OPENEXR_SKIP=false
 _with_built_openexr=false
 
-OIIO_VERSION="2.2.15.1"
-OIIO_VERSION_SHORT="2.2"
+OIIO_VERSION="2.1.15.0"
+OIIO_VERSION_SHORT="2.1"
 OIIO_VERSION_MIN="2.1.12"
-OIIO_VERSION_MAX="2.3.0"
+OIIO_VERSION_MAX="2.2.10"
 OIIO_FORCE_BUILD=false
 OIIO_FORCE_REBUILD=false
 OIIO_SKIP=false
 
-LLVM_VERSION="12.0.0"
-LLVM_VERSION_SHORT="12.0"
-LLVM_VERSION_MIN="11.0"
-LLVM_VERSION_MAX="13.0"
+LLVM_VERSION="9.0.1"
+LLVM_VERSION_SHORT="9.0"
+LLVM_VERSION_MIN="6.0"
+LLVM_VERSION_MAX="12.0"
 LLVM_VERSION_FOUND=""
 LLVM_FORCE_BUILD=false
 LLVM_FORCE_REBUILD=false
 LLVM_SKIP=false
 
 # OSL needs to be compiled for now!
-OSL_VERSION="1.11.14.1"
+OSL_VERSION="1.11.10.0"
 OSL_VERSION_SHORT="1.11"
 OSL_VERSION_MIN="1.11"
 OSL_VERSION_MAX="2.0"
@@ -553,7 +553,7 @@ EMBREE_FORCE_BUILD=false
 EMBREE_FORCE_REBUILD=false
 EMBREE_SKIP=false
 
-OIDN_VERSION="1.4.1"
+OIDN_VERSION="1.4.0"
 OIDN_VERSION_SHORT="1.4"
 OIDN_VERSION_MIN="1.4.0"
 OIDN_VERSION_MAX="1.5"
@@ -561,7 +561,7 @@ OIDN_FORCE_BUILD=false
 OIDN_FORCE_REBUILD=false
 OIDN_SKIP=false
 
-ISPC_VERSION="1.16.0"
+ISPC_VERSION="1.14.1"
 
 FFMPEG_VERSION="4.4"
 FFMPEG_VERSION_SHORT="4.4"
@@ -572,7 +572,7 @@ FFMPEG_FORCE_REBUILD=false
 FFMPEG_SKIP=false
 _ffmpeg_list_sep=";"
 
-XR_OPENXR_VERSION="1.0.17"
+XR_OPENXR_VERSION="1.0.14"
 XR_OPENXR_VERSION_SHORT="1.0"
 XR_OPENXR_VERSION_MIN="1.0.8"
 XR_OPENXR_VERSION_MAX="2.0"
@@ -1019,7 +1019,7 @@ PRINT ""
 PYTHON_SOURCE=( "https://www.python.org/ftp/python/$PYTHON_VERSION/Python-$PYTHON_VERSION.tgz" )
 
 _boost_version_nodots=`echo "$BOOST_VERSION" | sed -r 's/\./_/g'`
-BOOST_SOURCE=( "https://boostorg.jfrog.io/artifactory/main/release/$BOOST_VERSION/source/boost_$_boost_version_nodots.tar.bz2" )
+BOOST_SOURCE=( "https://dl.bintray.com/boostorg/release/$BOOST_VERSION/source/boost_$_boost_version_nodots.tar.bz2" )
 BOOST_BUILD_MODULES="--with-system --with-filesystem --with-thread --with-regex --with-locale --with-date_time --with-wave --with-iostreams --with-python --with-program_options --with-serialization --with-atomic"
 
 TBB_SOURCE=( "https://github.com/oneapi-src/oneTBB/archive/$TBB_VERSION$TBB_VERSION_UPDATE.tar.gz" )
@@ -1073,7 +1073,7 @@ OPENVDB_SOURCE=( "https://github.com/AcademySoftwareFoundation/openvdb/archive/v
 #~ OPENVDB_SOURCE_REPO_BRANCH="dev"
 
 NANOVDB_USE_REPO=false
-NANOVDB_SOURCE_REPO_UID="dc37d8a631922e7bef46712947dc19b755f3e841"
+NANOVDB_SOURCE_REPO_UID="e62f7a0bf1e27397223c61ddeaaf57edf111b77f"
 NANOVDB_SOURCE=( "https://github.com/AcademySoftwareFoundation/openvdb/archive/${NANOVDB_SOURCE_REPO_UID}.tar.gz" )
 
 ALEMBIC_USE_REPO=false
@@ -1108,9 +1108,9 @@ FFMPEG_SOURCE=( "http://ffmpeg.org/releases/ffmpeg-$FFMPEG_VERSION.tar.bz2" )
 
 XR_OPENXR_USE_REPO=false
 XR_OPENXR_SOURCE=("https://github.com/KhronosGroup/OpenXR-SDK/archive/release-${XR_OPENXR_VERSION}.tar.gz")
-XR_OPENXR_SOURCE_REPO=("https://github.com/KhronosGroup/OpenXR-SDK.git")
-XR_OPENXR_REPO_UID="bf21ccb1007bb531b45d9978919a56ea5059c245"
-XR_OPENXR_REPO_BRANCH="master"
+#~ XR_OPENXR_SOURCE_REPO=("https://github.com/KhronosGroup/OpenXR-SDK.git")
+#~ XR_OPENXR_REPO_UID="5900c51562769b03bea699dc0352cae56acb6419d"
+#~ XR_OPENXR_REPO_BRANCH="master"
 
 # C++11 is required now
 CXXFLAGS_BACK=$CXXFLAGS
@@ -1128,8 +1128,7 @@ Those libraries should be available as packages in all recent distributions (opt
     * Basics of dev environment (cmake, gcc, svn , git, ...).
     * libjpeg, libpng, libtiff, [openjpeg2], [libopenal].
     * libx11, libxcursor, libxi, libxrandr, libxinerama (and other libx... as needed).
-    * libwayland-client0, libwayland-cursor0, libwayland-egl1, libxkbcommon0, libdbus-1-3, libegl1 (Wayland)
-    * libsqlite3, libzstd, libbz2, libssl, libfftw3, libxml2, libtinyxml, yasm, libyaml-cpp, flex.
+    * libsqlite3, libbz2, libssl, libfftw3, libxml2, libtinyxml, yasm, libyaml-cpp.
     * libsdl2, libglew, libpugixml, libpotrace, [libgmp], [libglewmx], fontconfig, [libharu/libhpdf].\""
 
 DEPS_SPECIFIC_INFO="\"BUILDABLE DEPENDENCIES:
@@ -1447,7 +1446,9 @@ compile_Python() {
     make -j$THREADS && make install
     make clean
 
-    if [ ! -d $_inst ]; then
+    if [ -d $_inst ]; then
+      _create_inst_shortcut
+    else
       ERROR "Python--$PYTHON_VERSION failed to compile, exiting"
       exit 1
     fi
@@ -1463,9 +1464,6 @@ compile_Python() {
     INFO "If you want to force rebuild of this lib, use the --force-python option."
   fi
 
-  if [ -d $_inst ]; then
-    _create_inst_shortcut
-  fi
   run_ldconfig "python-$PYTHON_VERSION_SHORT"
 
   # Extra step: install required modules with pip.
@@ -1559,7 +1557,9 @@ compile_Boost() {
          --prefix=$_inst --disable-icu boost.locale.icu=off install
     ./b2 --clean
 
-    if [ ! -d $_inst ]; then
+    if [ -d $_inst ]; then
+      _create_inst_shortcut
+    else
       ERROR "Boost-$BOOST_VERSION failed to compile, exiting"
       exit 1
     fi
@@ -1573,9 +1573,7 @@ compile_Boost() {
     INFO "If you want to force rebuild of this lib, use the --force-boost option."
   fi
 
-  if [ -d $_inst ]; then
-    _create_inst_shortcut
-  fi
+  # Just always run it, much simpler this way!
   run_ldconfig "boost"
 }
 
@@ -1688,7 +1686,9 @@ compile_TBB() {
 
     make clean
 
-    if [ ! -d $_inst ]; then
+    if [ -d $_inst ]; then
+      _create_inst_shortcut
+    else
       ERROR "TBB-$TBB_VERSION$TBB_VERSION_UPDATE failed to compile, exiting"
       exit 1
     fi
@@ -1702,9 +1702,6 @@ compile_TBB() {
     INFO "If you want to force rebuild of this lib, use the --force-tbb option."
   fi
 
-  if [ -d $_inst ]; then
-    _create_inst_shortcut
-  fi
   run_ldconfig "tbb"
 }
 
@@ -1824,7 +1821,9 @@ compile_OCIO() {
 
     make clean
 
-    if [ ! -d $_inst ]; then
+    if [ -d $_inst ]; then
+      _create_inst_shortcut
+    else
       ERROR "OpenColorIO-$OCIO_VERSION failed to compile, exiting"
       exit 1
     fi
@@ -1838,9 +1837,6 @@ compile_OCIO() {
     INFO "If you want to force rebuild of this lib, use the --force-ocio option."
   fi
 
-  if [ -d $_inst ]; then
-    _create_inst_shortcut
-  fi
   run_ldconfig "ocio"
 }
 
@@ -1956,7 +1952,9 @@ compile_OPENEXR() {
 
     make clean
 
-    if [ ! -d $_inst ]; then
+    if [ -d $_inst ]; then
+      _create_inst_shortcut
+    else
       ERROR "OpenEXR-$OPENEXR_VERSION failed to compile, exiting"
       exit 1
     fi
@@ -1972,9 +1970,7 @@ compile_OPENEXR() {
 
   _with_built_openexr=true
 
-  if [ -d $_inst ]; then
-    _create_inst_shortcut
-  fi
+  # Just always run it, much simpler this way!
   run_ldconfig "openexr"
 }
 
@@ -2115,7 +2111,9 @@ compile_OIIO() {
     make -j$THREADS && make install
     make clean
 
-    if [ ! -d $_inst ]; then
+    if [ -d $_inst ]; then
+      _create_inst_shortcut
+    else
       ERROR "OpenImageIO-$OIIO_VERSION failed to compile, exiting"
       exit 1
     fi
@@ -2129,9 +2127,7 @@ compile_OIIO() {
     INFO "If you want to force rebuild of this lib, use the --force-oiio option."
   fi
 
-  if [ -d $_inst ]; then
-    _create_inst_shortcut
-  fi
+  # Just always run it, much simpler this way!
   run_ldconfig "oiio"
 }
 
@@ -2240,7 +2236,9 @@ compile_LLVM() {
     make -j$THREADS && make install
     make clean
 
-    if [ ! -d $_inst ]; then
+    if [ -d $_inst ]; then
+      _create_inst_shortcut
+    else
       ERROR "LLVM-$LLVM_VERSION failed to compile, exiting"
       exit 1
     fi
@@ -2253,10 +2251,6 @@ compile_LLVM() {
     INFO "Own LLVM-$LLVM_VERSION (CLANG included) is up to date, nothing to do!"
     INFO "If you want to force rebuild of this lib, use the --force-llvm option."
   fi
-
-  if [ -d $_inst ]; then
-    _create_inst_shortcut
-  fi
 }
 
 # ----------------------------------------------------------------------------
@@ -2321,7 +2315,6 @@ compile_OSL() {
         tar -C $SRC --transform "s,(.*/?)OpenShadingLanguage-[^/]*(.*),\1OpenShadingLanguage-$OSL_VERSION\2,x" \
             -xf $_src.tar.gz
       fi
-      patch -d $_src -p1 < $SCRIPT_DIR/patches/osl.diff
     fi
 
     cd $_src
@@ -2344,6 +2337,7 @@ compile_OSL() {
 
     cmake_d="-D CMAKE_BUILD_TYPE=Release"
     cmake_d="$cmake_d -D CMAKE_INSTALL_PREFIX=$_inst"
+    cmake_d="$cmake_d -D BUILD_TESTING=OFF"
     cmake_d="$cmake_d -D STOP_ON_WARNING=OFF"
     cmake_d="$cmake_d -D OSL_BUILD_PLUGINS=OFF"
     cmake_d="$cmake_d -D OSL_BUILD_TESTS=OFF"
@@ -2351,10 +2345,7 @@ compile_OSL() {
     cmake_d="$cmake_d -D USE_PARTIO=OFF"
     cmake_d="$cmake_d -D OSL_BUILD_MATERIALX=OFF"
     cmake_d="$cmake_d -D USE_QT=OFF"
-    cmake_d="$cmake_d -D USE_Qt5=OFF"
     cmake_d="$cmake_d -D USE_PYTHON=OFF"
-    cmake_d="$cmake_d -D USE_PARTIO=OFF"
-    cmake_d="$cmake_d -D INSTALL_DOCS=OFF"
 
     if [ $(uname -m) != "aarch64" ]; then
       cmake_d="$cmake_d -D USE_SIMD=sse2"
@@ -2376,7 +2367,10 @@ compile_OSL() {
     fi
 
     if [ -d $INST/oiio ]; then
-      cmake_d="$cmake_d -D OpenImageIO_ROOT=$INST/oiio"
+      cmake_d="$cmake_d -D OPENIMAGEIO_ROOT_DIR=$INST/oiio"
+      # HACK! SIC!!!!
+      # Quiet incredible, but if root dir is given, path to lib is found, but not path to include...
+      cmake_d="$cmake_d -D OPENIMAGEIO_INCLUDE_DIR=$INST/oiio/include"
     fi
 
     if [ ! -z $LLVM_VERSION_FOUND ]; then
@@ -2395,7 +2389,9 @@ compile_OSL() {
     make -j$THREADS && make install
     make clean
 
-    if [ ! -d $_inst ]; then
+    if [ -d $_inst ]; then
+      _create_inst_shortcut
+    else
       ERROR "OpenShadingLanguage-$OSL_VERSION failed to compile, exiting"
       exit 1
     fi
@@ -2409,9 +2405,6 @@ compile_OSL() {
     INFO "If you want to force rebuild of this lib, use the --force-osl option."
   fi
 
-  if [ -d $_inst ]; then
-    _create_inst_shortcut
-  fi
   run_ldconfig "osl"
 }
 
@@ -2512,7 +2505,9 @@ compile_OSD() {
     make -j$THREADS && make install
     make clean
 
-    if [ ! -d $_inst ]; then
+    if [ -d $_inst ]; then
+      _create_inst_shortcut
+    else
       ERROR "OpenSubdiv-$OSD_VERSION failed to compile, exiting"
       exit 1
     fi
@@ -2526,9 +2521,6 @@ compile_OSD() {
     INFO "If you want to force rebuild of this lib, use the --force-osd option."
   fi
 
-  if [ -d $_inst ]; then
-    _create_inst_shortcut
-  fi
   run_ldconfig "osd"
 }
 
@@ -2618,7 +2610,9 @@ compile_BLOSC() {
 
     make clean
 
-    if [ ! -d $_inst ]; then
+    if [ -d $_inst ]; then
+      _create_inst_shortcut
+    else
       ERROR "Blosc-$OPENVDB_BLOSC_VERSION failed to compile, exiting"
       exit 1
     fi
@@ -2631,9 +2625,6 @@ compile_BLOSC() {
 
   magic_compile_set blosc-$OPENVDB_BLOSC_VERSION $blosc_magic
 
-  if [ -d $_inst ]; then
-    _create_inst_shortcut
-  fi
   run_ldconfig "blosc"
 }
 
@@ -2724,7 +2715,9 @@ install_NanoVDB() {
     #~ mkdir -p $_inst
     #~ cp -r $_src/include $_inst/include
 
-    if [ ! -d $_inst ]; then
+    if [ -d $_inst ]; then
+      _create_inst_shortcut
+    else
       ERROR "NanoVDB-v$OPENVDB_VERSION failed to install, exiting"
       exit 1
     fi
@@ -2736,10 +2729,6 @@ install_NanoVDB() {
   else
     INFO "Own NanoVDB-v$OPENVDB_VERSION is up to date, nothing to do!"
   fi
-
-  if [ -d $_inst ]; then
-    _create_inst_shortcut
-  fi
 }
 
 
@@ -2748,7 +2737,7 @@ _init_openvdb() {
   _git=false
   _inst=$INST/openvdb-$OPENVDB_VERSION_SHORT
   _inst_shortcut=$INST/openvdb
-
+  
   _openvdb_source=$OPENVDB_SOURCE
   if [ "$WITH_NANOVDB" = true ]; then
     _openvdb_source=$NANOVDB_SOURCE
@@ -2853,13 +2842,15 @@ compile_OPENVDB() {
     if [ -d $INST/blosc ]; then
       cmake_d="$cmake_d -D Blosc_ROOT=$INST/blosc"
     fi
-
+  
     cmake $cmake_d ..
 
     make -j$THREADS install
     make clean
 
-    if [ ! -d $_inst ]; then
+    if [ -d $_inst ]; then
+      _create_inst_shortcut
+    else
       ERROR "OpenVDB-$OPENVDB_VERSION failed to compile, exiting"
       exit 1
     fi
@@ -2873,9 +2864,6 @@ compile_OPENVDB() {
     INFO "If you want to force rebuild of this lib, use the --force-openvdb option."
   fi
 
-  if [ -d $_inst ]; then
-    _create_inst_shortcut
-  fi
   run_ldconfig "openvdb"
 
   if [ "$WITH_NANOVDB" = true ]; then
@@ -2973,7 +2961,9 @@ compile_ALEMBIC() {
     make -j$THREADS install
     make clean
 
-    if [ ! -d $_inst ]; then
+    if [ -d $_inst ]; then
+      _create_inst_shortcut
+    else
       ERROR "Alembic-$ALEMBIC_VERSION failed to compile, exiting"
       exit 1
     fi
@@ -2987,9 +2977,6 @@ compile_ALEMBIC() {
     INFO "If you want to force rebuild of this lib, use the --force-alembic option."
   fi
 
-  if [ -d $_inst ]; then
-    _create_inst_shortcut
-  fi
   run_ldconfig "alembic"
 }
 
@@ -3074,7 +3061,9 @@ compile_USD() {
     make -j$THREADS install
     make clean
 
-    if [ ! -d $_inst ]; then
+    if [ -d $_inst ]; then
+      _create_inst_shortcut
+    else
       ERROR "USD-$USD_VERSION failed to compile, exiting"
       exit 1
     fi
@@ -3088,9 +3077,6 @@ compile_USD() {
     INFO "If you want to force rebuild of this lib, use the --force-usd option."
   fi
 
-  if [ -d $_inst ]; then
-    _create_inst_shortcut
-  fi
   run_ldconfig "usd"
 }
 
@@ -3184,7 +3170,9 @@ compile_OpenCOLLADA() {
     make -j$THREADS && make install
     make clean
 
-    if [ ! -d $_inst ]; then
+    if [ -d $_inst ]; then
+      _create_inst_shortcut
+    else
       ERROR "OpenCOLLADA-$OPENCOLLADA_VERSION failed to compile, exiting"
       exit 1
     fi
@@ -3197,10 +3185,6 @@ compile_OpenCOLLADA() {
     INFO "Own OpenCOLLADA-$OPENCOLLADA_VERSION is up to date, nothing to do!"
     INFO "If you want to force rebuild of this lib, use the --force-opencollada option."
   fi
-
-  if [ -d $_inst ]; then
-    _create_inst_shortcut
-  fi
 }
 
 # ----------------------------------------------------------------------------
@@ -3301,7 +3285,9 @@ compile_Embree() {
     make -j$THREADS && make install
     make clean
 
-    if [ ! -d $_inst ]; then
+    if [ -d $_inst ]; then
+      _create_inst_shortcut
+    else
       ERROR "Embree-$EMBREE_VERSION failed to compile, exiting"
       exit 1
     fi
@@ -3314,10 +3300,6 @@ compile_Embree() {
     INFO "Own Embree-$EMBREE_VERSION is up to date, nothing to do!"
     INFO "If you want to force rebuild of this lib, use the --force-embree option."
   fi
-
-  if [ -d $_inst ]; then
-    _create_inst_shortcut
-  fi
 }
 
 # ----------------------------------------------------------------------------
@@ -3380,7 +3362,9 @@ install_ISPC() {
     mkdir -p $_inst
     cp -r $_src/bin $_inst/bin
 
-    if [ ! -d $_inst ]; then
+    if [ -d $_inst ]; then
+      _create_inst_shortcut
+    else
       ERROR "ISPC-v$ISPC_VERSION failed to install, exiting"
       exit 1
     fi
@@ -3393,10 +3377,6 @@ install_ISPC() {
     INFO "Own ISPC-v$ISPC_VERSION is up to date, nothing to do!"
   fi
 
-  if [ -d $_inst ]; then
-    _create_inst_shortcut
-  fi
-
   _ispc_path_bin=$_inst/bin
   run_ldconfig "ispc"
 }
@@ -3496,7 +3476,9 @@ compile_OIDN() {
     make -j$THREADS && make install
     make clean
 
-    if [ ! -d $_inst ]; then
+    if [ -d $_inst ]; then
+      _create_inst_shortcut
+    else
       ERROR "OpenImageDenoise-$OIDN_VERSION failed to compile, exiting"
       exit 1
     fi
@@ -3510,9 +3492,6 @@ compile_OIDN() {
     INFO "If you want to force rebuild of this lib, use the --force-oidn option."
   fi
 
-  if [ -d $_inst ]; then
-    _create_inst_shortcut
-  fi
   run_ldconfig "oidn"
 }
 
@@ -3629,7 +3608,9 @@ compile_FFmpeg() {
     make -j$THREADS && make install
     make clean
 
-    if [ ! -d $_inst ]; then
+    if [ -d $_inst ]; then
+      _create_inst_shortcut
+    else
       ERROR "FFmpeg-$FFMPEG_VERSION failed to compile, exiting"
       exit 1
     fi
@@ -3642,10 +3623,6 @@ compile_FFmpeg() {
     INFO "Own ffmpeg-$FFMPEG_VERSION is up to date, nothing to do!"
     INFO "If you want to force rebuild of this lib, use the --force-ffmpeg option."
   fi
-
-  if [ -d $_inst ]; then
-    _create_inst_shortcut
-  fi
 }
 
 # ----------------------------------------------------------------------------
@@ -3744,7 +3721,9 @@ compile_XR_OpenXR_SDK() {
     make -j$THREADS && make install
     make clean
 
-    if [ ! -d $_inst ]; then
+    if [ -d $_inst ]; then
+      _create_inst_shortcut
+    else
       ERROR "XR-OpenXR-SDK-$XR_OPENXR_VERSION failed to compile, exiting"
       exit 1
     fi
@@ -3758,9 +3737,6 @@ compile_XR_OpenXR_SDK() {
     INFO "If you want to force rebuild of this lib, use the --force-xr-openxr option."
   fi
 
-  if [ -d $_inst ]; then
-    _create_inst_shortcut
-  fi
   run_ldconfig "xr-openxr-sdk"
 }
 
@@ -3863,11 +3839,10 @@ install_DEB() {
   _packages="gawk cmake cmake-curses-gui build-essential libjpeg-dev libpng-dev libtiff-dev \
              git libfreetype6-dev libfontconfig-dev libx11-dev flex bison libxxf86vm-dev \
              libxcursor-dev libxi-dev wget libsqlite3-dev libxrandr-dev libxinerama-dev \
-             libwayland-dev wayland-protocols libegl-dev libxkbcommon-dev libdbus-1-dev linux-libc-dev \
              libbz2-dev libncurses5-dev libssl-dev liblzma-dev libreadline-dev \
              libopenal-dev libglew-dev yasm $THEORA_DEV $VORBIS_DEV $OGG_DEV \
              libsdl2-dev libfftw3-dev patch bzip2 libxml2-dev libtinyxml-dev libjemalloc-dev \
-             libgmp-dev libpugixml-dev libpotrace-dev libhpdf-dev libzstd-dev"
+             libgmp-dev libpugixml-dev libpotrace-dev libhpdf-dev"
              # libglewmx-dev  (broken in deb testing currently...)
 
   VORBIS_USE=true
@@ -4135,8 +4110,6 @@ install_DEB() {
 
 
   PRINT ""
-  # Debian OIIO includes again libopencv, without even properly dealing with this dependency...
-  OIIO_FORCE_BUILD=true
   if [ "$OIIO_SKIP" = true ]; then
     WARNING "Skipping OpenImageIO installation, as requested..."
   elif [ "$OIIO_FORCE_BUILD" = true ]; then
@@ -4535,11 +4508,10 @@ install_RPM() {
   _packages="gcc gcc-c++ git make cmake tar bzip2 xz findutils flex bison fontconfig-devel \
              libtiff-devel libjpeg-devel libpng-devel sqlite-devel fftw-devel SDL2-devel \
              libX11-devel libXi-devel libXcursor-devel libXrandr-devel libXinerama-devel \
-             wayland-devel wayland-protocols-devel mesa-libEGL-devel libxkbcommon-devel dbus-devel kernel-headers \
              wget ncurses-devel readline-devel $OPENJPEG_DEV openal-soft-devel \
              glew-devel yasm $THEORA_DEV $VORBIS_DEV $OGG_DEV patch \
              libxml2-devel yaml-cpp-devel tinyxml-devel jemalloc-devel \
-             gmp-devel pugixml-devel potrace-devel libharu-devel libzstd-devel"
+             gmp-devel pugixml-devel potrace-devel libharu-devel"
 
   OPENJPEG_USE=true
   VORBIS_USE=true
@@ -5117,11 +5089,10 @@ install_ARCH() {
     BASE_DEVEL=`pacman -Sgq base-devel | sed -e 's/^gcc$/gcc-multilib/g' | paste -s -d' '`
   fi
 
-  _packages="$BASE_DEVEL git cmake fontconfig flex \
+  _packages="$BASE_DEVEL git cmake fontconfig \
              libxi libxcursor libxrandr libxinerama glew libpng libtiff wget openal \
              $OPENJPEG_DEV $VORBIS_DEV $OGG_DEV $THEORA_DEV yasm sdl2 fftw \
-             libxml2 yaml-cpp tinyxml python-requests jemalloc gmp potrace pugixml libharu \
-             zstd"
+             libxml2 yaml-cpp tinyxml python-requests jemalloc gmp potrace pugixml libharu"
 
   OPENJPEG_USE=true
   VORBIS_USE=true

build_files/build_environment/patches/ffmpeg.diff

@@ -68,32 +68,3 @@
 +
      return ret;
  }
---- a/libavcodec/rl.c
-+++ b/libavcodec/rl.c
-@@ -71,7 +71,7 @@ av_cold void ff_rl_init(RLTable *rl,
- av_cold void ff_rl_init_vlc(RLTable *rl, unsigned static_size)
- {
-     int i, q;
--    VLC_TYPE table[1500][2] = {{0}};
-+    VLC_TYPE (*table)[2] = av_calloc(sizeof(VLC_TYPE), 1500 * 2);
-     VLC vlc = { .table = table, .table_allocated = static_size };
-     av_assert0(static_size <= FF_ARRAY_ELEMS(table));
-     init_vlc(&vlc, 9, rl->n + 1, &rl->table_vlc[0][1], 4, 2, &rl->table_vlc[0][0], 4, 2, INIT_VLC_USE_NEW_STATIC);
-@@ -80,8 +80,10 @@ av_cold void ff_rl_init_vlc(RLTable *rl, unsigned static_size)
-         int qmul = q * 2;
-         int qadd = (q - 1) | 1;
- 
--        if (!rl->rl_vlc[q])
-+        if (!rl->rl_vlc[q]){
-+            av_free(table);
-             return;
-+        }
- 
-         if (q == 0) {
-             qmul = 1;
-@@ -113,4 +115,5 @@ av_cold void ff_rl_init_vlc(RLTable *rl, unsigned static_size)
-             rl->rl_vlc[q][i].run   = run;
-         }
-     }
-+    av_free(table);
- }

build_files/build_environment/patches/oidn.diff

@@ -0,0 +1,10 @@
+--- external_openimagedenoise/cmake/oidn_ispc.cmake	2021-02-15 17:29:34.000000000 +0100
++++ external_openimagedenoise/cmake/oidn_ispc.cmake2	2021-02-15 17:29:28.000000000 +0100
+@@ -98,7 +98,7 @@
+   elseif(OIDN_ARCH STREQUAL "ARM64")
+     set(ISPC_ARCHITECTURE "aarch64")
+     if(APPLE)
+-      set(ISPC_TARGET_OS "--target-os=ios")
++      set(ISPC_TARGET_OS "--target-os=macos")
+     endif()
+   endif()

build_files/build_environment/patches/openimageio.diff

@@ -34,3 +34,24 @@ diff -Naur orig/src/include/OpenImageIO/platform.h external_openimageio/src/incl
  #    include <windows.h>
  #endif
  
+diff -Naur orig/src/libutil/ustring.cpp external_openimageio/src/libutil/ustring.cpp
+--- orig/src/libutil/ustring.cpp	2020-05-11 05:43:52.000000000 +0200
++++ external_openimageio/src/libutil/ustring.cpp	2020-11-26 12:06:08.000000000 +0100
+@@ -337,6 +337,8 @@
+     // the std::string to make it point to our chars!  In such a case, the
+     // destructor will be careful not to allow a deallocation.
+ 
++    // Disable internal std::string for Apple silicon based Macs
++#if !(defined(__APPLE__) && defined(__arm64__))
+ #if defined(__GNUC__) && !defined(_LIBCPP_VERSION)                             \
+     && defined(_GLIBCXX_USE_CXX11_ABI) && _GLIBCXX_USE_CXX11_ABI
+     // NEW gcc ABI
+@@ -382,7 +384,7 @@
+         return;
+     }
+ #endif
+-
++#endif
+     // Remaining cases - just assign the internal string.  This may result
+     // in double allocation for the chars.  If you care about that, do
+     // something special for your platform, much like we did for gcc and

build_files/build_environment/patches/osl.diff

@@ -1,3 +1,18 @@
+diff -Naur OpenShadingLanguage-Release-1.9.9/src/cmake/flexbison.cmake.rej external_osl/src/cmake/flexbison.cmake.rej
+--- OpenShadingLanguage-Release-1.9.9/src/cmake/flexbison.cmake.rej	1969-12-31 17:00:00 -0700
++++ external_osl/src/cmake/flexbison.cmake.rej	2018-08-24 17:42:11 -0600
+@@ -0,0 +1,11 @@
++--- src/cmake/flexbison.cmake	2018-05-01 16:39:02 -0600
+++++ src/cmake/flexbison.cmake	2018-08-24 10:24:03 -0600
++@@ -77,7 +77,7 @@
++           DEPENDS ${${compiler_headers}}
++           WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} )
++         ADD_CUSTOM_COMMAND ( OUTPUT ${flexoutputcxx} 
++-          COMMAND ${FLEX_EXECUTABLE} -o ${flexoutputcxx} "${CMAKE_CURRENT_SOURCE_DIR}/${flexsrc}"
+++          COMMAND ${FLEX_EXECUTABLE} ${FLEX_EXTRA_OPTIONS} -o ${flexoutputcxx} "${CMAKE_CURRENT_SOURCE_DIR}/${flexsrc}"
++           MAIN_DEPENDENCY ${flexsrc}
++           DEPENDS ${${compiler_headers}}
++           WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} )
 diff -Naur OpenShadingLanguage-Release-1.9.9/src/include/OSL/llvm_util.h external_osl/src/include/OSL/llvm_util.h
 --- OpenShadingLanguage-Release-1.9.9/src/include/OSL/llvm_util.h	2018-05-01 16:39:02 -0600
 +++ external_osl/src/include/OSL/llvm_util.h	2018-08-25 14:05:00 -0600
@@ -48,50 +63,19 @@ diff -Naur org/CMakeLists.txt external_osl/CMakeLists.txt
 
  set (OSL_NO_DEFAULT_TEXTURESYSTEM OFF CACHE BOOL "Do not use create a raw OIIO::TextureSystem")
  if (OSL_NO_DEFAULT_TEXTURESYSTEM)
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 990f50d69..46ef7351d 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -252,11 +252,9 @@ install (EXPORT OSL_EXPORTED_TARGETS
-         FILE ${OSL_TARGETS_EXPORT_NAME}
-         NAMESPACE ${PROJECT_NAME}::)
- 
--
--
--
--osl_add_all_tests()
--
-+if (${PROJECT_NAME}_BUILD_TESTS AND NOT ${PROJECT_NAME}_IS_SUBPROJECT)
-+	osl_add_all_tests()
-+endif ()
- 
- if (NOT ${PROJECT_NAME}_IS_SUBPROJECT)
-     include (packaging)
-diff -Naur external_osl_orig/src/cmake/externalpackages.cmake external_osl/src/cmake/externalpackages.cmake
---- external_osl_orig/src/cmake/externalpackages.cmake  2021-06-01 13:44:18 -0600
-+++ external_osl/src/cmake/externalpackages.cmake       2021-06-28 07:44:32 -0600
-@@ -80,6 +80,7 @@
-
-
- checked_find_package (ZLIB REQUIRED)  # Needed by several packages
-+checked_find_package (PNG REQUIRED)  # Needed since OIIO needs it
-
- # IlmBase & OpenEXR
- checked_find_package (OpenEXR REQUIRED
-diff -Naur external_osl_orig/src/liboslcomp/oslcomp.cpp external_osl/src/liboslcomp/oslcomp.cpp
---- external_osl_orig/src/liboslcomp/oslcomp.cpp        2021-06-01 13:44:18 -0600
-+++ external_osl/src/liboslcomp/oslcomp.cpp     2021-06-28 09:11:06 -0600
-@@ -21,6 +21,13 @@
- #if !defined(__STDC_CONSTANT_MACROS)
- #    define __STDC_CONSTANT_MACROS 1
+diff --git a/src/liboslexec/llvm_util.cpp b/src/liboslexec/llvm_util.cpp
+index 445f6400..3d468de2 100644
+--- a/src/liboslexec/llvm_util.cpp
++++ b/src/liboslexec/llvm_util.cpp
+@@ -3430,8 +3430,9 @@ LLVM_Util::call_function (llvm::Value *func, cspan<llvm::Value *> args)
+ #endif
+     //llvm_gen_debug_printf (std::string("start ") + std::string(name));
+ #if OSL_LLVM_VERSION >= 110
+-    OSL_DASSERT(llvm::isa<llvm::Function>(func));
+-    llvm::Value *r = builder().CreateCall(llvm::cast<llvm::Function>(func), llvm::ArrayRef<llvm::Value *>(args.data(), args.size()));
++    llvm::Value* r = builder().CreateCall(
++        llvm::cast<llvm::FunctionType>(func->getType()->getPointerElementType()), func,
++        llvm::ArrayRef<llvm::Value*>(args.data(), args.size()));
+ #else
+     llvm::Value *r = builder().CreateCall (func, llvm::ArrayRef<llvm::Value *>(args.data(), args.size()));
  #endif
-+
-+// clang uses CALLBACK in its templates which causes issues if it is already defined
-+#ifdef _WIN32 && defined(CALLBACK)
-+#    undef CALLBACK
-+#endif
-+
-+//
- #include <clang/Basic/TargetInfo.h>
- #include <clang/Frontend/CompilerInstance.h>
- #include <clang/Frontend/TextDiagnosticPrinter.h>

build_files/cmake/Modules/FindZstd.cmake

@@ -1,66 +0,0 @@
-# - Find Zstd library
-# Find the native Zstd includes and library
-# This module defines
-#  ZSTD_INCLUDE_DIRS, where to find zstd.h, Set when
-#                     ZSTD_INCLUDE_DIR is found.
-#  ZSTD_LIBRARIES, libraries to link against to use Zstd.
-#  ZSTD_ROOT_DIR, The base directory to search for Zstd.
-#                 This can also be an environment variable.
-#  ZSTD_FOUND, If false, do not try to use Zstd.
-#
-# also defined, but not for general use are
-#  ZSTD_LIBRARY, where to find the Zstd library.
-
-#=============================================================================
-# Copyright 2019 Blender Foundation.
-#
-# Distributed under the OSI-approved BSD License (the "License");
-# see accompanying file Copyright.txt for details.
-#
-# This software is distributed WITHOUT ANY WARRANTY; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the License for more information.
-#=============================================================================
-
-# If ZSTD_ROOT_DIR was defined in the environment, use it.
-IF(NOT ZSTD_ROOT_DIR AND NOT $ENV{ZSTD_ROOT_DIR} STREQUAL "")
-  SET(ZSTD_ROOT_DIR $ENV{ZSTD_ROOT_DIR})
-ENDIF()
-
-SET(_zstd_SEARCH_DIRS
-  ${ZSTD_ROOT_DIR}
-)
-
-FIND_PATH(ZSTD_INCLUDE_DIR
-  NAMES
-    zstd.h
-  HINTS
-    ${_zstd_SEARCH_DIRS}
-  PATH_SUFFIXES
-    include
-)
-
-FIND_LIBRARY(ZSTD_LIBRARY
-  NAMES
-    zstd
-  HINTS
-    ${_zstd_SEARCH_DIRS}
-  PATH_SUFFIXES
-    lib64 lib
-  )
-
-# handle the QUIETLY and REQUIRED arguments and set ZSTD_FOUND to TRUE if
-# all listed variables are TRUE
-INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(Zstd DEFAULT_MSG
-    ZSTD_LIBRARY ZSTD_INCLUDE_DIR)
-
-IF(ZSTD_FOUND)
-  SET(ZSTD_LIBRARIES ${ZSTD_LIBRARY})
-  SET(ZSTD_INCLUDE_DIRS ${ZSTD_INCLUDE_DIR})
-ENDIF()
-
-MARK_AS_ADVANCED(
-  ZSTD_INCLUDE_DIR
-  ZSTD_LIBRARY
-)

build_files/cmake/cmake_consistency_check_config.py

@@ -8,9 +8,6 @@ IGNORE_SOURCE = (
     # specific source files
     "extern/audaspace/",
 
-    # Use for `WIN32` only.
-    "source/creator/blender_launcher_win32.c",
-
     # specific source files
     "extern/bullet2/src/BulletCollision/CollisionDispatch/btBox2dBox2dCollisionAlgorithm.cpp",
     "extern/bullet2/src/BulletCollision/CollisionDispatch/btConvex2dConvex2dAlgorithm.cpp",

build_files/cmake/cmake_netbeans_project.py

@@ -82,7 +82,7 @@ def create_nb_project_main():
         make_exe = cmake_cache_var("CMAKE_MAKE_PROGRAM")
         make_exe_basename = os.path.basename(make_exe)
 
-        # --------------- NetBeans specific.
+        # --------------- NB specific
         defines = [("%s=%s" % cdef) if cdef[1] else cdef[0] for cdef in defines]
         defines += [cdef.replace("#define", "").strip() for cdef in cmake_compiler_defines()]
 

build_files/cmake/config/blender_developer.cmake

@@ -7,6 +7,7 @@
 set(WITH_ASSERT_ABORT                 ON  CACHE BOOL "" FORCE)
 set(WITH_BUILDINFO                    OFF CACHE BOOL "" FORCE)
 set(WITH_COMPILER_ASAN                ON  CACHE BOOL "" FORCE)
+set(WITH_CYCLES_DEBUG                 ON  CACHE BOOL "" FORCE)
 set(WITH_CYCLES_NATIVE_ONLY           ON  CACHE BOOL "" FORCE)
 set(WITH_DOC_MANPAGE                  OFF CACHE BOOL "" FORCE)
 set(WITH_GTESTS                       ON  CACHE BOOL "" FORCE)

build_files/cmake/config/blender_full.cmake

@@ -29,7 +29,6 @@ set(WITH_IMAGE_OPENEXR       ON  CACHE BOOL "" FORCE)
 set(WITH_IMAGE_OPENJPEG      ON  CACHE BOOL "" FORCE)
 set(WITH_IMAGE_TIFF          ON  CACHE BOOL "" FORCE)
 set(WITH_INPUT_NDOF          ON  CACHE BOOL "" FORCE)
-set(WITH_INPUT_IME           ON  CACHE BOOL "" FORCE)
 set(WITH_INTERNATIONAL       ON  CACHE BOOL "" FORCE)
 set(WITH_LIBMV               ON  CACHE BOOL "" FORCE)
 set(WITH_LIBMV_SCHUR_SPECIALIZATIONS ON CACHE BOOL "" FORCE)

build_files/cmake/config/blender_release.cmake

@@ -30,7 +30,6 @@ set(WITH_IMAGE_OPENEXR       ON  CACHE BOOL "" FORCE)
 set(WITH_IMAGE_OPENJPEG      ON  CACHE BOOL "" FORCE)
 set(WITH_IMAGE_TIFF          ON  CACHE BOOL "" FORCE)
 set(WITH_INPUT_NDOF          ON  CACHE BOOL "" FORCE)
-set(WITH_INPUT_IME           ON  CACHE BOOL "" FORCE)
 set(WITH_INTERNATIONAL       ON  CACHE BOOL "" FORCE)
 set(WITH_LIBMV               ON  CACHE BOOL "" FORCE)
 set(WITH_LIBMV_SCHUR_SPECIALIZATIONS ON CACHE BOOL "" FORCE)

build_files/cmake/macros.cmake

@@ -208,7 +208,7 @@ function(blender_source_group
   )
 
   # if enabled, use the sources directories as filters.
-  if(IDE_GROUP_SOURCES_IN_FOLDERS)
+  if(WINDOWS_USE_VISUAL_STUDIO_SOURCE_FOLDERS)
     foreach(_SRC ${sources})
       # remove ../'s
       get_filename_component(_SRC_DIR ${_SRC} REALPATH)
@@ -240,8 +240,8 @@ function(blender_source_group
     endforeach()
   endif()
 
-  # if enabled, set the FOLDER property for the projects
-  if(IDE_GROUP_PROJECTS_IN_FOLDERS)
+  # if enabled, set the FOLDER property for visual studio projects
+  if(WINDOWS_USE_VISUAL_STUDIO_PROJECT_FOLDERS)
     get_filename_component(FolderDir ${CMAKE_CURRENT_SOURCE_DIR} DIRECTORY)
     string(REPLACE ${CMAKE_SOURCE_DIR} "" FolderDir ${FolderDir})
     set_target_properties(${name} PROPERTIES FOLDER ${FolderDir})

build_files/cmake/platform/platform_apple.cmake

@@ -404,16 +404,32 @@ endif()
 
 # CMake FindOpenMP doesn't know about AppleClang before 3.12, so provide custom flags.
 if(WITH_OPENMP)
-  if(CMAKE_C_COMPILER_ID MATCHES "Clang")
+  if(CMAKE_C_COMPILER_ID MATCHES "Clang" AND CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL "7.0")
     # Use OpenMP from our precompiled libraries.
     message(STATUS "Using ${LIBDIR}/openmp for OpenMP")
     set(OPENMP_CUSTOM ON)
     set(OPENMP_FOUND ON)
     set(OpenMP_C_FLAGS "-Xclang -fopenmp -I'${LIBDIR}/openmp/include'")
     set(OpenMP_CXX_FLAGS "-Xclang -fopenmp -I'${LIBDIR}/openmp/include'")
-    set(OpenMP_LIBRARY_DIR "${LIBDIR}/openmp/lib/")
-    set(OpenMP_LINKER_FLAGS "-L'${OpenMP_LIBRARY_DIR}' -lomp")
-    set(OpenMP_LIBRARY "${OpenMP_LIBRARY_DIR}/libomp.dylib")
+    set(OpenMP_LINKER_FLAGS "-L'${LIBDIR}/openmp/lib' -lomp")
+
+    # Copy libomp.dylib to allow executables like datatoc and tests to work.
+    # `@executable_path/../Resources/lib/` `LC_ID_DYLIB` is added by the deps builder.
+    # For single config generator datatoc, tests etc.
+    execute_process(
+      COMMAND mkdir -p ${CMAKE_BINARY_DIR}/Resources/lib
+      COMMAND cp -p ${LIBDIR}/openmp/lib/libomp.dylib ${CMAKE_BINARY_DIR}/Resources/lib/libomp.dylib
+    )
+    # For multi-config generator datatoc, etc.
+    execute_process(
+      COMMAND mkdir -p ${CMAKE_BINARY_DIR}/bin/Resources/lib
+      COMMAND cp -p ${LIBDIR}/openmp/lib/libomp.dylib ${CMAKE_BINARY_DIR}/bin/Resources/lib/libomp.dylib
+    )
+    # For multi-config generator tests.
+    execute_process(
+      COMMAND mkdir -p ${CMAKE_BINARY_DIR}/bin/tests/Resources/lib
+      COMMAND cp -p ${LIBDIR}/openmp/lib/libomp.dylib ${CMAKE_BINARY_DIR}/bin/tests/Resources/lib/libomp.dylib
+    )
   endif()
 endif()
 
@@ -441,9 +457,6 @@ if(WITH_HARU)
   endif()
 endif()
 
-set(ZSTD_ROOT_DIR ${LIBDIR}/zstd)
-find_package(Zstd REQUIRED)
-
 if(EXISTS ${LIBDIR})
   without_system_libs_end()
 endif()
@@ -467,8 +480,10 @@ else()
   set(CMAKE_CXX_FLAGS_RELEASE "-O2 -mdynamic-no-pic")
 endif()
 
-# Clang has too low template depth of 128 for libmv.
-string(APPEND CMAKE_CXX_FLAGS " -ftemplate-depth=1024")
+if(${XCODE_VERSION} VERSION_EQUAL 5 OR ${XCODE_VERSION} VERSION_GREATER 5)
+  # Xcode 5 is always using CLANG, which has too low template depth of 128 for libmv
+  string(APPEND CMAKE_CXX_FLAGS " -ftemplate-depth=1024")
+endif()
 
 # Avoid conflicts with Luxrender, and other plug-ins that may use the same
 # libraries as Blender with a different version or build options.
@@ -498,15 +513,3 @@ if(WITH_COMPILER_CCACHE)
     endif()
   endif()
 endif()
-
-# For binaries that are built but not installed (also not distributed) (datatoc,
-# makesdna, tests, etc.), we add an rpath to the OpenMP library dir through
-# CMAKE_BUILD_RPATH. This avoids having to make many copies of the dylib next to each binary.
-#
-# For the installed Python module and installed Blender executable, CMAKE_INSTALL_RPATH
-# is modified to find the dylib in an adjacent folder. Install step puts the libraries there.
-set(CMAKE_SKIP_BUILD_RPATH FALSE)
-list(APPEND CMAKE_BUILD_RPATH "${OpenMP_LIBRARY_DIR}")
-
-set(CMAKE_SKIP_INSTALL_RPATH FALSE)
-list(APPEND CMAKE_INSTALL_RPATH "@loader_path/../Resources/${BLENDER_VERSION}/lib")

build_files/cmake/platform/platform_unix.cmake

@@ -63,8 +63,7 @@ if(EXISTS ${LIBDIR})
   # OpenMP usually can't be statically linked into shared libraries,
   # due to not being compiled with position independent code.
   if(NOT WITH_PYTHON_MODULE)
-    #message(STATUS "============= ENABLING Static OpenMP")
-    #set(WITH_OPENMP_STATIC ON)
+    set(WITH_OPENMP_STATIC ON)
   endif()
   set(Boost_NO_BOOST_CMAKE ON)
   set(BOOST_ROOT ${LIBDIR}/boost)
@@ -100,7 +99,6 @@ endif()
 find_package_wrapper(JPEG REQUIRED)
 find_package_wrapper(PNG REQUIRED)
 find_package_wrapper(ZLIB REQUIRED)
-find_package_wrapper(Zstd REQUIRED)
 find_package_wrapper(Freetype REQUIRED)
 
 if(WITH_PYTHON)

build_files/cmake/platform/platform_win32.cmake

@@ -57,6 +57,8 @@ if(CMAKE_C_COMPILER_ID MATCHES "Clang")
   endif()
 endif()
 
+set_property(GLOBAL PROPERTY USE_FOLDERS ${WINDOWS_USE_VISUAL_STUDIO_PROJECT_FOLDERS})
+
 if(NOT WITH_PYTHON_MODULE)
   set_property(DIRECTORY PROPERTY VS_STARTUP_PROJECT blender)
 endif()
@@ -151,8 +153,8 @@ if(MSVC_CLANG) # Clangs version of cl doesn't support all flags
   string(APPEND CMAKE_CXX_FLAGS " ${CXX_WARN_FLAGS} /nologo /J /Gd /EHsc -Wno-unused-command-line-argument -Wno-microsoft-enum-forward-reference ")
   set(CMAKE_C_FLAGS     "${CMAKE_C_FLAGS} /nologo /J /Gd -Wno-unused-command-line-argument -Wno-microsoft-enum-forward-reference")
 else()
-  string(APPEND CMAKE_CXX_FLAGS " /nologo /J /Gd /MP /EHsc /bigobj /Zc:inline")
-  set(CMAKE_C_FLAGS     "${CMAKE_C_FLAGS} /nologo /J /Gd /MP /bigobj /Zc:inline")
+  string(APPEND CMAKE_CXX_FLAGS " /nologo /J /Gd /MP /EHsc /bigobj")
+  set(CMAKE_C_FLAGS     "${CMAKE_C_FLAGS} /nologo /J /Gd /MP /bigobj")
 endif()
 
 # X64 ASAN is available and usable on MSVC 16.9 preview 4 and up)
@@ -215,8 +217,8 @@ else()
 endif()
 
 if(WITH_WINDOWS_PDB)
-  set(PDB_INFO_OVERRIDE_FLAGS "${SYMBOL_FORMAT_RELEASE}")
-  set(PDB_INFO_OVERRIDE_LINKER_FLAGS "/DEBUG /OPT:REF /OPT:ICF /INCREMENTAL:NO")
+	set(PDB_INFO_OVERRIDE_FLAGS "${SYMBOL_FORMAT_RELEASE}")
+	set(PDB_INFO_OVERRIDE_LINKER_FLAGS "/DEBUG /OPT:REF /OPT:ICF /INCREMENTAL:NO")
 endif()
 
 string(APPEND CMAKE_CXX_FLAGS_DEBUG " /MDd ${SYMBOL_FORMAT}")
@@ -259,7 +261,7 @@ if(NOT DEFINED LIBDIR)
   else()
     message(FATAL_ERROR "32 bit compiler detected, blender no longer provides pre-build libraries for 32 bit windows, please set the LIBDIR cmake variable to your own library folder")
   endif()
-  if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.30.30423)
+  if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.29.30130)
     message(STATUS "Visual Studio 2022 detected.")
     set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/${LIBDIR_BASE}_vc15)
   elseif(MSVC_VERSION GREATER 1919)
@@ -873,6 +875,3 @@ if(WITH_HARU)
     set(WITH_HARU OFF)
   endif()
 endif()
-
-set(ZSTD_INCLUDE_DIRS ${LIBDIR}/zstd/include)
-set(ZSTD_LIBRARIES ${LIBDIR}/zstd/lib/zstd_static.lib)

build_files/config/README.md

@@ -1,10 +1,8 @@
 Pipeline Config
 ===============
 
-The `yaml` configuration file is used by buildbot build pipeline `update-code` step.
+This configuration file is used by buildbot new pipeline for the `update-code` step.
 
-The file allows to set branches or specific commits for both git submodules and svn artifacts. Can also define various build package versions for use by build workers. Especially useful in experimental and release branches. 
+It will soon be used by the ../utils/make_update.py script.
 
-NOTE:
-* The configuration file is ```NOT``` used by the `../utils/make_update.py` script.
-* That will implemented in the future.
+Both buildbot and developers will eventually use the same configuration file.

build_files/config/pipeline_config.json

@@ -0,0 +1,87 @@
+{
+    "update-code":
+    {
+        "git" :
+        {
+            "submodules":
+            [
+                { "path": "release/scripts/addons", "branch": "master", "commit_id": "HEAD" },
+                { "path": "release/scripts/addons_contrib", "branch": "master", "commit_id": "HEAD" },
+                { "path": "release/datafiles/locale", "branch": "master", "commit_id": "HEAD" },
+                { "path": "source/tools", "branch": "master", "commit_id": "HEAD" }
+            ]
+        },
+        "svn":
+        {
+            "tests": { "path": "lib/tests", "branch": "trunk", "commit_id": "HEAD" },
+            "libraries":
+            {
+                "darwin-x86_64": { "path": "lib/darwin", "branch": "trunk", "commit_id": "HEAD" },
+                "darwin-arm64": { "path": "lib/darwin_arm64", "branch": "trunk", "commit_id": "HEAD" },
+                "linux-x86_64": { "path": "lib/linux_centos7_x86_64", "branch": "trunk", "commit_id": "HEAD" },
+                "windows-amd64": { "path": "lib/win64_vc15", "branch": "trunk", "commit_id": "HEAD" }
+            }
+        }
+    },
+    "buildbot":
+    {
+        "gcc":
+        {
+            "version": "9.0"
+        },
+        "sdks":
+        {
+            "optix":
+            {
+                "version": "7.1.0"
+            },
+            "cuda10":
+            {
+                "version": "10.1"
+            },
+            "cuda11":
+            {
+                "version": "11.3"
+            }
+        },
+        "cmake":
+        {
+            "default":
+            {
+                "version": "any",
+                "overrides":
+                {
+
+                }
+            },
+            "darwin-x86_64":
+            {
+                "overrides":
+                {
+
+                }
+            },
+            "darwin-arm64":
+            {
+                "overrides":
+                {
+
+                }
+            },
+            "linux-x86_64":
+            {
+                "overrides":
+                {
+
+                }
+            },
+            "windows-amd64":
+            {
+                "overrides":
+                {
+
+                }
+            }
+        }
+    }
+}

build_files/config/pipeline_config.yaml

@@ -1,70 +0,0 @@
-#
-# Used by Buildbot build pipeline make_update.py script only for now
-# We intended to update the make_update.py in the branches to use this file eventually
-#
-update-code:
-    git:
-        submodules:
-        -   branch: master
-            commit_id: HEAD
-            path: release/scripts/addons
-        -   branch: master
-            commit_id: HEAD
-            path: release/scripts/addons_contrib
-        -   branch: master
-            commit_id: HEAD
-            path: release/datafiles/locale
-        -   branch: master
-            commit_id: HEAD
-            path: source/tools
-    svn:
-        libraries:
-            darwin-arm64:
-                branch: trunk
-                commit_id: HEAD
-                path: lib/darwin_arm64
-            darwin-x86_64:
-                branch: trunk
-                commit_id: HEAD
-                path: lib/darwin
-            linux-x86_64:
-                branch: trunk
-                commit_id: HEAD
-                path: lib/linux_centos7_x86_64
-            windows-amd64:
-                branch: trunk
-                commit_id: HEAD
-                path: lib/win64_vc15
-        tests:
-            branch: trunk
-            commit_id: HEAD
-            path: lib/tests
-        benchmarks:
-            branch: trunk
-            commit_id: HEAD
-            path: lib/benchmarks
-
-#
-# Buildbot only configs
-#
-buildbot:
-    gcc:
-        version: '9.0.0'
-    cuda10:
-        version: '10.1.243'
-    cuda11:
-        version: '11.4.1'
-    optix:
-        version: '7.1.0'
-    cmake:
-        default:
-            version: any
-            overrides: {}
-        darwin-arm64:
-            overrides: {}
-        darwin-x86_64:
-            overrides: {}
-        linux-x86_64:
-            overrides: {}
-        windows-amd64:
-            overrides: {}

build_files/utils/make_update.py

@@ -31,7 +31,6 @@ def parse_arguments():
     parser.add_argument("--no-submodules", action="store_true")
     parser.add_argument("--use-tests", action="store_true")
     parser.add_argument("--svn-command", default="svn")
-    parser.add_argument("--svn-branch", default=None)
     parser.add_argument("--git-command", default="git")
     parser.add_argument("--use-centos-libraries", action="store_true")
     return parser.parse_args()
@@ -47,7 +46,7 @@ def svn_update(args, release_version):
     svn_non_interactive = [args.svn_command, '--non-interactive']
 
     lib_dirpath = os.path.join(get_blender_git_root(), '..', 'lib')
-    svn_url = make_utils.svn_libraries_base_url(release_version, args.svn_branch)
+    svn_url = make_utils.svn_libraries_base_url(release_version)
 
     # Checkout precompiled libraries
     if sys.platform == 'darwin':
@@ -171,28 +170,26 @@ def submodules_update(args, release_version, branch):
         sys.stderr.write("git not found, can't update code\n")
         sys.exit(1)
 
-    # Update submodules to appropriate given branch,
-    # falling back to master if none is given and/or found in a sub-repository.
-    branch_fallback = "master"
-    if not branch:
-        branch = branch_fallback
+    # Update submodules to latest master or appropriate release branch.
+    if not release_version:
+        branch = "master"
 
     submodules = [
-        ("release/scripts/addons", branch, branch_fallback),
-        ("release/scripts/addons_contrib", branch, branch_fallback),
-        ("release/datafiles/locale", branch, branch_fallback),
-        ("source/tools", branch, branch_fallback),
+        ("release/scripts/addons", branch),
+        ("release/scripts/addons_contrib", branch),
+        ("release/datafiles/locale", branch),
+        ("source/tools", branch),
     ]
 
     # Initialize submodules only if needed.
-    for submodule_path, submodule_branch, submodule_branch_fallback in submodules:
+    for submodule_path, submodule_branch in submodules:
         if not os.path.exists(os.path.join(submodule_path, ".git")):
             call([args.git_command, "submodule", "update", "--init", "--recursive"])
             break
 
     # Checkout appropriate branch and pull changes.
     skip_msg = ""
-    for submodule_path, submodule_branch, submodule_branch_fallback in submodules:
+    for submodule_path, submodule_branch in submodules:
         cwd = os.getcwd()
         try:
             os.chdir(submodule_path)
@@ -204,11 +201,6 @@ def submodules_update(args, release_version, branch):
                     call([args.git_command, "fetch", "origin"])
                     call([args.git_command, "checkout", submodule_branch])
                 call([args.git_command, "pull", "--rebase", "origin", submodule_branch])
-                # If we cannot find the specified branch for this submodule, fallback to default one (aka master).
-                if make_utils.git_branch(args.git_command) != submodule_branch:
-                    call([args.git_command, "fetch", "origin"])
-                    call([args.git_command, "checkout", submodule_branch_fallback])
-                    call([args.git_command, "pull", "--rebase", "origin", submodule_branch_fallback])
         finally:
             os.chdir(cwd)
 
@@ -222,10 +214,6 @@ if __name__ == "__main__":
 
     # Test if we are building a specific release version.
     branch = make_utils.git_branch(args.git_command)
-    if branch == 'HEAD':
-        sys.stderr.write('Blender git repository is in detached HEAD state, must be in a branch\n')
-        sys.exit(1)
-
     tag = make_utils.git_tag(args.git_command)
     release_version = make_utils.git_branch_release_version(branch, tag)
 

build_files/utils/make_utils.py

@@ -70,11 +70,9 @@ def git_branch_release_version(branch, tag):
     return release_version
 
 
-def svn_libraries_base_url(release_version, branch=None):
+def svn_libraries_base_url(release_version):
     if release_version:
         svn_branch = "tags/blender-" + release_version + "-release"
-    elif branch:
-        svn_branch = "branches/" + branch
     else:
         svn_branch = "trunk"
     return "https://svn.blender.org/svnroot/bf-blender/" + svn_branch + "/lib/"

build_files/windows/autodetect_msvc.cmd

@@ -1,9 +1,9 @@
 echo No explicit msvc version requested, autodetecting version.
 
-call "%~dp0\detect_msvc2019.cmd"
+call "%~dp0\detect_msvc2017.cmd"
 if %ERRORLEVEL% EQU 0 goto DetectionComplete
 
-call "%~dp0\detect_msvc2017.cmd"
+call "%~dp0\detect_msvc2019.cmd"
 if %ERRORLEVEL% EQU 0 goto DetectionComplete
 
 call "%~dp0\detect_msvc2022.cmd"

build_files/windows/doc_py.cmd

@@ -1,34 +0,0 @@
-set SOURCEDIR=%BLENDER_DIR%/doc/python_api/sphinx-in
-set BUILDDIR=%BLENDER_DIR%/doc/python_api/sphinx-out
-if "%BF_LANG%" == "" set BF_LANG=en
-set SPHINXOPTS=-j auto -D language=%BF_LANG%
-
-call "%~dp0\find_sphinx.cmd"
-
-if EXIST "%SPHINX_BIN%" (
-    goto detect_sphinx_done
-)
-
-echo unable to locate sphinx-build, run "set sphinx_BIN=full_path_to_sphinx-build.exe"
-exit /b 1
-
-:detect_sphinx_done
-
-call "%~dp0\find_blender.cmd"
-
-if EXIST "%BLENDER_BIN%" (
-    goto detect_blender_done
-)
-
-echo unable to locate blender, run "set BLENDER_BIN=full_path_to_blender.exe"
-exit /b 1
-
-:detect_blender_done
-
-%BLENDER_BIN% ^
-	--background -noaudio --factory-startup ^
-	--python %BLENDER_DIR%/doc/python_api/sphinx_doc_gen.py
-
-"%SPHINX_BIN%" -b html %SPHINXOPTS% %O% %SOURCEDIR% %BUILDDIR%
-
-:EOF

build_files/windows/find_blender.cmd

@@ -1,28 +0,0 @@
-REM First see if there is an environment variable set
-if EXIST "%BLENDER_BIN%" (
-    goto detect_blender_done
-)
-
-REM Check the build folder next, if ninja was used there will be no
-REM debug/release folder
-set BLENDER_BIN=%BUILD_DIR%\bin\blender.exe
-if EXIST "%BLENDER_BIN%" (
-    goto detect_blender_done
-)
-
-REM Check the release folder next
-set BLENDER_BIN=%BUILD_DIR%\bin\release\blender.exe
-if EXIST "%BLENDER_BIN%" (
-    goto detect_blender_done
-)
-
-REM Check the debug folder next
-set BLENDER_BIN=%BUILD_DIR%\bin\debug\blender.exe
-if EXIST "%BLENDER_BIN%" (
-    goto detect_blender_done
-)
-
-REM at this point, we don't know where blender is, clear the variable
-set BLENDER_BIN=
-
-:detect_blender_done

build_files/windows/find_inkscape.cmd

@@ -1,21 +0,0 @@
-REM First see if there is an environment variable set
-if EXIST "%INKSCAPE_BIN%" (
-    goto detect_inkscape_done
-)
-
-REM Then see if inkscape is available in the path
-for %%X in (inkscape.exe) do (set INKSCAPE_BIN=%%~$PATH:X)
-if EXIST "%INKSCAPE_BIN%" (
-    goto detect_inkscape_done
-)
-
-REM Finally see if it is perhaps installed at the default location
-set INKSCAPE_BIN=%ProgramFiles%\Inkscape\bin\inkscape.exe
-if EXIST "%INKSCAPE_BIN%" (
-    goto detect_inkscape_done
-)
-
-REM If still not found clear the variable
-set INKSCAPE_BIN=
-
-:detect_inkscape_done

build_files/windows/find_sphinx.cmd

@@ -1,23 +0,0 @@
-REM First see if there is an environment variable set
-if EXIST "%SPHINX_BIN%" (
-    goto detect_sphinx_done
-)
-
-REM Then see if inkscape is available in the path
-for %%X in (sphinx-build.exe) do (set SPHINX_BIN=%%~$PATH:X)
-if EXIST "%SPHINX_BIN%" (
-    goto detect_sphinx_done
-)
-
-echo.The 'sphinx-build' command was not found. Make sure you have Sphinx
-echo.installed, then set the SPHINX_BIN environment variable to point
-echo.to the full path of the 'sphinx-build' executable. Alternatively you
-echo.may add the Sphinx directory to PATH.
-echo.
-echo.If you don't have Sphinx installed, grab it from
-echo.http://sphinx-doc.org/
-
-REM If still not found clear the variable
-set SPHINX_BIN=
-
-:detect_sphinx_done

build_files/windows/icons.cmd

@@ -1,42 +0,0 @@
-if EXIST "%PYTHON%" (
-    goto detect_python_done
-)
-
-set PYTHON=%BLENDER_DIR%\..\lib\win64_vc15\python\39\bin\python.exe
-if EXIST %PYTHON% (
-    goto detect_python_done
-)
-
-echo python not found at %PYTHON%
-exit /b 1
-
-:detect_python_done
-echo found python (%PYTHON%)
-
-call "%~dp0\find_inkscape.cmd"
-
-if EXIST "%INKSCAPE_BIN%" (
-    goto detect_inkscape_done
-)
-
-echo unable to locate inkscape, run "set inkscape_BIN=full_path_to_inkscape.exe"
-exit /b 1
-
-:detect_inkscape_done
-
-call "%~dp0\find_blender.cmd"
-
-if EXIST "%BLENDER_BIN%" (
-    goto detect_blender_done
-)
-
-echo unable to locate blender, run "set BLENDER_BIN=full_path_to_blender.exe"
-exit /b 1
-
-:detect_blender_done
-
-%PYTHON% -B %BLENDER_DIR%\release\datafiles\blender_icons_update.py
-%PYTHON% -B %BLENDER_DIR%\release\datafiles\prvicons_update.py
-%PYTHON% -B %BLENDER_DIR%\release\datafiles\alert_icons_update.py
-
-:EOF

build_files/windows/icons_geom.cmd

@@ -1,29 +0,0 @@
-if EXIST %PYTHON% (
-    goto detect_python_done
-)
-
-set PYTHON=%BLENDER_DIR%\..\lib\win64_vc15\python\39\bin\python.exe
-if EXIST %PYTHON% (
-    goto detect_python_done
-)
-
-echo python not found at %PYTHON%
-exit /b 1
-
-:detect_python_done
-echo found python (%PYTHON%)
-
-call "%~dp0\find_blender.cmd"
-
-if EXIST "%BLENDER_BIN%" (
-    goto detect_blender_done
-)
-
-echo unable to locate blender, run "set BLENDER_BIN=full_path_to_blender.exe"
-exit /b 1
-
-:detect_blender_done
-
-%PYTHON% -B %BLENDER_DIR%\release\datafiles\blender_icons_geom_update.py 
-
-:EOF

build_files/windows/parse_arguments.cmd

@@ -107,15 +107,6 @@ if NOT "%1" == "" (
 		set FORMAT=1
 		set FORMAT_ARGS=%2 %3 %4 %5 %6 %7 %8 %9
 		goto EOF
-	) else if "%1" == "icons" (
-		set ICONS=1
-		goto EOF
-	) else if "%1" == "icons_geom" (
-		set ICONS_GEOM=1
-		goto EOF
-	) else if "%1" == "doc_py" (
-		set DOC_PY=1
-		goto EOF
 	) else (
 		echo Command "%1" unknown, aborting!
 		goto ERR

build_files/windows/reset_variables.cmd

@@ -31,6 +31,3 @@ set PYDEBUG_CMAKE_ARGS=
 set FORMAT=
 set TEST=
 set BUILD_WITH_SCCACHE=
-set ICONS=
-set ICONS_GEOM=
-set DOC_PY=

build_files/windows/show_help.cmd

@@ -31,10 +31,6 @@ echo - 2019 ^(build with visual studio 2019^)
 echo - 2019pre ^(build with visual studio 2019 pre-release^)
 echo - 2019b ^(build with visual studio 2019 Build Tools^)
 
-echo.
-echo Documentation Targets ^(Not associated with building^)
-echo - doc_py ^(Generate sphinx python api docs^)
-
 echo.
 echo Experimental options
 echo - with_opengl_tests ^(enable both the render and draw opengl test suites^)

doc/blender_file_format/BlendFileReader.py

@@ -123,7 +123,7 @@ def Align(handle):
 class BlendFile:
     '''
     Reads a blendfile and store the header, all the fileblocks, and catalogue
-    structs found in the DNA fileblock
+    structs foound in the DNA fileblock
 
     - BlendFile.Header  (BlendFileHeader instance)
     - BlendFile.Blocks  (list of BlendFileBlock instances)

doc/manpage/blender.1.py

@@ -122,7 +122,7 @@ is a full-featured 3D application. It supports the entirety of the 3D pipeline -
 '''modeling, rigging, animation, simulation, rendering, compositing, motion tracking, and video editing.
 
 Use Blender to create 3D images and animations, films and commercials, content for games, '''
-r'''architectural and industrial visualizations, and scientific visualizations.
+r'''architectural and industrial visualizatons, and scientific visualizations.
 
 https://www.blender.org''')
 

doc/python_api/examples/bpy.app.handlers.2.py

@@ -12,7 +12,6 @@ such cases, lock the interface (Render → Lock Interface or
 Below is an example of a mesh that is altered from a handler:
 """
 
-
 def frame_change_pre(scene):
     # A triangle that shifts in the z direction
     zshift = scene.frame_current * 0.1

doc/python_api/examples/bpy.app.timers.5.py

@@ -16,12 +16,10 @@ execution_queue = queue.Queue()
 def run_in_main_thread(function):
     execution_queue.put(function)
 
-
 def execute_queued_functions():
     while not execution_queue.empty():
         function = execution_queue.get()
         function()
     return 1.0
 
-
 bpy.app.timers.register(execute_queued_functions)

doc/python_api/examples/bpy.msgbus.1.py

@@ -31,13 +31,11 @@ owner = object()
 
 subscribe_to = bpy.context.object.location
 
-
 def msgbus_callback(*args):
     # This will print:
     # Something changed! (1, 2, 3)
     print("Something changed!", args)
 
-
 bpy.msgbus.subscribe_rna(
     key=subscribe_to,
     owner=owner,

doc/python_api/examples/bpy.types.Depsgraph.7.py

@@ -44,7 +44,7 @@ class OBJECT_OT_object_to_curve(bpy.types.Operator):
         # Remove temporary curve.
         obj.to_curve_clear()
         # Invoke to_curve() with applying modifiers.
-        curve_with_modifiers = obj.to_curve(depsgraph, apply_modifiers=True)
+        curve_with_modifiers = obj.to_curve(depsgraph, apply_modifiers = True)
         self.report({'INFO'}, f"{len(curve_with_modifiers.splines)} splines in new curve with modifiers.")
         # Remove temporary curve.
         obj.to_curve_clear()

doc/python_api/examples/gpu.6.py

@@ -21,7 +21,6 @@ batch = batch_for_shader(
     },
 )
 
-
 def draw():
     shader.bind()
     shader.uniform_sampler("image", texture)

doc/python_api/examples/gpu.9.py

@@ -31,8 +31,7 @@ def draw():
         context.space_data,
         context.region,
         view_matrix,
-        projection_matrix,
-        True)
+        projection_matrix)
 
     gpu.state.depth_mask_set(False)
     draw_texture_2d(offscreen.texture_color, (10, 10), WIDTH, HEIGHT)

doc/python_api/requirements.txt

@@ -1,13 +1,13 @@
-sphinx==4.1.1
+sphinx==3.5.4
 
 # Sphinx dependencies that are important
-Jinja2==3.0.1
-Pygments==2.10.0
-docutils==0.17.1
+Jinja2==2.11.3
+Pygments==2.9.0
+docutils==0.16
 snowballstemmer==2.1.0
 babel==2.9.1
-requests==2.26.0
+requests==2.25.1
 
 # Only needed to match the theme used for the official documentation.
 # Without this theme, the default theme will be used.
-sphinx_rtd_theme==1.0.0rc1
+sphinx_rtd_theme==0.5.2

doc/python_api/sphinx_doc_gen.py

@@ -254,8 +254,6 @@ else:
         "gpu.shader",
         "gpu.state",
         "gpu.texture",
-        "gpu.platform",
-        "gpu.capabilities",
         "gpu_extras",
         "idprop.types",
         "mathutils",
@@ -1039,21 +1037,16 @@ context_type_map = {
     # context_member: (RNA type, is_collection)
     "active_annotation_layer": ("GPencilLayer", False),
     "active_bone": ("EditBone", False),
-    "active_file": ("FileSelectEntry", False),
     "active_gpencil_frame": ("GreasePencilLayer", True),
     "active_gpencil_layer": ("GPencilLayer", True),
     "active_node": ("Node", False),
     "active_object": ("Object", False),
     "active_operator": ("Operator", False),
     "active_pose_bone": ("PoseBone", False),
-    "active_sequence_strip": ("Sequence", False),
     "active_editable_fcurve": ("FCurve", False),
-    "active_nla_strip": ("NlaStrip", False),
-    "active_nla_track": ("NlaTrack", False),
     "annotation_data": ("GreasePencil", False),
     "annotation_data_owner": ("ID", False),
     "armature": ("Armature", False),
-    "asset_library_ref": ("AssetLibraryReference", False),
     "bone": ("Bone", False),
     "brush": ("Brush", False),
     "camera": ("Camera", False),
@@ -1078,7 +1071,6 @@ context_type_map = {
     "gpencil_data": ("GreasePencil", False),
     "gpencil_data_owner": ("ID", False),
     "hair": ("Hair", False),
-    "id": ("ID", False),
     "image_paint_object": ("Object", False),
     "lattice": ("Lattice", False),
     "light": ("Light", False),
@@ -1107,7 +1099,6 @@ context_type_map = {
     "selected_editable_keyframes": ("Keyframe", True),
     "selected_editable_objects": ("Object", True),
     "selected_editable_sequences": ("Sequence", True),
-    "selected_files": ("FileSelectEntry", True),
     "selected_nla_strips": ("NlaStrip", True),
     "selected_nodes": ("Node", True),
     "selected_objects": ("Object", True),
@@ -1122,7 +1113,6 @@ context_type_map = {
     "texture_slot": ("MaterialTextureSlot", False),
     "texture_user": ("ID", False),
     "texture_user_property": ("Property", False),
-    "ui_list": ("UIList", False),
     "vertex_paint_object": ("Object", False),
     "view_layer": ("ViewLayer", False),
     "visible_bones": ("EditBone", True),
@@ -1204,7 +1194,6 @@ def pycontext2sphinx(basepath):
         "text_context_dir",
         "clip_context_dir",
         "sequencer_context_dir",
-        "file_context_dir",
     )
 
     unique = set()
@@ -2002,15 +1991,13 @@ def write_rst_importable_modules(basepath):
         "blf": "Font Drawing",
         "imbuf": "Image Buffer",
         "imbuf.types": "Image Buffer Types",
-        "gpu": "GPU Module",
+        "gpu": "GPU Shader Module",
         "gpu.types": "GPU Types",
         "gpu.matrix": "GPU Matrix Utilities",
         "gpu.select": "GPU Select Utilities",
         "gpu.shader": "GPU Shader Utilities",
         "gpu.state": "GPU State Utilities",
         "gpu.texture": "GPU Texture Utilities",
-        "gpu.platform": "GPU Platform Utilities",
-        "gpu.capabilities": "GPU Capabilities Utilities",
         "bmesh": "BMesh Module",
         "bmesh.ops": "BMesh Operators",
         "bmesh.types": "BMesh Types",

extern/CMakeLists.txt

@@ -111,5 +111,5 @@ if(WITH_MOD_FLUID)
 endif()
 
 if (WITH_COMPOSITOR)
-  add_subdirectory(smaa_areatex)
+	add_subdirectory(smaa_areatex)
 endif()

extern/audaspace/bindings/C/AUD_Special.cpp

@@ -86,7 +86,6 @@ AUD_API AUD_SoundInfo AUD_getInfo(AUD_Sound* sound)
 	info.specs.channels = AUD_CHANNELS_INVALID;
 	info.specs.rate = AUD_RATE_INVALID;
 	info.length = 0.0f;
-	info.start_offset = 0.0f;
 
 	try
 	{
@@ -96,7 +95,6 @@ AUD_API AUD_SoundInfo AUD_getInfo(AUD_Sound* sound)
 		{
 			info.specs = convSpecToC(reader->getSpecs());
 			info.length = reader->getLength() / (float) info.specs.rate;
-			info.start_offset = reader->getStartOffset();
 		}
 	}
 	catch(Exception&)
@@ -247,7 +245,7 @@ AUD_API int AUD_readSound(AUD_Sound* sound, float* buffer, int length, int sampl
 
 		buffer[i * 3] = min;
 		buffer[i * 3 + 1] = max;
-		buffer[i * 3 + 2] = sqrt(power / len); // RMS
+		buffer[i * 3 + 2] = sqrt(power) / len;
 
 		if(overallmax < max)
 			overallmax = max;

extern/audaspace/bindings/C/AUD_Types.h

@@ -176,5 +176,4 @@ typedef struct
 {
 	AUD_Specs specs;
 	float length;
-	double start_offset;
 } AUD_SoundInfo;

extern/audaspace/bindings/python/setup.py.in

@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+# -*- coding: utf-8 -*-
 
 import sys
 import os

extern/audaspace/include/IReader.h

@@ -70,12 +70,6 @@ public:
 	 */
 	virtual int getPosition() const=0;
 
-	/**
-	 * Returns the start offset the sound should have to line up with related sources.
-	 * \return The required start offset in seconds.
-	 */
-	virtual double getStartOffset() const { return 0.0;}
-
 	/**
 	 * Returns the specification of the reader.
 	 * \return The Specs structure.

extern/audaspace/include/devices/SoftwareDevice.h

@@ -265,12 +265,6 @@ protected:
 	 */
 	void setSpecs(Specs specs);
 
-	/**
-	 * Sets the audio output specification of the device.
-	 * \param specs The output specification.
-	 */
-	void setSpecs(DeviceSpecs specs);
-
 	/**
 	 * Empty default constructor. To setup the device call the function create()
 	 * and to uninitialize call destroy().

extern/audaspace/include/fx/VolumeReader.h

@@ -67,4 +67,4 @@ public:
 	virtual void read(int& length, bool& eos, sample_t* buffer);
 };
 
-AUD_NAMESPACE_END
+AUD_NAMESPACE_END

extern/audaspace/include/respec/Mixer.h

@@ -87,12 +87,6 @@ public:
 	 */
 	void setSpecs(Specs specs);
 
-	/**
-	 * Sets the target specification for superposing.
-	 * \param specs The target specification.
-	 */
-	void setSpecs(DeviceSpecs specs);
-
 	/**
 	 * Mixes a buffer.
 	 * \param buffer The buffer to superpose.

extern/audaspace/plugins/ffmpeg/FFMPEGReader.cpp

@@ -68,7 +68,7 @@ int FFMPEGReader::decode(AVPacket& packet, Buffer& buffer)
 					for(int i = 0; i < m_frame->nb_samples; i++)
 					{
 						std::memcpy(((data_t*)buffer.getBuffer()) + buf_pos + ((m_codecCtx->channels * i) + channel) * single_size,
-								 m_frame->data[channel] + i * single_size, single_size);
+							   m_frame->data[channel] + i * single_size, single_size);
 					}
 				}
 			}
@@ -109,7 +109,7 @@ int FFMPEGReader::decode(AVPacket& packet, Buffer& buffer)
 				for(int i = 0; i < m_frame->nb_samples; i++)
 				{
 					std::memcpy(((data_t*)buffer.getBuffer()) + buf_pos + ((m_codecCtx->channels * i) + channel) * single_size,
-							 m_frame->data[channel] + i * single_size, single_size);
+						   m_frame->data[channel] + i * single_size, single_size);
 				}
 			}
 		}
@@ -126,10 +126,7 @@ int FFMPEGReader::decode(AVPacket& packet, Buffer& buffer)
 void FFMPEGReader::init()
 {
 	m_position = 0;
-	m_start_offset = 0.0f;
 	m_pkgbuf_left = 0;
-	m_st_time = 0;
-	m_duration = 0;
 
 	if(avformat_find_stream_info(m_formatCtx, nullptr) < 0)
 		AUD_THROW(FileException, "File couldn't be read, ffmpeg couldn't find the stream info.");
@@ -137,41 +134,15 @@ void FFMPEGReader::init()
 	// find audio stream and codec
 	m_stream = -1;
 
-	double dur_sec = 0;
-
 	for(unsigned int i = 0; i < m_formatCtx->nb_streams; i++)
 	{
 #ifdef FFMPEG_OLD_CODE
-		if(m_formatCtx->streams[i]->codec->codec_type == AVMEDIA_TYPE_AUDIO)
+		if((m_formatCtx->streams[i]->codec->codec_type == AVMEDIA_TYPE_AUDIO)
 #else
-		if(m_formatCtx->streams[i]->codecpar->codec_type == AVMEDIA_TYPE_AUDIO)
+		if((m_formatCtx->streams[i]->codecpar->codec_type == AVMEDIA_TYPE_AUDIO)
 #endif
+			&& (m_stream < 0))
 		{
-			AVStream *audio_stream = m_formatCtx->streams[i];
-			double audio_timebase = av_q2d(audio_stream->time_base);
-
-			if (audio_stream->start_time != AV_NOPTS_VALUE)
-			{
-				m_st_time = audio_stream->start_time;
-			}
-
-			int64_t ctx_start_time = 0;
-			if (m_formatCtx->start_time != AV_NOPTS_VALUE) {
-				ctx_start_time = m_formatCtx->start_time;
-			}
-
-			m_start_offset = m_st_time * audio_timebase - (double)ctx_start_time / AV_TIME_BASE;
-
-			if(audio_stream->duration != AV_NOPTS_VALUE)
-			{
-				dur_sec = audio_stream->duration * audio_timebase;
-			}
-			else
-			{
-				/* If the audio starts after the stream start time, subract this from the total duration. */
-				dur_sec = (double)m_formatCtx->duration / AV_TIME_BASE - m_start_offset;
-			}
-
 			m_stream=i;
 			break;
 		}
@@ -242,7 +213,6 @@ void FFMPEGReader::init()
 	}
 
 	m_specs.rate = (SampleRate) m_codecCtx->sample_rate;
-	m_duration = lround(dur_sec * m_codecCtx->sample_rate);
 }
 
 FFMPEGReader::FFMPEGReader(std::string filename) :
@@ -368,17 +338,21 @@ void FFMPEGReader::seek(int position)
 {
 	if(position >= 0)
 	{
-		double pts_time_base =
-			av_q2d(m_formatCtx->streams[m_stream]->time_base);
+		uint64_t st_time = m_formatCtx->start_time;
+		uint64_t seek_pos = ((uint64_t)position) * ((uint64_t)AV_TIME_BASE) / ((uint64_t)m_specs.rate);
 
-		uint64_t seek_pts = (((uint64_t)position) / ((uint64_t)m_specs.rate)) / pts_time_base;
-
-		if(m_st_time != AV_NOPTS_VALUE) {
-			seek_pts += m_st_time;
+		if(st_time != AV_NOPTS_VALUE) {
+			seek_pos += st_time;
 		}
 
+		double pts_time_base = 
+			av_q2d(m_formatCtx->streams[m_stream]->time_base);
+		uint64_t pts_st_time =
+			((st_time != AV_NOPTS_VALUE) ? st_time : 0)
+			/ pts_time_base / (uint64_t) AV_TIME_BASE;
+
 		// a value < 0 tells us that seeking failed
-		if(av_seek_frame(m_formatCtx, m_stream, seek_pts,
+		if(av_seek_frame(m_formatCtx, -1, seek_pos,
 				 AVSEEK_FLAG_BACKWARD | AVSEEK_FLAG_ANY) >= 0)
 		{
 			avcodec_flush_buffers(m_codecCtx);
@@ -400,7 +374,7 @@ void FFMPEGReader::seek(int position)
 					if(packet.pts != AV_NOPTS_VALUE)
 					{
 						// calculate real position, and read to frame!
-						m_position = (packet.pts - m_st_time) * pts_time_base * m_specs.rate;
+						m_position = (packet.pts - pts_st_time) * pts_time_base * m_specs.rate;
 
 						if(m_position < position)
 						{
@@ -431,7 +405,8 @@ void FFMPEGReader::seek(int position)
 int FFMPEGReader::getLength() const
 {
 	// return approximated remaning size
-	return m_duration - m_position;
+	return (int)((m_formatCtx->duration * m_codecCtx->sample_rate)
+				 / AV_TIME_BASE)-m_position;
 }
 
 int FFMPEGReader::getPosition() const
@@ -439,11 +414,6 @@ int FFMPEGReader::getPosition() const
 	return m_position;
 }
 
-double FFMPEGReader::getStartOffset() const
-{
-	return m_start_offset;
-}
-
 Specs FFMPEGReader::getSpecs() const
 {
 	return m_specs.specs;
@@ -480,13 +450,11 @@ void FFMPEGReader::read(int& length, bool& eos, sample_t* buffer)
 			// decode the package
 			pkgbuf_pos = decode(packet, m_pkgbuf);
 
-			if (packet.pts >= m_st_time) {
-				// copy to output buffer
-				data_size = std::min(pkgbuf_pos, left * sample_size);
-				m_convert((data_t*) buf, (data_t*) m_pkgbuf.getBuffer(), data_size / AUD_FORMAT_SIZE(m_specs.format));
-				buf += data_size / AUD_FORMAT_SIZE(m_specs.format);
-				left -= data_size / sample_size;
-			}
+			// copy to output buffer
+			data_size = std::min(pkgbuf_pos, left * sample_size);
+			m_convert((data_t*) buf, (data_t*) m_pkgbuf.getBuffer(), data_size / AUD_FORMAT_SIZE(m_specs.format));
+			buf += data_size / AUD_FORMAT_SIZE(m_specs.format);
+			left -= data_size / sample_size;
 		}
 		av_packet_unref(&packet);
 	}

extern/audaspace/plugins/ffmpeg/FFMPEGReader.h

@@ -54,22 +54,6 @@ private:
 	 */
 	int m_position;
 
-	/**
-	 * The start offset in seconds relative to the media container start time.
-	 * IE how much the sound should be delayed to be kept in sync with the rest of the containter streams.
-	 */
-	double m_start_offset;
-
-	/**
-	 * The start time pts of the stream. All packets before this timestamp shouldn't be played back (only decoded).
-	 */
-	int64_t m_st_time;
-
-	/**
-	 * The duration of the audio stream in samples.
-	 */
-	int64_t m_duration;
-
 	/**
 	 * The specification of the audio data.
 	 */
@@ -198,7 +182,6 @@ public:
 	virtual void seek(int position);
 	virtual int getLength() const;
 	virtual int getPosition() const;
-	virtual double getStartOffset() const;
 	virtual Specs getSpecs() const;
 	virtual void read(int& length, bool& eos, sample_t* buffer);
 };

extern/audaspace/plugins/pulseaudio/PulseAudioDevice.cpp

@@ -32,24 +32,17 @@ void PulseAudioDevice::PulseAudio_state_callback(pa_context *context, void *data
 	device->m_state = AUD_pa_context_get_state(context);
 }
 
-void PulseAudioDevice::PulseAudio_request(pa_stream *stream, size_t total_bytes, void *data)
+void PulseAudioDevice::PulseAudio_request(pa_stream *stream, size_t num_bytes, void *data)
 {
 	PulseAudioDevice* device = (PulseAudioDevice*)data;
 
 	void* buffer;
 
-	while(total_bytes > 0)
-	{
-		size_t num_bytes = total_bytes;
+	AUD_pa_stream_begin_write(stream, &buffer, &num_bytes);
 
-		AUD_pa_stream_begin_write(stream, &buffer, &num_bytes);
+	device->mix((data_t*)buffer, num_bytes / AUD_DEVICE_SAMPLE_SIZE(device->m_specs));
 
-		device->mix((data_t*)buffer, num_bytes / AUD_DEVICE_SAMPLE_SIZE(device->m_specs));
-
-		AUD_pa_stream_write(stream, buffer, num_bytes, nullptr, 0, PA_SEEK_RELATIVE);
-
-		total_bytes -= num_bytes;
-	}
+	AUD_pa_stream_write(stream, buffer, num_bytes, nullptr, 0, PA_SEEK_RELATIVE);
 }
 
 void PulseAudioDevice::PulseAudio_underflow(pa_stream *stream, void *data)
@@ -85,7 +78,6 @@ void PulseAudioDevice::runMixingThread()
 			if(shouldStop())
 			{
 				AUD_pa_stream_cork(m_stream, 1, nullptr, nullptr);
-				AUD_pa_stream_flush(m_stream, nullptr, nullptr);
 				doStop();
 				return;
 			}
@@ -94,15 +86,13 @@ void PulseAudioDevice::runMixingThread()
 		if(AUD_pa_stream_is_corked(m_stream))
 			AUD_pa_stream_cork(m_stream, 0, nullptr, nullptr);
 
-		// similar to AUD_pa_mainloop_iterate(m_mainloop, false, nullptr); except with a longer timeout
-		AUD_pa_mainloop_prepare(m_mainloop, 1 << 14);
-		AUD_pa_mainloop_poll(m_mainloop);
-		AUD_pa_mainloop_dispatch(m_mainloop);
+		AUD_pa_mainloop_iterate(m_mainloop, true, nullptr);
 	}
 }
 
 PulseAudioDevice::PulseAudioDevice(std::string name, DeviceSpecs specs, int buffersize) :
 	m_state(PA_CONTEXT_UNCONNECTED),
+	m_buffersize(buffersize),
 	m_underflows(0)
 {
 	m_mainloop = AUD_pa_mainloop_new();
@@ -193,9 +183,6 @@ PulseAudioDevice::PulseAudioDevice(std::string name, DeviceSpecs specs, int buff
 	AUD_pa_stream_set_write_callback(m_stream, PulseAudio_request, this);
 	AUD_pa_stream_set_underflow_callback(m_stream, PulseAudio_underflow, this);
 
-	buffersize *= AUD_DEVICE_SAMPLE_SIZE(m_specs);
-	m_buffersize = buffersize;
-
 	pa_buffer_attr buffer_attr;
 
 	buffer_attr.fragsize = -1U;

extern/audaspace/plugins/pulseaudio/PulseAudioDevice.h

@@ -59,7 +59,7 @@ private:
 	 * \param num_bytes The length in bytes to be supplied.
 	 * \param data The PulseAudio device.
 	 */
-	AUD_LOCAL static void PulseAudio_request(pa_stream* stream, size_t total_bytes, void* data);
+	AUD_LOCAL static void PulseAudio_request(pa_stream* stream, size_t num_bytes, void* data);
 
 	/**
 	 * Reports an underflow from the PulseAudio server.

extern/audaspace/plugins/pulseaudio/PulseAudioSymbols.h

@@ -24,7 +24,6 @@ PULSEAUDIO_SYMBOL(pa_context_unref);
 PULSEAUDIO_SYMBOL(pa_stream_begin_write);
 PULSEAUDIO_SYMBOL(pa_stream_connect_playback);
 PULSEAUDIO_SYMBOL(pa_stream_cork);
-PULSEAUDIO_SYMBOL(pa_stream_flush);
 PULSEAUDIO_SYMBOL(pa_stream_is_corked);
 PULSEAUDIO_SYMBOL(pa_stream_new);
 PULSEAUDIO_SYMBOL(pa_stream_set_buffer_attr);
@@ -36,6 +35,3 @@ PULSEAUDIO_SYMBOL(pa_mainloop_free);
 PULSEAUDIO_SYMBOL(pa_mainloop_get_api);
 PULSEAUDIO_SYMBOL(pa_mainloop_new);
 PULSEAUDIO_SYMBOL(pa_mainloop_iterate);
-PULSEAUDIO_SYMBOL(pa_mainloop_prepare);
-PULSEAUDIO_SYMBOL(pa_mainloop_poll);
-PULSEAUDIO_SYMBOL(pa_mainloop_dispatch);

extern/audaspace/plugins/wasapi/WASAPIDevice.cpp

@@ -31,81 +31,65 @@ template <class T> void SafeRelease(T **ppT)
 	}
 }
 
-HRESULT WASAPIDevice::setupRenderClient(IAudioRenderClient*& render_client, UINT32& buffer_size)
+void WASAPIDevice::runMixingThread()
 {
-	const IID IID_IAudioRenderClient = __uuidof(IAudioRenderClient);
-
+	UINT32 buffer_size;
 	UINT32 padding;
 	UINT32 length;
 	data_t* buffer;
 
-	HRESULT result;
+	IAudioRenderClient* render_client = nullptr;
 
-	if(FAILED(result = m_audio_client->GetBufferSize(&buffer_size)))
-		return result;
+	{
+		std::lock_guard<ILockable> lock(*this);
 
-	if(FAILED(result = m_audio_client->GetService(IID_IAudioRenderClient, reinterpret_cast<void**>(&render_client))))
-		return result;
+		const IID IID_IAudioRenderClient = __uuidof(IAudioRenderClient);
 
-	if(FAILED(result = m_audio_client->GetCurrentPadding(&padding)))
-		return result;
+		if(FAILED(m_audio_client->GetBufferSize(&buffer_size)))
+			goto init_error;
 
-	length = buffer_size - padding;
+		if(FAILED(m_audio_client->GetService(IID_IAudioRenderClient, reinterpret_cast<void**>(&render_client))))
+			goto init_error;
 
-	if(FAILED(result = render_client->GetBuffer(length, &buffer)))
-		return result;
+		if(FAILED(m_audio_client->GetCurrentPadding(&padding)))
+			goto init_error;
 
-	mix((data_t*)buffer, length);
+		length = buffer_size - padding;
 
-	if(FAILED(result = render_client->ReleaseBuffer(length, 0)))
-		return result;
+		if(FAILED(render_client->GetBuffer(length, &buffer)))
+			goto init_error;
+
+		mix((data_t*)buffer, length);
+
+		if(FAILED(render_client->ReleaseBuffer(length, 0)))
+		{
+			init_error:
+				SafeRelease(&render_client);
+				doStop();
+				return;
+		}
+	}
 
 	m_audio_client->Start();
 
-	return result;
-}
-
-void WASAPIDevice::runMixingThread()
-{
-	UINT32 buffer_size;
-
-	IAudioRenderClient* render_client = nullptr;
-
-	std::chrono::milliseconds sleep_duration;
-
-	bool run_init = true;
+	auto sleepDuration = std::chrono::milliseconds(buffer_size * 1000 / int(m_specs.rate) / 2);
 
 	for(;;)
 	{
-		HRESULT result = S_OK;
-
 		{
-			UINT32 padding;
-			UINT32 length;
-			data_t* buffer;
 			std::lock_guard<ILockable> lock(*this);
 
-			if(run_init)
-			{
-				result = setupRenderClient(render_client, buffer_size);
-
-				if(FAILED(result))
-					goto stop_thread;
-
-				sleep_duration = std::chrono::milliseconds(buffer_size * 1000 / int(m_specs.rate) / 2);
-			}
-
-			if(FAILED(result = m_audio_client->GetCurrentPadding(&padding)))
+			if(FAILED(m_audio_client->GetCurrentPadding(&padding)))
 				goto stop_thread;
 
 			length = buffer_size - padding;
 
-			if(FAILED(result = render_client->GetBuffer(length, &buffer)))
+			if(FAILED(render_client->GetBuffer(length, &buffer)))
 				goto stop_thread;
 
 			mix((data_t*)buffer, length);
 
-			if(FAILED(result = render_client->ReleaseBuffer(length, 0)))
+			if(FAILED(render_client->ReleaseBuffer(length, 0)))
 				goto stop_thread;
 
 			// stop thread
@@ -114,51 +98,53 @@ void WASAPIDevice::runMixingThread()
 				stop_thread:
 					m_audio_client->Stop();
 					SafeRelease(&render_client);
-
-					if(result == AUDCLNT_E_DEVICE_INVALIDATED)
-					{
-						DeviceSpecs specs = m_specs;
-						if(!setupDevice(specs))
-							result = S_FALSE;
-						else
-						{
-							setSpecs(specs);
-
-							run_init = true;
-						}
-					}
-
-					if(result != AUDCLNT_E_DEVICE_INVALIDATED)
-					{
-						doStop();
-						return;
-					}
+					doStop();
+					return;
 			}
 		}
 
-		std::this_thread::sleep_for(sleep_duration);
+		std::this_thread::sleep_for(sleepDuration);
 	}
 }
 
-bool WASAPIDevice::setupDevice(DeviceSpecs &specs)
+WASAPIDevice::WASAPIDevice(DeviceSpecs specs, int buffersize) :
+	m_imm_device_enumerator(nullptr),
+	m_imm_device(nullptr),
+	m_audio_client(nullptr),
+
+	m_wave_format_extensible({})
 {
-	SafeRelease(&m_audio_client);
-	SafeRelease(&m_imm_device);
+	// initialize COM if it hasn't happened yet
+	CoInitializeEx(nullptr, COINIT_MULTITHREADED);
 
+	const CLSID CLSID_MMDeviceEnumerator = __uuidof(MMDeviceEnumerator);
+	const IID IID_IMMDeviceEnumerator = __uuidof(IMMDeviceEnumerator);
 	const IID IID_IAudioClient = __uuidof(IAudioClient);
 
-	if(FAILED(m_imm_device_enumerator->GetDefaultAudioEndpoint(eRender, eMultimedia, &m_imm_device)))
-		return false;
-
-	if(FAILED(m_imm_device->Activate(IID_IAudioClient, CLSCTX_ALL, nullptr, reinterpret_cast<void**>(&m_audio_client))))
-		return false;
-
 	WAVEFORMATEXTENSIBLE wave_format_extensible_closest_match;
 	WAVEFORMATEXTENSIBLE* closest_match_pointer = &wave_format_extensible_closest_match;
 
+	HRESULT result;
+
 	REFERENCE_TIME minimum_time = 0;
 	REFERENCE_TIME buffer_duration;
 
+	if(FAILED(CoCreateInstance(CLSID_MMDeviceEnumerator, nullptr, CLSCTX_ALL, IID_IMMDeviceEnumerator, reinterpret_cast<void**>(&m_imm_device_enumerator))))
+		goto error;
+
+	if(FAILED(m_imm_device_enumerator->GetDefaultAudioEndpoint(eRender, eMultimedia, &m_imm_device)))
+		goto error;
+
+	if(FAILED(m_imm_device->Activate(IID_IAudioClient, CLSCTX_ALL, nullptr, reinterpret_cast<void**>(&m_audio_client))))
+		goto error;
+
+	if(specs.channels == CHANNELS_INVALID)
+		specs.channels = CHANNELS_STEREO;
+	if(specs.format == FORMAT_INVALID)
+		specs.format = FORMAT_FLOAT32;
+	if(specs.rate == RATE_INVALID)
+		specs.rate = RATE_48000;
+
 	switch(specs.format)
 	{
 	case FORMAT_U8:
@@ -217,14 +203,12 @@ bool WASAPIDevice::setupDevice(DeviceSpecs &specs)
 	m_wave_format_extensible.Format.cbSize = 22;
 	m_wave_format_extensible.Samples.wValidBitsPerSample = m_wave_format_extensible.Format.wBitsPerSample;
 
-	HRESULT result = m_audio_client->IsFormatSupported(AUDCLNT_SHAREMODE_SHARED, reinterpret_cast<const WAVEFORMATEX*>(&m_wave_format_extensible), reinterpret_cast<WAVEFORMATEX**>(&closest_match_pointer));
+	result = m_audio_client->IsFormatSupported(AUDCLNT_SHAREMODE_SHARED, reinterpret_cast<const WAVEFORMATEX*>(&m_wave_format_extensible), reinterpret_cast<WAVEFORMATEX**>(&closest_match_pointer));
 
 	if(result == S_FALSE)
 	{
-		bool errored = false;
-
 		if(closest_match_pointer->Format.wFormatTag != WAVE_FORMAT_EXTENSIBLE)
-			goto closest_match_error;
+			goto error;
 
 		specs.channels = Channels(closest_match_pointer->Format.nChannels);
 		specs.rate = closest_match_pointer->Format.nSamplesPerSec;
@@ -236,7 +220,7 @@ bool WASAPIDevice::setupDevice(DeviceSpecs &specs)
 			else if(closest_match_pointer->Format.wBitsPerSample == 64)
 				specs.format = FORMAT_FLOAT64;
 			else
-				goto closest_match_error;
+				goto error;
 		}
 		else if(closest_match_pointer->SubFormat == KSDATAFORMAT_SUBTYPE_PCM)
 		{
@@ -255,81 +239,44 @@ bool WASAPIDevice::setupDevice(DeviceSpecs &specs)
 				specs.format = FORMAT_S32;
 				break;
 			default:
-				goto closest_match_error;
+				goto error;
 				break;
 			}
 		}
 		else
-			goto closest_match_error;
+			goto error;
 
 		m_wave_format_extensible = *closest_match_pointer;
 
-		if(false)
-		{
-			closest_match_error:
-			errored = true;
-		}
-
 		if(closest_match_pointer != &wave_format_extensible_closest_match)
 		{
 			CoTaskMemFree(closest_match_pointer);
 			closest_match_pointer = &wave_format_extensible_closest_match;
 		}
-
-		if(errored)
-			return false;
 	}
 	else if(FAILED(result))
-		return false;
+		goto error;
 
 	if(FAILED(m_audio_client->GetDevicePeriod(nullptr, &minimum_time)))
-		return false;
+		goto error;
 
-	buffer_duration = REFERENCE_TIME(m_buffersize) * REFERENCE_TIME(10000000) / REFERENCE_TIME(specs.rate);
+	buffer_duration = REFERENCE_TIME(buffersize) * REFERENCE_TIME(10000000) / REFERENCE_TIME(specs.rate);
 
 	if(minimum_time > buffer_duration)
 		buffer_duration = minimum_time;
 
-	if(FAILED(m_audio_client->Initialize(AUDCLNT_SHAREMODE_SHARED, 0, buffer_duration, 0, reinterpret_cast<WAVEFORMATEX*>(&m_wave_format_extensible), nullptr)))
-		return false;
-
-	return true;
-}
-
-WASAPIDevice::WASAPIDevice(DeviceSpecs specs, int buffersize) :
-	m_buffersize(buffersize),
-	m_imm_device_enumerator(nullptr),
-	m_imm_device(nullptr),
-	m_audio_client(nullptr),
-
-	m_wave_format_extensible({})
-{
-	// initialize COM if it hasn't happened yet
-	CoInitializeEx(nullptr, COINIT_MULTITHREADED);
-
-	const CLSID CLSID_MMDeviceEnumerator = __uuidof(MMDeviceEnumerator);
-	const IID IID_IMMDeviceEnumerator = __uuidof(IMMDeviceEnumerator);
-
-	if(specs.channels == CHANNELS_INVALID)
-		specs.channels = CHANNELS_STEREO;
-	if(specs.format == FORMAT_INVALID)
-		specs.format = FORMAT_FLOAT32;
-	if(specs.rate == RATE_INVALID)
-		specs.rate = RATE_48000;
-
-	if(FAILED(CoCreateInstance(CLSID_MMDeviceEnumerator, nullptr, CLSCTX_ALL, IID_IMMDeviceEnumerator, reinterpret_cast<void**>(&m_imm_device_enumerator))))
-		goto error;
-
-	if(!setupDevice(specs))
-		goto error;
-
 	m_specs = specs;
 
+	if(FAILED(m_audio_client->Initialize(AUDCLNT_SHAREMODE_SHARED, 0, buffer_duration, 0, reinterpret_cast<WAVEFORMATEX*>(&m_wave_format_extensible), nullptr)))
+		goto error;
+
 	create();
 
 	return;
 
 	error:
+	if(closest_match_pointer != &wave_format_extensible_closest_match)
+		CoTaskMemFree(closest_match_pointer);
 	SafeRelease(&m_imm_device);
 	SafeRelease(&m_imm_device_enumerator);
 	SafeRelease(&m_audio_client);

extern/audaspace/plugins/wasapi/WASAPIDevice.h

@@ -43,21 +43,16 @@ AUD_NAMESPACE_BEGIN
 class AUD_PLUGIN_API WASAPIDevice : public ThreadedDevice
 {
 private:
-	int m_buffersize;
 	IMMDeviceEnumerator* m_imm_device_enumerator;
 	IMMDevice* m_imm_device;
 	IAudioClient* m_audio_client;
 	WAVEFORMATEXTENSIBLE m_wave_format_extensible;
 
-	AUD_LOCAL HRESULT setupRenderClient(IAudioRenderClient*& render_client, UINT32& buffer_size);
-
 	/**
 	 * Streaming thread main function.
 	 */
 	AUD_LOCAL void runMixingThread();
 
-	AUD_LOCAL bool setupDevice(DeviceSpecs& specs);
-
 	// delete copy constructor and operator=
 	WASAPIDevice(const WASAPIDevice&) = delete;
 	WASAPIDevice& operator=(const WASAPIDevice&) = delete;

extern/audaspace/src/devices/SoftwareDevice.cpp

@@ -756,7 +756,6 @@ void SoftwareDevice::mix(data_t* buffer, int length)
 			// get the buffer from the source
 			pos = 0;
 			len = length;
-			eos = false;
 
 			// update 3D Info
 			sound->update();
@@ -843,27 +842,6 @@ void SoftwareDevice::setSpecs(Specs specs)
 	{
 		sound->setSpecs(specs);
 	}
-
-	for(auto& sound : m_pausedSounds)
-	{
-		sound->setSpecs(specs);
-	}
-}
-
-void SoftwareDevice::setSpecs(DeviceSpecs specs)
-{
-	m_specs = specs;
-	m_mixer->setSpecs(specs);
-
-	for(auto& sound : m_playingSounds)
-	{
-		sound->setSpecs(specs.specs);
-	}
-
-	for(auto& sound : m_pausedSounds)
-	{
-		sound->setSpecs(specs.specs);
-	}
 }
 
 SoftwareDevice::SoftwareDevice()

extern/audaspace/src/fx/VolumeReader.cpp

@@ -57,4 +57,4 @@ void VolumeReader::read(int& length, bool& eos, sample_t* buffer)
 		buffer[i] = buffer[i] * m_volumeStorage->getVolume();
 }
 
-AUD_NAMESPACE_END
+AUD_NAMESPACE_END

extern/audaspace/src/respec/Mixer.cpp

@@ -21,25 +21,9 @@
 
 AUD_NAMESPACE_BEGIN
 
-Mixer::Mixer(DeviceSpecs specs)
+Mixer::Mixer(DeviceSpecs specs) :
+	m_specs(specs)
 {
-	setSpecs(specs);
-}
-
-DeviceSpecs Mixer::getSpecs() const
-{
-	return m_specs;
-}
-
-void Mixer::setSpecs(Specs specs)
-{
-	m_specs.specs = specs;
-}
-
-void Mixer::setSpecs(DeviceSpecs specs)
-{
-	m_specs = specs;
-
 	switch(m_specs.format)
 	{
 	case FORMAT_U8:
@@ -70,6 +54,16 @@ void Mixer::setSpecs(DeviceSpecs specs)
 	}
 }
 
+DeviceSpecs Mixer::getSpecs() const
+{
+	return m_specs;
+}
+
+void Mixer::setSpecs(Specs specs)
+{
+	m_specs.specs = specs;
+}
+
 void Mixer::clear(int length)
 {
 	m_buffer.assureSize(length * AUD_SAMPLE_SIZE(m_specs));

extern/curve_fit_nd/intern/curve_fit_corners_detect.c

@@ -81,7 +81,7 @@ static double cos_vnvnvn(
 	normalize_vn_vnvn(dvec1, v1, v2, dims);
 	double d = dot_vnvn(dvec0, dvec1, dims);
 	/* sanity check */
-	d = maxV(-1.0, minV(1.0, d));
+	d = max(-1.0, min(1.0, d));
 	return d;
 }
 

extern/curve_fit_nd/intern/curve_fit_cubic.c

@@ -29,9 +29,9 @@
  *  \ingroup curve_fit
  */
 
-//#ifdef _MSC_VER
+#ifdef _MSC_VER
 #  define _USE_MATH_DEFINES
-//#endif
+#endif
 
 #include <math.h>
 #include <float.h>
@@ -456,7 +456,7 @@ static double points_calc_circumference_factor(
 	const double len_tangent = dot < 0.0 ? len_vnvn(tan_l, tan_r, dims) : len_negated_vnvn(tan_l, tan_r, dims);
 	if (len_tangent > DBL_EPSILON) {
 		/* only clamp to avoid precision error */
-		double angle = acos(maxV(-fabs(dot), -1.0));
+		double angle = acos(max(-fabs(dot), -1.0));
 		/* Angle may be less than the length when the tangents define >180 degrees of the circle,
 		 * (tangents that point away from each other).
 		 * We could try support this but will likely cause extreme >1 scales which could cause other issues. */
@@ -607,7 +607,7 @@ static void cubic_from_points_offset_fallback(
 		for (uint k = 0; k < 2; k++) {
 			sub_vn_vnvn(tmp, p0, pt, dims);
 			project_vn_vnvn_normalized(tmp, tmp, a[k], dims);
-			dists[k] = maxV(dists[k], dot_vnvn(tmp, a[k], dims));
+			dists[k] = max(dists[k], dot_vnvn(tmp, a[k], dims));
 		}
 	}
 
@@ -796,7 +796,7 @@ static void cubic_from_points(
 					dist_sq_test += sq((pt[j] - center[j]) * clamp_scale);
 				}
 #endif
-				dist_sq_max = maxV(dist_sq_max, dist_sq_test);
+				dist_sq_max = max(dist_sq_max, dist_sq_test);
 			}
 		}
 

extern/curve_fit_nd/intern/curve_fit_inline.h

@@ -45,12 +45,12 @@ MINLINE double sq(const double d)
 }
 
 #ifndef _MSC_VER
-MINLINE double minV(const double a, const double b)
+MINLINE double min(const double a, const double b)
 {
 	return b < a ? b : a;
 }
 
-MINLINE double maxV(const double a, const double b)
+MINLINE double max(const double a, const double b)
 {
 	return a < b ? b : a;
 }

extern/draco/draco/src/draco/animation/keyframe_animation.cc

@@ -13,7 +13,6 @@
 // limitations under the License.
 //
 #include "draco/animation/keyframe_animation.h"
-#include <iostream>
 
 namespace draco {
 

extern/glog/README.blender

@@ -7,4 +7,3 @@ Local modifications:
   checks for functions and so are needed.
 * Added special definitions of HAVE_SNPRINTF and HAVE_LIB_GFLAGS
   in Windows' specific config.h.
-* Silenced syscall deprecation warnings on macOS >= 10.12.

extern/glog/src/raw_logging.cc

@@ -59,7 +59,7 @@
 # include <unistd.h>
 #endif
 
-#if (defined(HAVE_SYSCALL_H) || defined(HAVE_SYS_SYSCALL_H)) && (!(defined OS_MACOSX))
+#if defined(HAVE_SYSCALL_H) || defined(HAVE_SYS_SYSCALL_H)
 # define safe_write(fd, s, len)  syscall(SYS_write, fd, s, len)
 #else
   // Not so safe, but what can you do?

extern/glog/src/utilities.cc

@@ -259,13 +259,7 @@ pid_t GetTID() {
 #endif
   static bool lacks_gettid = false;
   if (!lacks_gettid) {
-#ifdef OS_MACOSX
-    uint64_t tid64;
-    const int error = pthread_threadid_np(NULL, &tid64);
-    pid_t tid = error ? -1 : (pid_t)tid64;
-#else
     pid_t tid = syscall(__NR_gettid);
-#endif
     if (tid != -1) {
       return tid;
     }

extern/mantaflow/CMakeLists.txt

@@ -55,30 +55,26 @@ if(NOT WITH_MANTA_DEPENDENCIES)
   add_definitions(-DNO_CNPY=1)
 endif()
 
+set(MANTA_HLP
+  helper
+)
+set(MANTA_PP
+  preprocessed
+)
 if(WITH_MANTA_DEPENDENCIES)
   set(MANTA_DEP
     dependencies
   )
 endif()
 
-if(WITH_OPENMP)
-  add_definitions(-DOPENMP=1)
-
-  if(WITH_OPENMP_STATIC)
-    list(APPEND LIB
-      ${OpenMP_LIBRARIES}
-    )
-  endif()
-endif()
-
-if(WITH_OPENMP)
-  add_definitions(-DOPENMP_OFFLOAD=1)
+if(WITH_TBB)
+  add_definitions(-DTBB=1)
 endif()
 
 if(WITH_OPENVDB)
   add_definitions(-DOPENVDB=1)
   # OpenVDB headers use deprecated TBB headers, silence warning.
-  #add_definitions(-DTBB_SUPPRESS_DEPRECATED_MESSAGES=1)
+  add_definitions(-DTBB_SUPPRESS_DEPRECATED_MESSAGES=1)
 endif()
 
 if(WITH_OPENVDB_BLOSC)
@@ -94,12 +90,12 @@ if(WITH_MANTA_NUMPY AND WITH_PYTHON_NUMPY)
 endif()
 
 set(INC
-  preprocessed
-  preprocessed/fileio
-  preprocessed/python
-  preprocessed/plugin
-  helper/pwrapper
-  helper/util
+  ${MANTA_PP}
+  ${MANTA_PP}/fileio
+  ${MANTA_PP}/python
+  ${MANTA_PP}/plugin
+  ${MANTA_HLP}/pwrapper
+  ${MANTA_HLP}/util
 )
 
 if(WITH_MANTA_DEPENDENCIES)
@@ -119,6 +115,15 @@ if(WITH_MANTA_NUMPY AND WITH_PYTHON_NUMPY)
   )
 endif()
 
+if(WITH_TBB)
+  list(APPEND INC_SYS
+    ${TBB_INCLUDE_DIRS}
+  )
+  list(APPEND LIB
+    ${TBB_LIBRARIES}
+  )
+endif()
+
 if(WITH_OPENVDB)
   list(APPEND INC_SYS
     ${OPENVDB_INCLUDE_DIRS}
@@ -137,120 +142,120 @@ if(WITH_OPENVDB)
 endif()
 
 set(SRC
-  preprocessed/commonkernels.h
-  preprocessed/commonkernels.h.reg.cpp
-  preprocessed/conjugategrad.cpp
-  preprocessed/conjugategrad.h
-  preprocessed/conjugategrad.h.reg.cpp
-  preprocessed/edgecollapse.cpp
-  preprocessed/edgecollapse.h
-  preprocessed/edgecollapse.h.reg.cpp
-  preprocessed/fastmarch.cpp
-  preprocessed/fastmarch.h
-  preprocessed/fastmarch.h.reg.cpp
-  preprocessed/fileio/iogrids.cpp
-  preprocessed/fileio/iomeshes.cpp
-  preprocessed/fileio/ioparticles.cpp
-  preprocessed/fileio/ioutil.cpp
-  preprocessed/fileio/iovdb.cpp
-  preprocessed/fileio/mantaio.cpp
-  preprocessed/fileio/mantaio.h
-  preprocessed/fileio/mantaio.h.reg.cpp
-  preprocessed/fluidsolver.cpp
-  preprocessed/fluidsolver.h
-  preprocessed/fluidsolver.h.reg.cpp
-  preprocessed/general.cpp
-  preprocessed/general.h
-  preprocessed/general.h.reg.cpp
-  preprocessed/gitinfo.h
-  preprocessed/grid.cpp
-  preprocessed/grid.h
-  preprocessed/grid.h.reg.cpp
-  preprocessed/grid4d.cpp
-  preprocessed/grid4d.h
-  preprocessed/grid4d.h.reg.cpp
-  preprocessed/kernel.cpp
-  preprocessed/kernel.h
-  preprocessed/kernel.h.reg.cpp
-  preprocessed/levelset.cpp
-  preprocessed/levelset.h
-  preprocessed/levelset.h.reg.cpp
-  preprocessed/mesh.cpp
-  preprocessed/mesh.h
-  preprocessed/mesh.h.reg.cpp
-  preprocessed/movingobs.cpp
-  preprocessed/movingobs.h
-  preprocessed/movingobs.h.reg.cpp
-  preprocessed/multigrid.cpp
-  preprocessed/multigrid.h
-  preprocessed/multigrid.h.reg.cpp
-  preprocessed/noisefield.cpp
-  preprocessed/noisefield.h
-  preprocessed/noisefield.h.reg.cpp
-  preprocessed/particle.cpp
-  preprocessed/particle.h
-  preprocessed/particle.h.reg.cpp
-  preprocessed/plugin/advection.cpp
-  preprocessed/plugin/apic.cpp
-  preprocessed/plugin/extforces.cpp
-  preprocessed/plugin/fire.cpp
-  preprocessed/plugin/flip.cpp
-  preprocessed/plugin/fluidguiding.cpp
-  preprocessed/plugin/initplugins.cpp
-  preprocessed/plugin/kepsilon.cpp
-  preprocessed/plugin/meshplugins.cpp
-  preprocessed/plugin/pressure.cpp
-  preprocessed/plugin/ptsplugins.cpp
-  preprocessed/plugin/secondaryparticles.cpp
-  preprocessed/plugin/surfaceturbulence.cpp
-#  preprocessed/plugin/viscosity.cpp
-  preprocessed/plugin/vortexplugins.cpp
-  preprocessed/plugin/waveletturbulence.cpp
-  preprocessed/plugin/waves.cpp
-  preprocessed/python/defines.py
-  preprocessed/python/defines.py.reg.cpp
-  preprocessed/registration.cpp
-  preprocessed/shapes.cpp
-  preprocessed/shapes.h
-  preprocessed/shapes.h.reg.cpp
-  preprocessed/test.cpp
-  preprocessed/timing.cpp
-  preprocessed/timing.h
-  preprocessed/timing.h.reg.cpp
-  preprocessed/turbulencepart.cpp
-  preprocessed/turbulencepart.h
-  preprocessed/turbulencepart.h.reg.cpp
-  preprocessed/vortexpart.cpp
-  preprocessed/vortexpart.h
-  preprocessed/vortexpart.h.reg.cpp
-  preprocessed/vortexsheet.cpp
-  preprocessed/vortexsheet.h
-  preprocessed/vortexsheet.h.reg.cpp
+  ${MANTA_PP}/commonkernels.h
+  ${MANTA_PP}/commonkernels.h.reg.cpp
+  ${MANTA_PP}/conjugategrad.cpp
+  ${MANTA_PP}/conjugategrad.h
+  ${MANTA_PP}/conjugategrad.h.reg.cpp
+  ${MANTA_PP}/edgecollapse.cpp
+  ${MANTA_PP}/edgecollapse.h
+  ${MANTA_PP}/edgecollapse.h.reg.cpp
+  ${MANTA_PP}/fastmarch.cpp
+  ${MANTA_PP}/fastmarch.h
+  ${MANTA_PP}/fastmarch.h.reg.cpp
+  ${MANTA_PP}/fileio/iogrids.cpp
+  ${MANTA_PP}/fileio/iomeshes.cpp
+  ${MANTA_PP}/fileio/ioparticles.cpp
+  ${MANTA_PP}/fileio/ioutil.cpp
+  ${MANTA_PP}/fileio/iovdb.cpp
+  ${MANTA_PP}/fileio/mantaio.cpp
+  ${MANTA_PP}/fileio/mantaio.h
+  ${MANTA_PP}/fileio/mantaio.h.reg.cpp
+  ${MANTA_PP}/fluidsolver.cpp
+  ${MANTA_PP}/fluidsolver.h
+  ${MANTA_PP}/fluidsolver.h.reg.cpp
+  ${MANTA_PP}/general.cpp
+  ${MANTA_PP}/general.h
+  ${MANTA_PP}/general.h.reg.cpp
+  ${MANTA_PP}/gitinfo.h
+  ${MANTA_PP}/grid.cpp
+  ${MANTA_PP}/grid.h
+  ${MANTA_PP}/grid.h.reg.cpp
+  ${MANTA_PP}/grid4d.cpp
+  ${MANTA_PP}/grid4d.h
+  ${MANTA_PP}/grid4d.h.reg.cpp
+  ${MANTA_PP}/kernel.cpp
+  ${MANTA_PP}/kernel.h
+  ${MANTA_PP}/kernel.h.reg.cpp
+  ${MANTA_PP}/levelset.cpp
+  ${MANTA_PP}/levelset.h
+  ${MANTA_PP}/levelset.h.reg.cpp
+  ${MANTA_PP}/mesh.cpp
+  ${MANTA_PP}/mesh.h
+  ${MANTA_PP}/mesh.h.reg.cpp
+  ${MANTA_PP}/movingobs.cpp
+  ${MANTA_PP}/movingobs.h
+  ${MANTA_PP}/movingobs.h.reg.cpp
+  ${MANTA_PP}/multigrid.cpp
+  ${MANTA_PP}/multigrid.h
+  ${MANTA_PP}/multigrid.h.reg.cpp
+  ${MANTA_PP}/noisefield.cpp
+  ${MANTA_PP}/noisefield.h
+  ${MANTA_PP}/noisefield.h.reg.cpp
+  ${MANTA_PP}/particle.cpp
+  ${MANTA_PP}/particle.h
+  ${MANTA_PP}/particle.h.reg.cpp
+  ${MANTA_PP}/plugin/advection.cpp
+  ${MANTA_PP}/plugin/apic.cpp
+  ${MANTA_PP}/plugin/extforces.cpp
+  ${MANTA_PP}/plugin/fire.cpp
+  ${MANTA_PP}/plugin/flip.cpp
+  ${MANTA_PP}/plugin/fluidguiding.cpp
+  ${MANTA_PP}/plugin/initplugins.cpp
+  ${MANTA_PP}/plugin/kepsilon.cpp
+  ${MANTA_PP}/plugin/meshplugins.cpp
+  ${MANTA_PP}/plugin/pressure.cpp
+  ${MANTA_PP}/plugin/ptsplugins.cpp
+  ${MANTA_PP}/plugin/secondaryparticles.cpp
+  ${MANTA_PP}/plugin/surfaceturbulence.cpp
+  ${MANTA_PP}/plugin/viscosity.cpp
+  ${MANTA_PP}/plugin/vortexplugins.cpp
+  ${MANTA_PP}/plugin/waveletturbulence.cpp
+  ${MANTA_PP}/plugin/waves.cpp
+  ${MANTA_PP}/python/defines.py
+  ${MANTA_PP}/python/defines.py.reg.cpp
+  ${MANTA_PP}/registration.cpp
+  ${MANTA_PP}/shapes.cpp
+  ${MANTA_PP}/shapes.h
+  ${MANTA_PP}/shapes.h.reg.cpp
+  ${MANTA_PP}/test.cpp
+  ${MANTA_PP}/timing.cpp
+  ${MANTA_PP}/timing.h
+  ${MANTA_PP}/timing.h.reg.cpp
+  ${MANTA_PP}/turbulencepart.cpp
+  ${MANTA_PP}/turbulencepart.h
+  ${MANTA_PP}/turbulencepart.h.reg.cpp
+  ${MANTA_PP}/vortexpart.cpp
+  ${MANTA_PP}/vortexpart.h
+  ${MANTA_PP}/vortexpart.h.reg.cpp
+  ${MANTA_PP}/vortexsheet.cpp
+  ${MANTA_PP}/vortexsheet.h
+  ${MANTA_PP}/vortexsheet.h.reg.cpp
 
-  helper/pwrapper/manta.h
-  helper/pwrapper/pclass.cpp
-  helper/pwrapper/pclass.h
-  helper/pwrapper/pconvert.cpp
-  helper/pwrapper/pconvert.h
-  helper/pwrapper/pvec3.cpp
-  helper/pwrapper/pythonInclude.h
-  helper/pwrapper/registry.cpp
-  helper/pwrapper/registry.h
-  helper/util/integrator.h
-  helper/util/interpol.h
-  helper/util/interpolHigh.h
-  helper/util/matrixbase.h
-  helper/util/mcubes.h
-  helper/util/quaternion.h
-  helper/util/randomstream.h
-  helper/util/rcmatrix.h
-  helper/util/simpleimage.cpp
-  helper/util/simpleimage.h
-  helper/util/solvana.h
-  helper/util/vector4d.cpp
-  helper/util/vector4d.h
-  helper/util/vectorbase.cpp
-  helper/util/vectorbase.h
+  ${MANTA_HLP}/pwrapper/manta.h
+  ${MANTA_HLP}/pwrapper/pclass.cpp
+  ${MANTA_HLP}/pwrapper/pclass.h
+  ${MANTA_HLP}/pwrapper/pconvert.cpp
+  ${MANTA_HLP}/pwrapper/pconvert.h
+  ${MANTA_HLP}/pwrapper/pvec3.cpp
+  ${MANTA_HLP}/pwrapper/pythonInclude.h
+  ${MANTA_HLP}/pwrapper/registry.cpp
+  ${MANTA_HLP}/pwrapper/registry.h
+  ${MANTA_HLP}/util/integrator.h
+  ${MANTA_HLP}/util/interpol.h
+  ${MANTA_HLP}/util/interpolHigh.h
+  ${MANTA_HLP}/util/matrixbase.h
+  ${MANTA_HLP}/util/mcubes.h
+  ${MANTA_HLP}/util/quaternion.h
+  ${MANTA_HLP}/util/randomstream.h
+  ${MANTA_HLP}/util/rcmatrix.h
+  ${MANTA_HLP}/util/simpleimage.cpp
+  ${MANTA_HLP}/util/simpleimage.h
+  ${MANTA_HLP}/util/solvana.h
+  ${MANTA_HLP}/util/vector4d.cpp
+  ${MANTA_HLP}/util/vector4d.h
+  ${MANTA_HLP}/util/vectorbase.cpp
+  ${MANTA_HLP}/util/vectorbase.h
 )
 
 if(WITH_MANTA_DEPENDENCIES)
@@ -261,34 +266,16 @@ if(WITH_MANTA_DEPENDENCIES)
 endif()
 if(WITH_MANTA_NUMPY AND WITH_PYTHON_NUMPY)
   list(APPEND SRC
-    preprocessed/plugin/numpyconvert.cpp
-    preprocessed/plugin/tfplugins.cpp
-    helper/pwrapper/numpyWrap.cpp
-    helper/pwrapper/numpyWrap.h
+    ${MANTA_PP}/plugin/numpyconvert.cpp
+    ${MANTA_PP}/plugin/tfplugins.cpp
+    ${MANTA_HLP}/pwrapper/numpyWrap.cpp
+    ${MANTA_HLP}/pwrapper/numpyWrap.h
   )
 endif()
 
 set(LIB
   ${PYTHON_LINKFLAGS}
   ${PYTHON_LIBRARIES}
-  ${OPENVDB_LIBRARIES}  
 )
 
-#blender_add_lib(extern_mantaflow "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
-
-add_library(extern_mantaflow SHARED "${SRC}")
-
-include_directories(preprocessed)
-include_directories(preprocessed/fileio)
-include_directories(preprocessed/python)
-include_directories(preprocessed/plugin)
-include_directories(helper/pwrapper)
-include_directories(helper/util)
-include_directories(${PYTHON_INCLUDE_DIRS})
-include_directories(${ZLIB_INCLUDE_DIRS})
-include_directories(${OPENVDB_INCLUDE_DIRS})
-
-#target_include_directories(extern_mantaflow PRIVATE "${INC}")
-target_link_libraries(extern_mantaflow PRIVATE "${LIB}")
-
-blender_source_group(extern_mantaflow "${SRC}")
+blender_add_lib(extern_mantaflow "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

extern/mantaflow/UPDATE.sh

@@ -7,11 +7,8 @@
 # ====================  1) ENVIRONMENT SETUP =============================================
 
 # YOUR INSTALLATION PATHS GO HERE:
-MANTA_INSTALLATION=/home/sebbas/Developer/Mantaflow
-BLENDER_INSTALLATION=/home/sebbas/Developer/Blender
-
-CC=/home/sebbas/Developer/LLVM-Project/install/bin/clang
-CXX=/home/sebbas/Developer/LLVM-Project/install/bin/clang++
+MANTA_INSTALLATION=/Users/sebbas/Developer/Mantaflow/mantaflowDevelop
+BLENDER_INSTALLATION=/Users/sebbas/Developer/Blender/fluid-mantaflow
 
 # Try to check out Mantaflow repository before building?
 CLEAN_REPOSITORY=0
@@ -23,13 +20,8 @@ WITH_DEPENDENCIES=0
 USE_NUMPY=0
 
 # Choose which multithreading platform to use for Mantaflow preprocessing
-USE_OMP=1
-USE_TBB=0
-
-# Use OpenMP offloading too?
-if [[ "$USE_OMP" -eq "1" ]]; then
-  USE_OMP_OFFLOAD=1
-fi
+USE_OMP=0
+USE_TBB=1
 
 if [[ "$USE_OMP" -eq "1" && "$USE_TBB" -eq "1" ]]; then
   echo "Cannot build Mantaflow for OpenMP and TBB at the same time"
@@ -64,7 +56,7 @@ fi
 MANTA_BUILD_PATH=$MANTA_INSTALLATION/build_blender/
 mkdir -p $MANTA_BUILD_PATH
 cd $MANTA_BUILD_PATH
-cmake ../mantaflowgit -DGUI=0 -DOPENMP=$USE_OMP -DTBB=$USE_TBB -DOPENMP_OFFLOAD=$USE_OMP_OFFLOAD -DBLENDER=1 -DPREPDEBUG=1 -DNUMPY=$USE_NUMPY -DPYTHON_VERSION=3 -DCMAKE_C_COMPILER=$CC -DCMAKE_CXX_COMPILER=$CXX && make -j8
+cmake ../mantaflowgit -DGUI=0 -DOPENMP=$USE_OMP -DTBB=$USE_TBB -DBLENDER=1 -DPREPDEBUG=1 -DNUMPY=$USE_NUMPY && make -j8
 
 # ==================== 3) COPY MANTAFLOW FILES TO BLENDER ROOT ===========================
 

extern/mantaflow/helper/pwrapper/pconvert.cpp

@@ -28,13 +28,11 @@ extern PyTypeObject PbVec3Type;
 extern PyTypeObject PbVec4Type;
 
 struct PbVec3 {
-  PyObject_HEAD
-  float data[3];
+  PyObject_HEAD float data[3];
 };
 
 struct PbVec4 {
-  PyObject_HEAD
-  float data[4];
+  PyObject_HEAD float data[4];
 };
 
 PyObject *getPyNone()

extern/mantaflow/helper/pwrapper/pvec3.cpp

@@ -25,8 +25,7 @@ namespace Manta {
 extern PyTypeObject PbVec3Type;
 
 struct PbVec3 {
-  PyObject_HEAD
-  float data[3];
+  PyObject_HEAD float data[3];
 };
 
 static void PbVec3Dealloc(PbVec3 *self)
@@ -294,8 +293,7 @@ inline PyObject *castPy(PyTypeObject *p)
 extern PyTypeObject PbVec4Type;
 
 struct PbVec4 {
-  PyObject_HEAD
-  float data[4];
+  PyObject_HEAD float data[4];
 };
 
 static PyMethodDef PbVec4Methods[] = {

extern/mantaflow/helper/pwrapper/registry.cpp

@@ -76,8 +76,7 @@ struct ClassData {
 };
 
 struct PbObject {
-  PyObject_HEAD
-  Manta::PbClass *instance;
+  PyObject_HEAD Manta::PbClass *instance;
   ClassData *classdef;
 };
 

extern/mantaflow/helper/util/rcmatrix.h

@@ -1035,7 +1035,7 @@ template<class N, class T> struct RCFixedMatrix {
 typedef RCMatrix<int, Real> Matrix;
 typedef RCFixedMatrix<int, Real> FixedMatrix;
 
-}  // namespace Manta
+}
 
 #undef parallel_for
 #undef parallel_end

extern/mantaflow/preprocessed/conjugategrad.cpp

@@ -18,8 +18,6 @@
 
 #include "conjugategrad.h"
 #include "commonkernels.h"
-#include <chrono>
-using namespace std::chrono;
 
 using namespace std;
 namespace Manta {
@@ -215,9 +213,9 @@ struct GridDotProduct : public KernelBase {
     runMessage();
     run();
   }
-  inline void op(int i, int j, int k, const Grid<Real> &a, const Grid<Real> &b, double &result)
+  inline void op(IndexInt idx, const Grid<Real> &a, const Grid<Real> &b, double &result)
   {
-    result += (a(i, j, k) * b(i, j, k));
+    result += (a[idx] * b[idx]);
   }
   inline operator double()
   {
@@ -237,39 +235,28 @@ struct GridDotProduct : public KernelBase {
     return b;
   }
   typedef Grid<Real> type1;
-  void runMessage(){};
+  void runMessage()
+  {
+    debMsg("Executing kernel GridDotProduct ", 3);
+    debMsg("Kernel range"
+               << " x " << maxX << " y " << maxY << " z " << minZ << " - " << maxZ << " ",
+           4);
+  };
+  void operator()(const tbb::blocked_range<IndexInt> &__r)
+  {
+    for (IndexInt idx = __r.begin(); idx != (IndexInt)__r.end(); idx++)
+      op(idx, a, b, result);
+  }
   void run()
   {
-    const int _maxX = maxX;
-    const int _maxY = maxY;
-    if (maxZ > 1) {
-      const Grid<Real> &a = getArg0();
-      const Grid<Real> &b = getArg1();
-#pragma omp target teams distribute parallel for reduction(+:result) collapse(2) schedule(static,1)
-      {
-        for (int k = minZ; k < maxZ; k++)
-          for (int j = 0; j < _maxY; j++)
-            for (int i = 0; i < _maxX; i++)
-              op(i, j, k, a, b, result);
-      }
-      {
-        this->result = result;
-      }
-    }
-    else {
-      const int k = 0;
-      const Grid<Real> &a = getArg0();
-      const Grid<Real> &b = getArg1();
-#pragma omp target teams distribute parallel for reduction(+:result) collapse(1) schedule(static,1)
-      {
-        for (int j = 0; j < _maxY; j++)
-          for (int i = 0; i < _maxX; i++)
-            op(i, j, k, a, b, result);
-      }
-      {
-        this->result = result;
-      }
-    }
+    tbb::parallel_reduce(tbb::blocked_range<IndexInt>(0, size), *this);
+  }
+  GridDotProduct(GridDotProduct &o, tbb::split) : KernelBase(o), a(o.a), b(o.b), result(0.0)
+  {
+  }
+  void join(const GridDotProduct &o)
+  {
+    result += o.result;
   }
   const Grid<Real> &a;
   const Grid<Real> &b;
@@ -328,21 +315,29 @@ struct InitSigma : public KernelBase {
     return temp;
   }
   typedef Grid<Real> type3;
-  void runMessage(){};
+  void runMessage()
+  {
+    debMsg("Executing kernel InitSigma ", 3);
+    debMsg("Kernel range"
+               << " x " << maxX << " y " << maxY << " z " << minZ << " - " << maxZ << " ",
+           4);
+  };
+  void operator()(const tbb::blocked_range<IndexInt> &__r)
+  {
+    for (IndexInt idx = __r.begin(); idx != (IndexInt)__r.end(); idx++)
+      op(idx, flags, dst, rhs, temp, sigma);
+  }
   void run()
   {
-    const IndexInt _sz = size;
-#pragma omp parallel
-    {
-      double sigma = 0;
-#pragma omp for nowait
-      for (IndexInt i = 0; i < _sz; i++)
-        op(i, flags, dst, rhs, temp, sigma);
-#pragma omp critical
-      {
-        this->sigma += sigma;
-      }
-    }
+    tbb::parallel_reduce(tbb::blocked_range<IndexInt>(0, size), *this);
+  }
+  InitSigma(InitSigma &o, tbb::split)
+      : KernelBase(o), flags(o.flags), dst(o.dst), rhs(o.rhs), temp(o.temp), sigma(0)
+  {
+  }
+  void join(const InitSigma &o)
+  {
+    sigma += o.sigma;
   }
   const FlagGrid &flags;
   Grid<Real> &dst;
@@ -361,9 +356,8 @@ struct UpdateSearchVec : public KernelBase {
     runMessage();
     run();
   }
-  inline void op(int i, int j, int k, Grid<Real> &dst, Grid<Real> &src, Real factor)
+  inline void op(IndexInt idx, Grid<Real> &dst, Grid<Real> &src, Real factor) const
   {
-    const IndexInt idx = dst.index(i, j, k);
     dst[idx] = src[idx] + factor * dst[idx];
   }
   inline Grid<Real> &getArg0()
@@ -381,35 +375,21 @@ struct UpdateSearchVec : public KernelBase {
     return factor;
   }
   typedef Real type2;
-  void runMessage(){};
+  void runMessage()
+  {
+    debMsg("Executing kernel UpdateSearchVec ", 3);
+    debMsg("Kernel range"
+               << " x " << maxX << " y " << maxY << " z " << minZ << " - " << maxZ << " ",
+           4);
+  };
+  void operator()(const tbb::blocked_range<IndexInt> &__r) const
+  {
+    for (IndexInt idx = __r.begin(); idx != (IndexInt)__r.end(); idx++)
+      op(idx, dst, src, factor);
+  }
   void run()
   {
-    const int _maxX = maxX;
-    const int _maxY = maxY;
-    if (maxZ > 1) {
-      Grid<Real> &dst = getArg0();
-      Grid<Real> &src = getArg1();
-      Real &factor = getArg2();
-#pragma omp target teams distribute parallel for collapse(3) schedule(static, 1)
-      {
-        for (int k = minZ; k < maxZ; k++)
-          for (int j = 0; j < _maxY; j++)
-            for (int i = 0; i < _maxX; i++)
-              op(i, j, k, dst, src, factor);
-      }
-    }
-    else {
-      const int k = 0;
-      Grid<Real> &dst = getArg0();
-      Grid<Real> &src = getArg1();
-      Real &factor = getArg2();
-#pragma omp target teams distribute parallel for collapse(2) schedule(static, 1)
-      {
-        for (int j = 0; j < _maxY; j++)
-          for (int i = 0; i < _maxX; i++)
-            op(i, j, k, dst, src, factor);
-      }
-    }
+    tbb::parallel_for(tbb::blocked_range<IndexInt>(0, size), *this);
   }
   Grid<Real> &dst;
   Grid<Real> &src;
@@ -426,10 +406,8 @@ GridCg<APPLYMAT>::GridCg(Grid<Real> &dst,
                          Grid<Real> &search,
                          const FlagGrid &flags,
                          Grid<Real> &tmp,
-                         Grid<Real> *pA0,
-                         Grid<Real> *pAi,
-                         Grid<Real> *pAj,
-                         Grid<Real> *pAk)
+                         std::vector<Grid<Real> *> matrixAVec,
+                         std::vector<Grid<Real> *> rhsVec)
     : GridCgInterface(),
       mInited(false),
       mIterations(0),
@@ -439,10 +417,8 @@ GridCg<APPLYMAT>::GridCg(Grid<Real> &dst,
       mSearch(search),
       mFlags(flags),
       mTmp(tmp),
-      mpA0(pA0),
-      mpAi(pAi),
-      mpAj(pAj),
-      mpAk(pAk),
+      mMatrixA(matrixAVec),
+      mVecRhs(rhsVec),
       mPcMethod(PC_None),
       mpPCA0(nullptr),
       mpPCAi(nullptr),
@@ -460,37 +436,54 @@ template<class APPLYMAT> void GridCg<APPLYMAT>::doInit()
   mInited = true;
   mIterations = 0;
 
-  mDst.clear(1);
-  mResidual.copyFrom(mRhs, true, 1);  // p=0, residual = b
+  mDst.clear();
+  mResidual.copyFrom(mRhs);  // p=0, residual = b
 
   if (mPcMethod == PC_ICP) {
-    // assertMsg(mDst.is3D(), "ICP only supports 3D grids so far");
-    InitPreconditionIncompCholesky(
-        mFlags, *mpPCA0, *mpPCAi, *mpPCAj, *mpPCAk, *mpA0, *mpAi, *mpAj, *mpAk);
-    ApplyPreconditionIncompCholesky(
-        mTmp, mResidual, mFlags, *mpPCA0, *mpPCAi, *mpPCAj, *mpPCAk, *mpA0, *mpAi, *mpAj, *mpAk);
+    assertMsg(mDst.is3D(), "ICP only supports 3D grids so far");
+    InitPreconditionIncompCholesky(mFlags,
+                                   *mpPCA0,
+                                   *mpPCAi,
+                                   *mpPCAj,
+                                   *mpPCAk,
+                                   *mMatrixA[0],
+                                   *mMatrixA[1],
+                                   *mMatrixA[2],
+                                   *mMatrixA[3]);
+    ApplyPreconditionIncompCholesky(mTmp,
+                                    mResidual,
+                                    mFlags,
+                                    *mpPCA0,
+                                    *mpPCAi,
+                                    *mpPCAj,
+                                    *mpPCAk,
+                                    *mMatrixA[0],
+                                    *mMatrixA[1],
+                                    *mMatrixA[2],
+                                    *mMatrixA[3]);
   }
   else if (mPcMethod == PC_mICP) {
-    // assertMsg(mDst.is3D(), "mICP only supports 3D grids so far");
-    InitPreconditionModifiedIncompCholesky2(mFlags, *mpPCA0, *mpA0, *mpAi, *mpAj, *mpAk);
+    assertMsg(mDst.is3D(), "mICP only supports 3D grids so far");
+    InitPreconditionModifiedIncompCholesky2(
+        mFlags, *mpPCA0, *mMatrixA[0], *mMatrixA[1], *mMatrixA[2], *mMatrixA[3]);
     ApplyPreconditionModifiedIncompCholesky2(
-        mTmp, mResidual, mFlags, *mpPCA0, *mpA0, *mpAi, *mpAj, *mpAk);
+        mTmp, mResidual, mFlags, *mpPCA0, *mMatrixA[0], *mMatrixA[1], *mMatrixA[2], *mMatrixA[3]);
   }
   else if (mPcMethod == PC_MGP) {
-    InitPreconditionMultigrid(mMG, *mpA0, *mpAi, *mpAj, *mpAk, mAccuracy);
+    InitPreconditionMultigrid(
+        mMG, *mMatrixA[0], *mMatrixA[1], *mMatrixA[2], *mMatrixA[3], mAccuracy);
     ApplyPreconditionMultigrid(mMG, mTmp, mResidual);
   }
   else {
-    mTmp.copyFrom(mResidual, true, 1);
+    mTmp.copyFrom(mResidual);
   }
 
-  mSearch.copyFrom(mTmp, true, 1);
+  mSearch.copyFrom(mTmp);
   mSigma = GridDotProduct(mTmp, mResidual);
 }
 
-template<class APPLYMAT> bool GridCg<APPLYMAT>::iterate(Real &time)
+template<class APPLYMAT> bool GridCg<APPLYMAT>::iterate()
 {
-  auto start = high_resolution_clock::now();
   if (!mInited)
     doInit();
 
@@ -500,14 +493,7 @@ template<class APPLYMAT> bool GridCg<APPLYMAT>::iterate(Real &time)
   // this could reinterpret the mpA pointers (not so clean right now)
   // tmp = applyMat(search)
 
-  APPLYMAT(mFlags, mTmp, mSearch, *mpA0, *mpAi, *mpAj, *mpAk);
-
-  auto stop = high_resolution_clock::now();
-  auto duration = duration_cast<microseconds>(stop - start);
-  time += duration.count();
-  // std::cout << "APPLYMAT Time taken: " << duration.count() << std::endl;
-
-  start = high_resolution_clock::now();
+  APPLYMAT(mFlags, mTmp, mSearch, mMatrixA, mVecRhs);
 
   // alpha = sigma/dot(tmp, search)
   Real dp = GridDotProduct(mTmp, mSearch);
@@ -515,49 +501,35 @@ template<class APPLYMAT> bool GridCg<APPLYMAT>::iterate(Real &time)
   if (fabs(dp) > 0.)
     alpha = mSigma / (Real)dp;
 
-  stop = high_resolution_clock::now();
-  duration = duration_cast<microseconds>(stop - start);
-  time += duration.count();
-  // std::cout << "GridDotProduct Time taken: " << duration.count() << std::endl;
-
-  start = high_resolution_clock::now();
-
   gridScaledAdd<Real, Real>(mDst, mSearch, alpha);     // dst += search * alpha
   gridScaledAdd<Real, Real>(mResidual, mTmp, -alpha);  // residual += tmp * -alpha
 
-  stop = high_resolution_clock::now();
-  duration = duration_cast<microseconds>(stop - start);
-  time += duration.count();
-  // std::cout << "gridScaledAdd Time taken: " << duration.count() << std::endl;
-
-  start = high_resolution_clock::now();
-
   if (mPcMethod == PC_ICP)
-    ApplyPreconditionIncompCholesky(
-        mTmp, mResidual, mFlags, *mpPCA0, *mpPCAi, *mpPCAj, *mpPCAk, *mpA0, *mpAi, *mpAj, *mpAk);
+    ApplyPreconditionIncompCholesky(mTmp,
+                                    mResidual,
+                                    mFlags,
+                                    *mpPCA0,
+                                    *mpPCAi,
+                                    *mpPCAj,
+                                    *mpPCAk,
+                                    *mMatrixA[0],
+                                    *mMatrixA[1],
+                                    *mMatrixA[2],
+                                    *mMatrixA[3]);
   else if (mPcMethod == PC_mICP)
     ApplyPreconditionModifiedIncompCholesky2(
-        mTmp, mResidual, mFlags, *mpPCA0, *mpA0, *mpAi, *mpAj, *mpAk);
+        mTmp, mResidual, mFlags, *mpPCA0, *mMatrixA[0], *mMatrixA[1], *mMatrixA[2], *mMatrixA[3]);
   else if (mPcMethod == PC_MGP)
     ApplyPreconditionMultigrid(mMG, mTmp, mResidual);
   else
-    mTmp.copyFrom(mResidual, true, 1);
-
-  stop = high_resolution_clock::now();
-  duration = duration_cast<microseconds>(stop - start);
-  time += duration.count();
-  // std::cout << "copyFrom Time taken: " << duration.count() << std::endl;
-
-  start = high_resolution_clock::now();
+    mTmp.copyFrom(mResidual);
 
   // use the l2 norm of the residual for convergence check? (usually max norm is recommended
   // instead)
   if (this->mUseL2Norm) {
-    // std::cout << "USING L2" << std::endl;
     mResNorm = GridSumSqr(mResidual).sum;
   }
   else {
-    // std::cout << "NOT USING L2" << std::endl;
     mResNorm = mResidual.getMaxAbs();
   }
 
@@ -567,43 +539,27 @@ template<class APPLYMAT> bool GridCg<APPLYMAT>::iterate(Real &time)
     return false;
   }
 
-  stop = high_resolution_clock::now();
-  duration = duration_cast<microseconds>(stop - start);
-  time += duration.count();
-  // std::cout << "GridSumSqr Time taken: " << duration.count() << std::endl;
-
-  start = high_resolution_clock::now();
-
   Real sigmaNew = GridDotProduct(mTmp, mResidual);
   Real beta = sigmaNew / mSigma;
 
-  stop = high_resolution_clock::now();
-  duration = duration_cast<microseconds>(stop - start);
-  time += duration.count();
-  // std::cout << "GridDotProduct Time taken: " << duration.count() << std::endl;
-
-  start = high_resolution_clock::now();
-
   // search =  tmp + beta * search
   UpdateSearchVec(mSearch, mTmp, beta);
 
-  stop = high_resolution_clock::now();
-  duration = duration_cast<microseconds>(stop - start);
-  time += duration.count();
-  // std::cout << "UpdateSearchVec Time taken: " << duration.count() << std::endl;
-
-  // debMsg("GridCg::iterate i="<<mIterations<<" sigmaNew="<<sigmaNew<<" sigmaLast="<<mSigma<<"
-  // alpha="<<alpha<<" beta="<<beta<<" ", CG_DEBUGLEVEL);
+  debMsg("GridCg::iterate i=" << mIterations << " sigmaNew=" << sigmaNew << " sigmaLast=" << mSigma
+                              << " alpha=" << alpha << " beta=" << beta << " ",
+         CG_DEBUGLEVEL);
   mSigma = sigmaNew;
 
   if (!(mResNorm < 1e35)) {
     if (mPcMethod == PC_MGP) {
       // diverging solves can be caused by the static multigrid mode, we cannot detect this here,
       // though only the pressure solve call "knows" whether the MG is static or dynamics...
-      // debMsg("GridCg::iterate: Warning - this diverging solve can be caused by the 'static' mode
-      // of the MG preconditioner. If the static mode is active, try switching to dynamic.", 1);
+      debMsg(
+          "GridCg::iterate: Warning - this diverging solve can be caused by the 'static' mode of "
+          "the MG preconditioner. If the static mode is active, try switching to dynamic.",
+          1);
     }
-    // errMsg("GridCg::iterate: The CG solver diverged, residual norm > 1e30, stopping.");
+    errMsg("GridCg::iterate: The CG solver diverged, residual norm > 1e30, stopping.");
   }
 
   // debMsg("PB-CG-Norms::p"<<sqrt( GridOpNormNosqrt(mpDst, mpFlags).getValue() ) <<"
@@ -615,9 +571,8 @@ template<class APPLYMAT> bool GridCg<APPLYMAT>::iterate(Real &time)
 
 template<class APPLYMAT> void GridCg<APPLYMAT>::solve(int maxIter)
 {
-  Real time = 0;
   for (int iter = 0; iter < maxIter; iter++) {
-    if (!iterate(time))
+    if (!iterate())
       iter = maxIter;
   }
   return;
@@ -628,13 +583,13 @@ template<class APPLYMAT>
 void GridCg<APPLYMAT>::setICPreconditioner(
     PreconditionType method, Grid<Real> *A0, Grid<Real> *Ai, Grid<Real> *Aj, Grid<Real> *Ak)
 {
-  // assertMsg(method==PC_ICP || method==PC_mICP, "GridCg<APPLYMAT>::setICPreconditioner: Invalid
-  // method specified.");
+  assertMsg(method == PC_ICP || method == PC_mICP,
+            "GridCg<APPLYMAT>::setICPreconditioner: Invalid method specified.");
 
   mPcMethod = method;
   if ((!A0->is3D())) {
     if (gPrint2dWarning) {
-      // debMsg("ICP/mICP pre-conditioning only supported in 3D for now, disabling it.", 1);
+      debMsg("ICP/mICP pre-conditioning only supported in 3D for now, disabling it.", 1);
       gPrint2dWarning = false;
     }
     mPcMethod = PC_None;
@@ -648,7 +603,7 @@ void GridCg<APPLYMAT>::setICPreconditioner(
 template<class APPLYMAT>
 void GridCg<APPLYMAT>::setMGPreconditioner(PreconditionType method, GridMg *MG)
 {
-  // assertMsg(method==PC_MGP, "GridCg<APPLYMAT>::setMGPreconditioner: Invalid method specified.");
+  assertMsg(method == PC_MGP, "GridCg<APPLYMAT>::setMGPreconditioner: Invalid method specified.");
 
   mPcMethod = method;
   mMG = MG;
@@ -657,6 +612,9 @@ void GridCg<APPLYMAT>::setMGPreconditioner(PreconditionType method, GridMg *MG)
 // explicit instantiation
 template class GridCg<ApplyMatrix>;
 template class GridCg<ApplyMatrix2D>;
+template class GridCg<ApplyMatrixViscosityU>;
+template class GridCg<ApplyMatrixViscosityV>;
+template class GridCg<ApplyMatrixViscosityW>;
 
 //*****************************************************************************
 // diffusion for real and vec grids, e.g. for viscosity
@@ -697,33 +655,44 @@ void cgSolveDiffusion(const FlagGrid &flags,
     }
   }
 
-  GridCgInterface *gcg = nullptr;
+  GridCgInterface *gcg;
   // note , no preconditioning for now...
   const int maxIter = (int)(cgMaxIterFac * flags.getSize().max()) * (flags.is3D() ? 1 : 4);
 
   if (grid.getType() & GridBase::TypeReal) {
     Grid<Real> &u = ((Grid<Real> &)grid);
     rhs.copyFrom(u);
-    if (flags.is3D())
-      gcg = new GridCg<ApplyMatrix>(u, rhs, residual, search, flags, tmp, &A0, &Ai, &Aj, &Ak);
-    else
-      gcg = new GridCg<ApplyMatrix2D>(u, rhs, residual, search, flags, tmp, &A0, &Ai, &Aj, &Ak);
+    vector<Grid<Real> *> matA{&A0, &Ai, &Aj};
+
+    if (flags.is3D()) {
+      matA.push_back(&Ak);
+      gcg = new GridCg<ApplyMatrix>(u, rhs, residual, search, flags, tmp, matA);
+    }
+    else {
+      gcg = new GridCg<ApplyMatrix2D>(u, rhs, residual, search, flags, tmp, matA);
+    }
 
     gcg->setAccuracy(cgAccuracy);
     gcg->solve(maxIter);
 
-    // debMsg("FluidSolver::solveDiffusion iterations:"<<gcg->getIterations()<<",
-    // res:"<<gcg->getSigma(), CG_DEBUGLEVEL);
+    debMsg("FluidSolver::solveDiffusion iterations:" << gcg->getIterations()
+                                                     << ", res:" << gcg->getSigma(),
+           CG_DEBUGLEVEL);
   }
   else if ((grid.getType() & GridBase::TypeVec3) || (grid.getType() & GridBase::TypeMAC)) {
     Grid<Vec3> &vec = ((Grid<Vec3> &)grid);
     Grid<Real> u(parent);
+    vector<Grid<Real> *> matA{&A0, &Ai, &Aj};
 
     // core solve is same as for a regular real grid
-    if (flags.is3D())
-      gcg = new GridCg<ApplyMatrix>(u, rhs, residual, search, flags, tmp, &A0, &Ai, &Aj, &Ak);
-    else
-      gcg = new GridCg<ApplyMatrix2D>(u, rhs, residual, search, flags, tmp, &A0, &Ai, &Aj, &Ak);
+    if (flags.is3D()) {
+      matA.push_back(&Ak);
+      gcg = new GridCg<ApplyMatrix>(u, rhs, residual, search, flags, tmp, matA);
+    }
+    else {
+      gcg = new GridCg<ApplyMatrix2D>(u, rhs, residual, search, flags, tmp, matA);
+    }
+
     gcg->setAccuracy(cgAccuracy);
 
     // diffuse every component separately
@@ -733,14 +702,15 @@ void cgSolveDiffusion(const FlagGrid &flags,
 
       rhs.copyFrom(u);
       gcg->solve(maxIter);
-      // debMsg("FluidSolver::solveDiffusion vec3, iterations:"<<gcg->getIterations()<<",
-      // res:"<<gcg->getSigma(), CG_DEBUGLEVEL);
+      debMsg("FluidSolver::solveDiffusion vec3, iterations:" << gcg->getIterations()
+                                                             << ", res:" << gcg->getSigma(),
+             CG_DEBUGLEVEL);
 
       setComponent(u, vec, component);
     }
   }
   else {
-    // errMsg("cgSolveDiffusion: Grid Type is not supported (only Real, Vec3, MAC, or Levelset)");
+    errMsg("cgSolveDiffusion: Grid Type is not supported (only Real, Vec3, MAC, or Levelset)");
   }
 
   delete gcg;

extern/mantaflow/preprocessed/conjugategrad.h

@@ -37,7 +37,7 @@ class GridCgInterface {
   virtual ~GridCgInterface(){};
 
   // solving functions
-  virtual bool iterate(Real &time) = 0;
+  virtual bool iterate() = 0;
   virtual void solve(int maxIter) = 0;
 
   // precond
@@ -78,16 +78,12 @@ template<class APPLYMAT> class GridCg : public GridCgInterface {
          Grid<Real> &search,
          const FlagGrid &flags,
          Grid<Real> &tmp,
-         Grid<Real> *A0,
-         Grid<Real> *pAi,
-         Grid<Real> *pAj,
-         Grid<Real> *pAk);
-  ~GridCg()
-  {
-  }
+         std::vector<Grid<Real> *> matrixAVec,
+         std::vector<Grid<Real> *> rhsVec = {});
+  ~GridCg(){};
 
   void doInit();
-  bool iterate(Real &time);
+  bool iterate();
   void solve(int maxIter);
   //! init pointers, and copy values from "normal" matrix
   void setICPreconditioner(
@@ -133,7 +129,10 @@ template<class APPLYMAT> class GridCg : public GridCgInterface {
   const FlagGrid &mFlags;
   Grid<Real> &mTmp;
 
-  Grid<Real> *mpA0, *mpAi, *mpAj, *mpAk;
+  //! shape of A matrix defined here (e.g. diagonal,  positive neighbor cells, etc)
+  std::vector<Grid<Real> *> mMatrixA;
+  //! shape of rhs vector defined here (e.g. 1 rhs for regular fluids solve, 3 rhs for viscosity)
+  std::vector<Grid<Real> *> mVecRhs;
 
   PreconditionType mPcMethod;
   //! preconditioning grids
@@ -154,32 +153,33 @@ struct ApplyMatrix : public KernelBase {
   ApplyMatrix(const FlagGrid &flags,
               Grid<Real> &dst,
               const Grid<Real> &src,
-              Grid<Real> &A0,
-              Grid<Real> &Ai,
-              Grid<Real> &Aj,
-              Grid<Real> &Ak)
-      : KernelBase(&flags, 0), flags(flags), dst(dst), src(src), A0(A0), Ai(Ai), Aj(Aj), Ak(Ak)
+              const std::vector<Grid<Real> *> matrixA,
+              const std::vector<Grid<Real> *> vecRhs)
+      : KernelBase(&flags, 0), flags(flags), dst(dst), src(src), matrixA(matrixA), vecRhs(vecRhs)
   {
     runMessage();
     run();
   }
-  inline void op(int i,
-                 int j,
-                 int k,
+  inline void op(IndexInt idx,
                  const FlagGrid &flags,
                  Grid<Real> &dst,
                  const Grid<Real> &src,
-                 Grid<Real> &A0,
-                 Grid<Real> &Ai,
-                 Grid<Real> &Aj,
-                 Grid<Real> &Ak)
+                 const std::vector<Grid<Real> *> matrixA,
+                 const std::vector<Grid<Real> *> vecRhs) const
   {
-    const IndexInt idx = dst.index(i, j, k);
+    unusedParameter(vecRhs);  // Not needed in this matrix application
+
+    if (matrixA.size() != 4)
+      errMsg("ConjugateGrad: Invalid A matrix in apply matrix step");
+    Grid<Real> &A0 = *matrixA[0];
+    Grid<Real> &Ai = *matrixA[1];
+    Grid<Real> &Aj = *matrixA[2];
+    Grid<Real> &Ak = *matrixA[3];
+
     if (!flags.isFluid(idx)) {
       dst[idx] = src[idx];
       return;
     }
-    const IndexInt X = flags.getStrideX(), Y = flags.getStrideY(), Z = flags.getStrideZ();
 
     dst[idx] = src[idx] * A0[idx] + src[idx - X] * Ai[idx - X] + src[idx + X] * Ai[idx] +
                src[idx - Y] * Aj[idx - Y] + src[idx + Y] * Aj[idx] + src[idx - Z] * Ak[idx - Z] +
@@ -200,71 +200,37 @@ struct ApplyMatrix : public KernelBase {
     return src;
   }
   typedef Grid<Real> type2;
-  inline Grid<Real> &getArg3()
+  inline const std::vector<Grid<Real> *> &getArg3()
   {
-    return A0;
+    return matrixA;
   }
-  typedef Grid<Real> type3;
-  inline Grid<Real> &getArg4()
+  typedef std::vector<Grid<Real> *> type3;
+  inline const std::vector<Grid<Real> *> &getArg4()
   {
-    return Ai;
+    return vecRhs;
   }
-  typedef Grid<Real> type4;
-  inline Grid<Real> &getArg5()
+  typedef std::vector<Grid<Real> *> type4;
+  void runMessage()
   {
-    return Aj;
-  }
-  typedef Grid<Real> type5;
-  inline Grid<Real> &getArg6()
+    debMsg("Executing kernel ApplyMatrix ", 3);
+    debMsg("Kernel range"
+               << " x " << maxX << " y " << maxY << " z " << minZ << " - " << maxZ << " ",
+           4);
+  };
+  void operator()(const tbb::blocked_range<IndexInt> &__r) const
   {
-    return Ak;
+    for (IndexInt idx = __r.begin(); idx != (IndexInt)__r.end(); idx++)
+      op(idx, flags, dst, src, matrixA, vecRhs);
   }
-  typedef Grid<Real> type6;
-  void runMessage(){};
   void run()
   {
-    const int _maxX = maxX;
-    const int _maxY = maxY;
-    if (maxZ > 1) {
-      const FlagGrid &flags = getArg0();
-      Grid<Real> &dst = getArg1();
-      const Grid<Real> &src = getArg2();
-      Grid<Real> &A0 = getArg3();
-      Grid<Real> &Ai = getArg4();
-      Grid<Real> &Aj = getArg5();
-      Grid<Real> &Ak = getArg6();
-#pragma omp target teams distribute parallel for collapse(3) schedule(static, 1)
-      {
-        for (int k = minZ; k < maxZ; k++)
-          for (int j = 0; j < _maxY; j++)
-            for (int i = 0; i < _maxX; i++)
-              op(i, j, k, flags, dst, src, A0, Ai, Aj, Ak);
-      }
-    }
-    else {
-      const int k = 0;
-      const FlagGrid &flags = getArg0();
-      Grid<Real> &dst = getArg1();
-      const Grid<Real> &src = getArg2();
-      Grid<Real> &A0 = getArg3();
-      Grid<Real> &Ai = getArg4();
-      Grid<Real> &Aj = getArg5();
-      Grid<Real> &Ak = getArg6();
-#pragma omp target teams distribute parallel for collapse(2) schedule(static, 1)
-      {
-        for (int j = 0; j < _maxY; j++)
-          for (int i = 0; i < _maxX; i++)
-            op(i, j, k, flags, dst, src, A0, Ai, Aj, Ak);
-      }
-    }
+    tbb::parallel_for(tbb::blocked_range<IndexInt>(0, size), *this);
   }
   const FlagGrid &flags;
   Grid<Real> &dst;
   const Grid<Real> &src;
-  Grid<Real> &A0;
-  Grid<Real> &Ai;
-  Grid<Real> &Aj;
-  Grid<Real> &Ak;
+  const std::vector<Grid<Real> *> matrixA;
+  const std::vector<Grid<Real> *> vecRhs;
 };
 
 //! Kernel: Apply symmetric stored Matrix. 2D version
@@ -273,34 +239,32 @@ struct ApplyMatrix2D : public KernelBase {
   ApplyMatrix2D(const FlagGrid &flags,
                 Grid<Real> &dst,
                 const Grid<Real> &src,
-                Grid<Real> &A0,
-                Grid<Real> &Ai,
-                Grid<Real> &Aj,
-                Grid<Real> &Ak)
-      : KernelBase(&flags, 0), flags(flags), dst(dst), src(src), A0(A0), Ai(Ai), Aj(Aj), Ak(Ak)
+                const std::vector<Grid<Real> *> matrixA,
+                const std::vector<Grid<Real> *> vecRhs)
+      : KernelBase(&flags, 0), flags(flags), dst(dst), src(src), matrixA(matrixA), vecRhs(vecRhs)
   {
     runMessage();
     run();
   }
-  inline void op(int i,
-                 int j,
-                 int k,
+  inline void op(IndexInt idx,
                  const FlagGrid &flags,
                  Grid<Real> &dst,
                  const Grid<Real> &src,
-                 Grid<Real> &A0,
-                 Grid<Real> &Ai,
-                 Grid<Real> &Aj,
-                 Grid<Real> &Ak)
+                 const std::vector<Grid<Real> *> matrixA,
+                 const std::vector<Grid<Real> *> vecRhs) const
   {
-    unusedParameter(Ak);  // only there for parameter compatibility with ApplyMatrix
+    unusedParameter(vecRhs);  // Not needed in this matrix application
+
+    if (matrixA.size() != 3)
+      errMsg("ConjugateGrad: Invalid A matrix in apply matrix step");
+    Grid<Real> &A0 = *matrixA[0];
+    Grid<Real> &Ai = *matrixA[1];
+    Grid<Real> &Aj = *matrixA[2];
 
-    const IndexInt idx = dst.index(i, j, k);
     if (!flags.isFluid(idx)) {
       dst[idx] = src[idx];
       return;
     }
-    const IndexInt X = flags.getStrideX(), Y = flags.getStrideY(), Z = flags.getStrideZ();
 
     dst[idx] = src[idx] * A0[idx] + src[idx - X] * Ai[idx - X] + src[idx + X] * Ai[idx] +
                src[idx - Y] * Aj[idx - Y] + src[idx + Y] * Aj[idx];
@@ -320,73 +284,387 @@ struct ApplyMatrix2D : public KernelBase {
     return src;
   }
   typedef Grid<Real> type2;
-  inline Grid<Real> &getArg3()
+  inline const std::vector<Grid<Real> *> &getArg3()
   {
-    return A0;
+    return matrixA;
   }
-  typedef Grid<Real> type3;
-  inline Grid<Real> &getArg4()
+  typedef std::vector<Grid<Real> *> type3;
+  inline const std::vector<Grid<Real> *> &getArg4()
   {
-    return Ai;
+    return vecRhs;
   }
-  typedef Grid<Real> type4;
-  inline Grid<Real> &getArg5()
+  typedef std::vector<Grid<Real> *> type4;
+  void runMessage()
   {
-    return Aj;
-  }
-  typedef Grid<Real> type5;
-  inline Grid<Real> &getArg6()
+    debMsg("Executing kernel ApplyMatrix2D ", 3);
+    debMsg("Kernel range"
+               << " x " << maxX << " y " << maxY << " z " << minZ << " - " << maxZ << " ",
+           4);
+  };
+  void operator()(const tbb::blocked_range<IndexInt> &__r) const
   {
-    return Ak;
+    for (IndexInt idx = __r.begin(); idx != (IndexInt)__r.end(); idx++)
+      op(idx, flags, dst, src, matrixA, vecRhs);
   }
-  typedef Grid<Real> type6;
-  void runMessage(){};
   void run()
   {
-    const int _maxX = maxX;
-    const int _maxY = maxY;
-    if (maxZ > 1) {
-      const FlagGrid &flags = getArg0();
-      Grid<Real> &dst = getArg1();
-      const Grid<Real> &src = getArg2();
-      Grid<Real> &A0 = getArg3();
-      Grid<Real> &Ai = getArg4();
-      Grid<Real> &Aj = getArg5();
-      Grid<Real> &Ak = getArg6();
-#pragma omp target teams distribute parallel for collapse(2) schedule(static, 1)
-      {
-        for (int k = minZ; k < maxZ; k++)
-          for (int j = 0; j < _maxY; j++)
-            for (int i = 0; i < _maxX; i++)
-              op(i, j, k, flags, dst, src, A0, Ai, Aj, Ak);
-      }
-    }
-    else {
-      const int k = 0;
-      const FlagGrid &flags = getArg0();
-      Grid<Real> &dst = getArg1();
-      const Grid<Real> &src = getArg2();
-      Grid<Real> &A0 = getArg3();
-      Grid<Real> &Ai = getArg4();
-      Grid<Real> &Aj = getArg5();
-      Grid<Real> &Ak = getArg6();
-#pragma omp target teams distribute parallel for collapse(1) schedule(static, 1)
-      {
-        for (int j = 0; j < _maxY; j++)
-          for (int i = 0; i < _maxX; i++)
-            op(i, j, k, flags, dst, src, A0, Ai, Aj, Ak);
-      }
-    }
+    tbb::parallel_for(tbb::blocked_range<IndexInt>(0, size), *this);
   }
   const FlagGrid &flags;
   Grid<Real> &dst;
   const Grid<Real> &src;
-  Grid<Real> &A0;
-  Grid<Real> &Ai;
-  Grid<Real> &Aj;
-  Grid<Real> &Ak;
+  const std::vector<Grid<Real> *> matrixA;
+  const std::vector<Grid<Real> *> vecRhs;
 };
 
+struct ApplyMatrixViscosityU : public KernelBase {
+  ApplyMatrixViscosityU(const FlagGrid &flags,
+                        Grid<Real> &dst,
+                        const Grid<Real> &src,
+                        const std::vector<Grid<Real> *> matrixA,
+                        const std::vector<Grid<Real> *> vecRhs)
+      : KernelBase(&flags, 1), flags(flags), dst(dst), src(src), matrixA(matrixA), vecRhs(vecRhs)
+  {
+    runMessage();
+    run();
+  }
+  inline void op(int i,
+                 int j,
+                 int k,
+                 const FlagGrid &flags,
+                 Grid<Real> &dst,
+                 const Grid<Real> &src,
+                 const std::vector<Grid<Real> *> matrixA,
+                 const std::vector<Grid<Real> *> vecRhs) const
+  {
+    if (matrixA.size() != 15)
+      errMsg("ConjugateGrad: Invalid A matrix in apply matrix step");
+    Grid<Real> &A0 = *matrixA[0];
+    Grid<Real> &Aplusi = *matrixA[1];
+    Grid<Real> &Aplusj = *matrixA[2];
+    Grid<Real> &Aplusk = *matrixA[3];
+    Grid<Real> &Aminusi = *matrixA[4];
+    Grid<Real> &Aminusj = *matrixA[5];
+    Grid<Real> &Aminusk = *matrixA[6];
+
+    if (vecRhs.size() != 2)
+      errMsg("ConjugateGrad: Invalid rhs vector in apply matrix step");
+    Grid<Real> &srcV = *vecRhs[0];
+    Grid<Real> &srcW = *vecRhs[1];
+
+    dst(i, j, k) = src(i, j, k) * A0(i, j, k) + src(i + 1, j, k) * Aplusi(i, j, k) +
+                   src(i, j + 1, k) * Aplusj(i, j, k) + src(i, j, k + 1) * Aplusk(i, j, k) +
+                   src(i - 1, j, k) * Aminusi(i, j, k) + src(i, j - 1, k) * Aminusj(i, j, k) +
+                   src(i, j, k - 1) * Aminusk(i, j, k);
+
+    dst(i, j, k) += srcV(i, j + 1, k) * (*matrixA[7])(i, j, k) +
+                    srcV(i - 1, j + 1, k) * (*matrixA[8])(i, j, k) +
+                    srcV(i, j, k) * (*matrixA[9])(i, j, k) +
+                    srcV(i - 1, j, k) * (*matrixA[10])(i, j, k) +
+                    srcW(i, j, k + 1) * (*matrixA[11])(i, j, k) +
+                    srcW(i - 1, j, k + 1) * (*matrixA[12])(i, j, k) +
+                    srcW(i, j, k) * (*matrixA[13])(i, j, k) +
+                    srcW(i - 1, j, k) * (*matrixA[14])(i, j, k);
+  }
+  inline const FlagGrid &getArg0()
+  {
+    return flags;
+  }
+  typedef FlagGrid type0;
+  inline Grid<Real> &getArg1()
+  {
+    return dst;
+  }
+  typedef Grid<Real> type1;
+  inline const Grid<Real> &getArg2()
+  {
+    return src;
+  }
+  typedef Grid<Real> type2;
+  inline const std::vector<Grid<Real> *> &getArg3()
+  {
+    return matrixA;
+  }
+  typedef std::vector<Grid<Real> *> type3;
+  inline const std::vector<Grid<Real> *> &getArg4()
+  {
+    return vecRhs;
+  }
+  typedef std::vector<Grid<Real> *> type4;
+  void runMessage()
+  {
+    debMsg("Executing kernel ApplyMatrixViscosityU ", 3);
+    debMsg("Kernel range"
+               << " x " << maxX << " y " << maxY << " z " << minZ << " - " << maxZ << " ",
+           4);
+  };
+  void operator()(const tbb::blocked_range<IndexInt> &__r) const
+  {
+    const int _maxX = maxX;
+    const int _maxY = maxY;
+    if (maxZ > 1) {
+      for (int k = __r.begin(); k != (int)__r.end(); k++)
+        for (int j = 1; j < _maxY; j++)
+          for (int i = 1; i < _maxX; i++)
+            op(i, j, k, flags, dst, src, matrixA, vecRhs);
+    }
+    else {
+      const int k = 0;
+      for (int j = __r.begin(); j != (int)__r.end(); j++)
+        for (int i = 1; i < _maxX; i++)
+          op(i, j, k, flags, dst, src, matrixA, vecRhs);
+    }
+  }
+  void run()
+  {
+    if (maxZ > 1)
+      tbb::parallel_for(tbb::blocked_range<IndexInt>(minZ, maxZ), *this);
+    else
+      tbb::parallel_for(tbb::blocked_range<IndexInt>(1, maxY), *this);
+  }
+  const FlagGrid &flags;
+  Grid<Real> &dst;
+  const Grid<Real> &src;
+  const std::vector<Grid<Real> *> matrixA;
+  const std::vector<Grid<Real> *> vecRhs;
+};
+
+struct ApplyMatrixViscosityV : public KernelBase {
+  ApplyMatrixViscosityV(const FlagGrid &flags,
+                        Grid<Real> &dst,
+                        const Grid<Real> &src,
+                        const std::vector<Grid<Real> *> matrixA,
+                        const std::vector<Grid<Real> *> vecRhs)
+      : KernelBase(&flags, 1), flags(flags), dst(dst), src(src), matrixA(matrixA), vecRhs(vecRhs)
+  {
+    runMessage();
+    run();
+  }
+  inline void op(int i,
+                 int j,
+                 int k,
+                 const FlagGrid &flags,
+                 Grid<Real> &dst,
+                 const Grid<Real> &src,
+                 const std::vector<Grid<Real> *> matrixA,
+                 const std::vector<Grid<Real> *> vecRhs) const
+  {
+    if (matrixA.size() != 15)
+      errMsg("ConjugateGrad: Invalid A matrix in apply matrix step");
+    Grid<Real> &A0 = *matrixA[0];
+    Grid<Real> &Aplusi = *matrixA[1];
+    Grid<Real> &Aplusj = *matrixA[2];
+    Grid<Real> &Aplusk = *matrixA[3];
+    Grid<Real> &Aminusi = *matrixA[4];
+    Grid<Real> &Aminusj = *matrixA[5];
+    Grid<Real> &Aminusk = *matrixA[6];
+
+    if (vecRhs.size() != 2)
+      errMsg("ConjugateGrad: Invalid rhs vector in apply matrix step");
+    Grid<Real> &srcU = *vecRhs[0];
+    Grid<Real> &srcW = *vecRhs[1];
+
+    dst(i, j, k) = src(i, j, k) * A0(i, j, k) + src(i + 1, j, k) * Aplusi(i, j, k) +
+                   src(i, j + 1, k) * Aplusj(i, j, k) + src(i, j, k + 1) * Aplusk(i, j, k) +
+                   src(i - 1, j, k) * Aminusi(i, j, k) + src(i, j - 1, k) * Aminusj(i, j, k) +
+                   src(i, j, k - 1) * Aminusk(i, j, k);
+
+    dst(i, j, k) += srcU(i + 1, j, k) * (*matrixA[7])(i, j, k) +
+                    srcU(i + 1, j - 1, k) * (*matrixA[8])(i, j, k) +
+                    srcU(i, j, k) * (*matrixA[9])(i, j, k) +
+                    srcU(i, j - 1, k) * (*matrixA[10])(i, j, k) +
+                    srcW(i, j, k + 1) * (*matrixA[11])(i, j, k) +
+                    srcW(i, j - 1, k + 1) * (*matrixA[12])(i, j, k) +
+                    srcW(i, j, k) * (*matrixA[13])(i, j, k) +
+                    srcW(i, j - 1, k) * (*matrixA[14])(i, j, k);
+  }
+  inline const FlagGrid &getArg0()
+  {
+    return flags;
+  }
+  typedef FlagGrid type0;
+  inline Grid<Real> &getArg1()
+  {
+    return dst;
+  }
+  typedef Grid<Real> type1;
+  inline const Grid<Real> &getArg2()
+  {
+    return src;
+  }
+  typedef Grid<Real> type2;
+  inline const std::vector<Grid<Real> *> &getArg3()
+  {
+    return matrixA;
+  }
+  typedef std::vector<Grid<Real> *> type3;
+  inline const std::vector<Grid<Real> *> &getArg4()
+  {
+    return vecRhs;
+  }
+  typedef std::vector<Grid<Real> *> type4;
+  void runMessage()
+  {
+    debMsg("Executing kernel ApplyMatrixViscosityV ", 3);
+    debMsg("Kernel range"
+               << " x " << maxX << " y " << maxY << " z " << minZ << " - " << maxZ << " ",
+           4);
+  };
+  void operator()(const tbb::blocked_range<IndexInt> &__r) const
+  {
+    const int _maxX = maxX;
+    const int _maxY = maxY;
+    if (maxZ > 1) {
+      for (int k = __r.begin(); k != (int)__r.end(); k++)
+        for (int j = 1; j < _maxY; j++)
+          for (int i = 1; i < _maxX; i++)
+            op(i, j, k, flags, dst, src, matrixA, vecRhs);
+    }
+    else {
+      const int k = 0;
+      for (int j = __r.begin(); j != (int)__r.end(); j++)
+        for (int i = 1; i < _maxX; i++)
+          op(i, j, k, flags, dst, src, matrixA, vecRhs);
+    }
+  }
+  void run()
+  {
+    if (maxZ > 1)
+      tbb::parallel_for(tbb::blocked_range<IndexInt>(minZ, maxZ), *this);
+    else
+      tbb::parallel_for(tbb::blocked_range<IndexInt>(1, maxY), *this);
+  }
+  const FlagGrid &flags;
+  Grid<Real> &dst;
+  const Grid<Real> &src;
+  const std::vector<Grid<Real> *> matrixA;
+  const std::vector<Grid<Real> *> vecRhs;
+};
+
+struct ApplyMatrixViscosityW : public KernelBase {
+  ApplyMatrixViscosityW(const FlagGrid &flags,
+                        Grid<Real> &dst,
+                        const Grid<Real> &src,
+                        const std::vector<Grid<Real> *> matrixA,
+                        const std::vector<Grid<Real> *> vecRhs)
+      : KernelBase(&flags, 1), flags(flags), dst(dst), src(src), matrixA(matrixA), vecRhs(vecRhs)
+  {
+    runMessage();
+    run();
+  }
+  inline void op(int i,
+                 int j,
+                 int k,
+                 const FlagGrid &flags,
+                 Grid<Real> &dst,
+                 const Grid<Real> &src,
+                 const std::vector<Grid<Real> *> matrixA,
+                 const std::vector<Grid<Real> *> vecRhs) const
+  {
+    if (matrixA.size() != 15)
+      errMsg("ConjugateGrad: Invalid A matrix in apply matrix step");
+    Grid<Real> &A0 = *matrixA[0];
+    Grid<Real> &Aplusi = *matrixA[1];
+    Grid<Real> &Aplusj = *matrixA[2];
+    Grid<Real> &Aplusk = *matrixA[3];
+    Grid<Real> &Aminusi = *matrixA[4];
+    Grid<Real> &Aminusj = *matrixA[5];
+    Grid<Real> &Aminusk = *matrixA[6];
+
+    if (vecRhs.size() != 2)
+      errMsg("ConjugateGrad: Invalid rhs vector in apply matrix step");
+    Grid<Real> &srcU = *vecRhs[0];
+    Grid<Real> &srcV = *vecRhs[1];
+
+    dst(i, j, k) = src(i, j, k) * A0(i, j, k) + src(i + 1, j, k) * Aplusi(i, j, k) +
+                   src(i, j + 1, k) * Aplusj(i, j, k) + src(i, j, k + 1) * Aplusk(i, j, k) +
+                   src(i - 1, j, k) * Aminusi(i, j, k) + src(i, j - 1, k) * Aminusj(i, j, k) +
+                   src(i, j, k - 1) * Aminusk(i, j, k);
+
+    dst(i, j, k) += srcU(i + 1, j, k) * (*matrixA[7])(i, j, k) +
+                    srcU(i + 1, j, k - 1) * (*matrixA[8])(i, j, k) +
+                    srcU(i, j, k) * (*matrixA[9])(i, j, k) +
+                    srcU(i, j, k - 1) * (*matrixA[10])(i, j, k) +
+                    srcV(i, j + 1, k) * (*matrixA[11])(i, j, k) +
+                    srcV(i, j + 1, k - 1) * (*matrixA[12])(i, j, k) +
+                    srcV(i, j, k) * (*matrixA[13])(i, j, k) +
+                    srcV(i, j, k - 1) * (*matrixA[14])(i, j, k);
+  }
+  inline const FlagGrid &getArg0()
+  {
+    return flags;
+  }
+  typedef FlagGrid type0;
+  inline Grid<Real> &getArg1()
+  {
+    return dst;
+  }
+  typedef Grid<Real> type1;
+  inline const Grid<Real> &getArg2()
+  {
+    return src;
+  }
+  typedef Grid<Real> type2;
+  inline const std::vector<Grid<Real> *> &getArg3()
+  {
+    return matrixA;
+  }
+  typedef std::vector<Grid<Real> *> type3;
+  inline const std::vector<Grid<Real> *> &getArg4()
+  {
+    return vecRhs;
+  }
+  typedef std::vector<Grid<Real> *> type4;
+  void runMessage()
+  {
+    debMsg("Executing kernel ApplyMatrixViscosityW ", 3);
+    debMsg("Kernel range"
+               << " x " << maxX << " y " << maxY << " z " << minZ << " - " << maxZ << " ",
+           4);
+  };
+  void operator()(const tbb::blocked_range<IndexInt> &__r) const
+  {
+    const int _maxX = maxX;
+    const int _maxY = maxY;
+    if (maxZ > 1) {
+      for (int k = __r.begin(); k != (int)__r.end(); k++)
+        for (int j = 1; j < _maxY; j++)
+          for (int i = 1; i < _maxX; i++)
+            op(i, j, k, flags, dst, src, matrixA, vecRhs);
+    }
+    else {
+      const int k = 0;
+      for (int j = __r.begin(); j != (int)__r.end(); j++)
+        for (int i = 1; i < _maxX; i++)
+          op(i, j, k, flags, dst, src, matrixA, vecRhs);
+    }
+  }
+  void run()
+  {
+    if (maxZ > 1)
+      tbb::parallel_for(tbb::blocked_range<IndexInt>(minZ, maxZ), *this);
+    else
+      tbb::parallel_for(tbb::blocked_range<IndexInt>(1, maxY), *this);
+  }
+  const FlagGrid &flags;
+  Grid<Real> &dst;
+  const Grid<Real> &src;
+  const std::vector<Grid<Real> *> matrixA;
+  const std::vector<Grid<Real> *> vecRhs;
+};
+
+/* NOTE: Use this template for new matrix application kernels
+
+//! Template for matrix application kernels
+KERNEL()
+void ApplyMatrixTemplate (const FlagGrid& flags, Grid<Real>& dst, const Grid<Real>& src,
+  const std::vector<Grid<Real> *> matrixA, const std::vector<Grid<Real> *> vecRhs)
+{
+  // The kernel must define how to use the grids from the matrixA and vecRhs lists
+}
+
+*/
+
 //! Kernel: Construct the matrix for the poisson equation
 
 struct MakeLaplaceMatrix : public KernelBase {
@@ -409,7 +687,7 @@ struct MakeLaplaceMatrix : public KernelBase {
                  Grid<Real> &Ai,
                  Grid<Real> &Aj,
                  Grid<Real> &Ak,
-                 const MACGrid *fractions = 0)
+                 const MACGrid *fractions = 0) const
   {
     if (!flags.isFluid(i, j, k))
       return;
@@ -487,41 +765,36 @@ struct MakeLaplaceMatrix : public KernelBase {
     return fractions;
   }
   typedef MACGrid type5;
-  void runMessage(){};
-  void run()
+  void runMessage()
+  {
+    debMsg("Executing kernel MakeLaplaceMatrix ", 3);
+    debMsg("Kernel range"
+               << " x " << maxX << " y " << maxY << " z " << minZ << " - " << maxZ << " ",
+           4);
+  };
+  void operator()(const tbb::blocked_range<IndexInt> &__r) const
   {
     const int _maxX = maxX;
     const int _maxY = maxY;
     if (maxZ > 1) {
-      const FlagGrid &flags = getArg0();
-      Grid<Real> &A0 = getArg1();
-      Grid<Real> &Ai = getArg2();
-      Grid<Real> &Aj = getArg3();
-      Grid<Real> &Ak = getArg4();
-      const MACGrid *fractions = getArg5();
-#pragma omp target teams distribute parallel for collapse(3) schedule(static, 1)
-      {
-        for (int k = minZ; k < maxZ; k++)
-          for (int j = 1; j < _maxY; j++)
-            for (int i = 1; i < _maxX; i++)
-              op(i, j, k, flags, A0, Ai, Aj, Ak, fractions);
-      }
-    }
-    else {
-      const int k = 0;
-      const FlagGrid &flags = getArg0();
-      Grid<Real> &A0 = getArg1();
-      Grid<Real> &Ai = getArg2();
-      Grid<Real> &Aj = getArg3();
-      Grid<Real> &Ak = getArg4();
-      const MACGrid *fractions = getArg5();
-#pragma omp target teams distribute parallel for collapse(2) schedule(static, 1)
-      {
+      for (int k = __r.begin(); k != (int)__r.end(); k++)
         for (int j = 1; j < _maxY; j++)
           for (int i = 1; i < _maxX; i++)
             op(i, j, k, flags, A0, Ai, Aj, Ak, fractions);
-      }
     }
+    else {
+      const int k = 0;
+      for (int j = __r.begin(); j != (int)__r.end(); j++)
+        for (int i = 1; i < _maxX; i++)
+          op(i, j, k, flags, A0, Ai, Aj, Ak, fractions);
+    }
+  }
+  void run()
+  {
+    if (maxZ > 1)
+      tbb::parallel_for(tbb::blocked_range<IndexInt>(minZ, maxZ), *this);
+    else
+      tbb::parallel_for(tbb::blocked_range<IndexInt>(1, maxY), *this);
   }
   const FlagGrid &flags;
   Grid<Real> &A0;

extern/mantaflow/preprocessed/fastmarch.cpp

@@ -236,7 +236,13 @@ struct SetLevelsetBoundaries : public KernelBase {
     return phi;
   }
   typedef Grid<Real> type0;
-  void runMessage(){};
+  void runMessage()
+  {
+    debMsg("Executing kernel SetLevelsetBoundaries ", 3);
+    debMsg("Kernel range"
+               << " x " << maxX << " y " << maxY << " z " << minZ << " - " << maxZ << " ",
+           4);
+  };
   void run()
   {
     const int _maxX = maxX;
@@ -291,8 +297,14 @@ struct knExtrapolateMACSimple : public KernelBase {
     runMessage();
     run();
   }
-  inline void op(
-      int i, int j, int k, MACGrid &vel, int distance, Grid<int> &tmp, const int d, const int c)
+  inline void op(int i,
+                 int j,
+                 int k,
+                 MACGrid &vel,
+                 int distance,
+                 Grid<int> &tmp,
+                 const int d,
+                 const int c) const
   {
     static const Vec3i nb[6] = {Vec3i(1, 0, 0),
                                 Vec3i(-1, 0, 0),
@@ -347,34 +359,36 @@ struct knExtrapolateMACSimple : public KernelBase {
     return c;
   }
   typedef int type4;
-  void runMessage(){};
-  void run()
+  void runMessage()
+  {
+    debMsg("Executing kernel knExtrapolateMACSimple ", 3);
+    debMsg("Kernel range"
+               << " x " << maxX << " y " << maxY << " z " << minZ << " - " << maxZ << " ",
+           4);
+  };
+  void operator()(const tbb::blocked_range<IndexInt> &__r) const
   {
     const int _maxX = maxX;
     const int _maxY = maxY;
     if (maxZ > 1) {
-
-#pragma omp parallel
-      {
-
-#pragma omp for
-        for (int k = minZ; k < maxZ; k++)
-          for (int j = 1; j < _maxY; j++)
-            for (int i = 1; i < _maxX; i++)
-              op(i, j, k, vel, distance, tmp, d, c);
-      }
-    }
-    else {
-      const int k = 0;
-#pragma omp parallel
-      {
-
-#pragma omp for
+      for (int k = __r.begin(); k != (int)__r.end(); k++)
         for (int j = 1; j < _maxY; j++)
           for (int i = 1; i < _maxX; i++)
             op(i, j, k, vel, distance, tmp, d, c);
-      }
     }
+    else {
+      const int k = 0;
+      for (int j = __r.begin(); j != (int)__r.end(); j++)
+        for (int i = 1; i < _maxX; i++)
+          op(i, j, k, vel, distance, tmp, d, c);
+    }
+  }
+  void run()
+  {
+    if (maxZ > 1)
+      tbb::parallel_for(tbb::blocked_range<IndexInt>(minZ, maxZ), *this);
+    else
+      tbb::parallel_for(tbb::blocked_range<IndexInt>(1, maxY), *this);
   }
   MACGrid &vel;
   int distance;
@@ -391,7 +405,7 @@ struct knExtrapolateIntoBnd : public KernelBase {
     runMessage();
     run();
   }
-  inline void op(int i, int j, int k, FlagGrid &flags, MACGrid &vel, const MACGrid &velTmp)
+  inline void op(int i, int j, int k, FlagGrid &flags, MACGrid &vel, const MACGrid &velTmp) const
   {
     int c = 0;
     Vec3 v(0, 0, 0);
@@ -453,34 +467,36 @@ struct knExtrapolateIntoBnd : public KernelBase {
     return velTmp;
   }
   typedef MACGrid type2;
-  void runMessage(){};
-  void run()
+  void runMessage()
+  {
+    debMsg("Executing kernel knExtrapolateIntoBnd ", 3);
+    debMsg("Kernel range"
+               << " x " << maxX << " y " << maxY << " z " << minZ << " - " << maxZ << " ",
+           4);
+  };
+  void operator()(const tbb::blocked_range<IndexInt> &__r) const
   {
     const int _maxX = maxX;
     const int _maxY = maxY;
     if (maxZ > 1) {
-
-#pragma omp parallel
-      {
-
-#pragma omp for
-        for (int k = minZ; k < maxZ; k++)
-          for (int j = 0; j < _maxY; j++)
-            for (int i = 0; i < _maxX; i++)
-              op(i, j, k, flags, vel, velTmp);
-      }
-    }
-    else {
-      const int k = 0;
-#pragma omp parallel
-      {
-
-#pragma omp for
+      for (int k = __r.begin(); k != (int)__r.end(); k++)
         for (int j = 0; j < _maxY; j++)
           for (int i = 0; i < _maxX; i++)
             op(i, j, k, flags, vel, velTmp);
-      }
     }
+    else {
+      const int k = 0;
+      for (int j = __r.begin(); j != (int)__r.end(); j++)
+        for (int i = 0; i < _maxX; i++)
+          op(i, j, k, flags, vel, velTmp);
+    }
+  }
+  void run()
+  {
+    if (maxZ > 1)
+      tbb::parallel_for(tbb::blocked_range<IndexInt>(minZ, maxZ), *this);
+    else
+      tbb::parallel_for(tbb::blocked_range<IndexInt>(0, maxY), *this);
   }
   FlagGrid &flags;
   MACGrid &vel;
@@ -522,7 +538,8 @@ struct knUnprojectNormalComp : public KernelBase {
     runMessage();
     run();
   }
-  inline void op(int i, int j, int k, FlagGrid &flags, MACGrid &vel, Grid<Real> &phi, Real maxDist)
+  inline void op(
+      int i, int j, int k, FlagGrid &flags, MACGrid &vel, Grid<Real> &phi, Real maxDist) const
   {
     // apply inside, within range near obstacle surface
     if (phi(i, j, k) > 0. || phi(i, j, k) < -maxDist)
@@ -556,34 +573,36 @@ struct knUnprojectNormalComp : public KernelBase {
     return maxDist;
   }
   typedef Real type3;
-  void runMessage(){};
-  void run()
+  void runMessage()
+  {
+    debMsg("Executing kernel knUnprojectNormalComp ", 3);
+    debMsg("Kernel range"
+               << " x " << maxX << " y " << maxY << " z " << minZ << " - " << maxZ << " ",
+           4);
+  };
+  void operator()(const tbb::blocked_range<IndexInt> &__r) const
   {
     const int _maxX = maxX;
     const int _maxY = maxY;
     if (maxZ > 1) {
-
-#pragma omp parallel
-      {
-
-#pragma omp for
-        for (int k = minZ; k < maxZ; k++)
-          for (int j = 1; j < _maxY; j++)
-            for (int i = 1; i < _maxX; i++)
-              op(i, j, k, flags, vel, phi, maxDist);
-      }
-    }
-    else {
-      const int k = 0;
-#pragma omp parallel
-      {
-
-#pragma omp for
+      for (int k = __r.begin(); k != (int)__r.end(); k++)
         for (int j = 1; j < _maxY; j++)
           for (int i = 1; i < _maxX; i++)
             op(i, j, k, flags, vel, phi, maxDist);
-      }
     }
+    else {
+      const int k = 0;
+      for (int j = __r.begin(); j != (int)__r.end(); j++)
+        for (int i = 1; i < _maxX; i++)
+          op(i, j, k, flags, vel, phi, maxDist);
+    }
+  }
+  void run()
+  {
+    if (maxZ > 1)
+      tbb::parallel_for(tbb::blocked_range<IndexInt>(minZ, maxZ), *this);
+    else
+      tbb::parallel_for(tbb::blocked_range<IndexInt>(1, maxY), *this);
   }
   FlagGrid &flags;
   MACGrid &vel;
@@ -693,7 +712,7 @@ struct knExtrapolateMACFromWeight : public KernelBase {
                  Grid<Vec3> &weight,
                  int distance,
                  const int d,
-                 const int c)
+                 const int c) const
   {
     static const Vec3i nb[6] = {Vec3i(1, 0, 0),
                                 Vec3i(-1, 0, 0),
@@ -747,34 +766,36 @@ struct knExtrapolateMACFromWeight : public KernelBase {
     return c;
   }
   typedef int type4;
-  void runMessage(){};
-  void run()
+  void runMessage()
+  {
+    debMsg("Executing kernel knExtrapolateMACFromWeight ", 3);
+    debMsg("Kernel range"
+               << " x " << maxX << " y " << maxY << " z " << minZ << " - " << maxZ << " ",
+           4);
+  };
+  void operator()(const tbb::blocked_range<IndexInt> &__r) const
   {
     const int _maxX = maxX;
     const int _maxY = maxY;
     if (maxZ > 1) {
-
-#pragma omp parallel
-      {
-
-#pragma omp for
-        for (int k = minZ; k < maxZ; k++)
-          for (int j = 1; j < _maxY; j++)
-            for (int i = 1; i < _maxX; i++)
-              op(i, j, k, vel, weight, distance, d, c);
-      }
-    }
-    else {
-      const int k = 0;
-#pragma omp parallel
-      {
-
-#pragma omp for
+      for (int k = __r.begin(); k != (int)__r.end(); k++)
         for (int j = 1; j < _maxY; j++)
           for (int i = 1; i < _maxX; i++)
             op(i, j, k, vel, weight, distance, d, c);
-      }
     }
+    else {
+      const int k = 0;
+      for (int j = __r.begin(); j != (int)__r.end(); j++)
+        for (int i = 1; i < _maxX; i++)
+          op(i, j, k, vel, weight, distance, d, c);
+    }
+  }
+  void run()
+  {
+    if (maxZ > 1)
+      tbb::parallel_for(tbb::blocked_range<IndexInt>(minZ, maxZ), *this);
+    else
+      tbb::parallel_for(tbb::blocked_range<IndexInt>(1, maxY), *this);
   }
   MACGrid &vel;
   Grid<Vec3> &weight;
@@ -853,136 +874,6 @@ static const Vec3i nb[6] = {Vec3i(1, 0, 0),
                             Vec3i(0, 0, 1),
                             Vec3i(0, 0, -1)};
 
-struct knMarkSkipCells : public KernelBase {
-  knMarkSkipCells(Grid<Real> &phi, Grid<int> &tmp, bool inside)
-      : KernelBase(&phi, 1), phi(phi), tmp(tmp), inside(inside)
-  {
-    runMessage();
-    run();
-  }
-  inline void op(int i, int j, int k, Grid<Real> &phi, Grid<int> &tmp, bool inside) const
-  {
-    if (!inside && phi(i, j, k) < 0.) {
-      tmp(i, j, k) = 1;
-    }
-    if (inside && phi(i, j, k) > 0.) {
-      tmp(i, j, k) = 1;
-    }
-  }
-  inline Grid<Real> &getArg0()
-  {
-    return phi;
-  }
-  typedef Grid<Real> type0;
-  inline Grid<int> &getArg1()
-  {
-    return tmp;
-  }
-  typedef Grid<int> type1;
-  inline bool &getArg2()
-  {
-    return inside;
-  }
-  typedef bool type2;
-  void runMessage()
-  {
-    debMsg("Executing kernel knMarkSkipCells ", 3);
-    debMsg("Kernel range"
-               << " x " << maxX << " y " << maxY << " z " << minZ << " - " << maxZ << " ",
-           4);
-  };
-  void operator()(const tbb::blocked_range<IndexInt> &__r) const
-  {
-    const int _maxX = maxX;
-    const int _maxY = maxY;
-    if (maxZ > 1) {
-      for (int k = __r.begin(); k != (int)__r.end(); k++)
-        for (int j = 1; j < _maxY; j++)
-          for (int i = 1; i < _maxX; i++)
-            op(i, j, k, phi, tmp, inside);
-    }
-    else {
-      const int k = 0;
-      for (int j = __r.begin(); j != (int)__r.end(); j++)
-        for (int i = 1; i < _maxX; i++)
-          op(i, j, k, phi, tmp, inside);
-    }
-  }
-  void run()
-  {
-    if (maxZ > 1)
-      tbb::parallel_for(tbb::blocked_range<IndexInt>(minZ, maxZ), *this);
-    else
-      tbb::parallel_for(tbb::blocked_range<IndexInt>(1, maxY), *this);
-  }
-  Grid<Real> &phi;
-  Grid<int> &tmp;
-  bool inside;
-};
-
-struct knSetFirstLayer : public KernelBase {
-  knSetFirstLayer(Grid<int> &tmp, int dim) : KernelBase(&tmp, 1), tmp(tmp), dim(dim)
-  {
-    runMessage();
-    run();
-  }
-  inline void op(int i, int j, int k, Grid<int> &tmp, int dim) const
-  {
-    Vec3i p(i, j, k);
-    if (tmp(p))
-      return;
-    for (int n = 0; n < 2 * dim; ++n) {
-      if (tmp(p + nb[n]) == 1) {
-        tmp(i, j, k) = 2;
-        break;
-      }
-    }
-  }
-  inline Grid<int> &getArg0()
-  {
-    return tmp;
-  }
-  typedef Grid<int> type0;
-  inline int &getArg1()
-  {
-    return dim;
-  }
-  typedef int type1;
-  void runMessage()
-  {
-    debMsg("Executing kernel knSetFirstLayer ", 3);
-    debMsg("Kernel range"
-               << " x " << maxX << " y " << maxY << " z " << minZ << " - " << maxZ << " ",
-           4);
-  };
-  void operator()(const tbb::blocked_range<IndexInt> &__r) const
-  {
-    const int _maxX = maxX;
-    const int _maxY = maxY;
-    if (maxZ > 1) {
-      for (int k = __r.begin(); k != (int)__r.end(); k++)
-        for (int j = 1; j < _maxY; j++)
-          for (int i = 1; i < _maxX; i++)
-            op(i, j, k, tmp, dim);
-    }
-    else {
-      const int k = 0;
-      for (int j = __r.begin(); j != (int)__r.end(); j++)
-        for (int i = 1; i < _maxX; i++)
-          op(i, j, k, tmp, dim);
-    }
-  }
-  void run()
-  {
-    if (maxZ > 1)
-      tbb::parallel_for(tbb::blocked_range<IndexInt>(minZ, maxZ), *this);
-    else
-      tbb::parallel_for(tbb::blocked_range<IndexInt>(1, maxY), *this);
-  }
-  Grid<int> &tmp;
-  int dim;
-};
-
 template<class S> struct knExtrapolateLsSimple : public KernelBase {
   knExtrapolateLsSimple(Grid<S> &val, int distance, Grid<int> &tmp, const int d, S direction)
       : KernelBase(&val, 1), val(val), distance(distance), tmp(tmp), d(d), direction(direction)
@@ -990,8 +881,14 @@ template<class S> struct knExtrapolateLsSimple : public KernelBase {
     runMessage();
     run();
   }
-  inline void op(
-      int i, int j, int k, Grid<S> &val, int distance, Grid<int> &tmp, const int d, S direction)
+  inline void op(int i,
+                 int j,
+                 int k,
+                 Grid<S> &val,
+                 int distance,
+                 Grid<int> &tmp,
+                 const int d,
+                 S direction) const
   {
     const int dim = (val.is3D() ? 3 : 2);
     if (tmp(i, j, k) != 0)
@@ -1038,34 +935,36 @@ template<class S> struct knExtrapolateLsSimple : public KernelBase {
     return direction;
   }
   typedef S type4;
-  void runMessage(){};
-  void run()
+  void runMessage()
+  {
+    debMsg("Executing kernel knExtrapolateLsSimple ", 3);
+    debMsg("Kernel range"
+               << " x " << maxX << " y " << maxY << " z " << minZ << " - " << maxZ << " ",
+           4);
+  };
+  void operator()(const tbb::blocked_range<IndexInt> &__r) const
   {
     const int _maxX = maxX;
     const int _maxY = maxY;
     if (maxZ > 1) {
-
-#pragma omp parallel
-      {
-
-#pragma omp for
-        for (int k = minZ; k < maxZ; k++)
-          for (int j = 1; j < _maxY; j++)
-            for (int i = 1; i < _maxX; i++)
-              op(i, j, k, val, distance, tmp, d, direction);
-      }
-    }
-    else {
-      const int k = 0;
-#pragma omp parallel
-      {
-
-#pragma omp for
+      for (int k = __r.begin(); k != (int)__r.end(); k++)
         for (int j = 1; j < _maxY; j++)
           for (int i = 1; i < _maxX; i++)
             op(i, j, k, val, distance, tmp, d, direction);
-      }
     }
+    else {
+      const int k = 0;
+      for (int j = __r.begin(); j != (int)__r.end(); j++)
+        for (int i = 1; i < _maxX; i++)
+          op(i, j, k, val, distance, tmp, d, direction);
+    }
+  }
+  void run()
+  {
+    if (maxZ > 1)
+      tbb::parallel_for(tbb::blocked_range<IndexInt>(minZ, maxZ), *this);
+    else
+      tbb::parallel_for(tbb::blocked_range<IndexInt>(1, maxY), *this);
   }
   Grid<S> &val;
   int distance;
@@ -1081,7 +980,7 @@ template<class S> struct knSetRemaining : public KernelBase {
     runMessage();
     run();
   }
-  inline void op(int i, int j, int k, Grid<S> &phi, Grid<int> &tmp, S distance)
+  inline void op(int i, int j, int k, Grid<S> &phi, Grid<int> &tmp, S distance) const
   {
     if (tmp(i, j, k) != 0)
       return;
@@ -1102,34 +1001,36 @@ template<class S> struct knSetRemaining : public KernelBase {
     return distance;
   }
   typedef S type2;
-  void runMessage(){};
-  void run()
+  void runMessage()
+  {
+    debMsg("Executing kernel knSetRemaining ", 3);
+    debMsg("Kernel range"
+               << " x " << maxX << " y " << maxY << " z " << minZ << " - " << maxZ << " ",
+           4);
+  };
+  void operator()(const tbb::blocked_range<IndexInt> &__r) const
   {
     const int _maxX = maxX;
     const int _maxY = maxY;
     if (maxZ > 1) {
-
-#pragma omp parallel
-      {
-
-#pragma omp for
-        for (int k = minZ; k < maxZ; k++)
-          for (int j = 1; j < _maxY; j++)
-            for (int i = 1; i < _maxX; i++)
-              op(i, j, k, phi, tmp, distance);
-      }
-    }
-    else {
-      const int k = 0;
-#pragma omp parallel
-      {
-
-#pragma omp for
+      for (int k = __r.begin(); k != (int)__r.end(); k++)
         for (int j = 1; j < _maxY; j++)
           for (int i = 1; i < _maxX; i++)
             op(i, j, k, phi, tmp, distance);
-      }
     }
+    else {
+      const int k = 0;
+      for (int j = __r.begin(); j != (int)__r.end(); j++)
+        for (int i = 1; i < _maxX; i++)
+          op(i, j, k, phi, tmp, distance);
+    }
+  }
+  void run()
+  {
+    if (maxZ > 1)
+      tbb::parallel_for(tbb::blocked_range<IndexInt>(minZ, maxZ), *this);
+    else
+      tbb::parallel_for(tbb::blocked_range<IndexInt>(1, maxY), *this);
   }
   Grid<S> &phi;
   Grid<int> &tmp;
@@ -1142,12 +1043,39 @@ void extrapolateLsSimple(Grid<Real> &phi, int distance = 4, bool inside = false)
   tmp.clear();
   const int dim = (phi.is3D() ? 3 : 2);
 
-  // by default, march outside (ie mark all inside to be skipped)
-  Real direction = (inside) ? -1. : 1.;
-  knMarkSkipCells(phi, tmp, inside);
-
+  // by default, march outside
+  Real direction = 1.;
+  if (!inside) {
+    // mark all inside
+    FOR_IJK_BND(phi, 1)
+    {
+      if (phi(i, j, k) < 0.) {
+        tmp(i, j, k) = 1;
+      }
+    }
+  }
+  else {
+    direction = -1.;
+    FOR_IJK_BND(phi, 1)
+    {
+      if (phi(i, j, k) > 0.) {
+        tmp(i, j, k) = 1;
+      }
+    }
+  }
   // + first layer around
-  knSetFirstLayer(tmp, dim);
+  FOR_IJK_BND(phi, 1)
+  {
+    Vec3i p(i, j, k);
+    if (tmp(p))
+      continue;
+    for (int n = 0; n < 2 * dim; ++n) {
+      if (tmp(p + nb[n]) == 1) {
+        tmp(i, j, k) = 2;
+        n = 2 * dim;
+      }
+    }
+  }
 
   // extrapolate for distance
   for (int d = 2; d < 1 + distance; ++d) {
@@ -1198,12 +1126,37 @@ void extrapolateVec3Simple(Grid<Vec3> &vel, Grid<Real> &phi, int distance = 4, b
   tmp.clear();
   const int dim = (vel.is3D() ? 3 : 2);
 
-  // mark initial cells, by default, march outside (ie mark all inside to be skipped)
-  Real direction = (inside) ? -1. : 1.;
-  knMarkSkipCells(phi, tmp, inside);
-
+  // mark initial cells, by default, march outside
+  if (!inside) {
+    // mark all inside
+    FOR_IJK_BND(phi, 1)
+    {
+      if (phi(i, j, k) < 0.) {
+        tmp(i, j, k) = 1;
+      }
+    }
+  }
+  else {
+    FOR_IJK_BND(phi, 1)
+    {
+      if (phi(i, j, k) > 0.) {
+        tmp(i, j, k) = 1;
+      }
+    }
+  }
   // + first layer next to initial cells
-  knSetFirstLayer(tmp, dim);
+  FOR_IJK_BND(vel, 1)
+  {
+    Vec3i p(i, j, k);
+    if (tmp(p))
+      continue;
+    for (int n = 0; n < 2 * dim; ++n) {
+      if (tmp(p + nb[n]) == 1) {
+        tmp(i, j, k) = 2;
+        n = 2 * dim;
+      }
+    }
+  }
 
   for (int d = 2; d < 1 + distance; ++d) {
     knExtrapolateLsSimple<Vec3>(vel, distance, tmp, d, Vec3(0.));

extern/mantaflow/preprocessed/fileio/iogrids.cpp

@@ -1256,7 +1256,7 @@ struct knQuantize : public KernelBase {
     runMessage();
     run();
   }
-  inline void op(IndexInt idx, Grid<Real> &grid, Real step)
+  inline void op(IndexInt idx, Grid<Real> &grid, Real step) const
   {
     quantizeReal(grid(idx), step);
   }
@@ -1270,17 +1270,21 @@ struct knQuantize : public KernelBase {
     return step;
   }
   typedef Real type1;
-  void runMessage(){};
+  void runMessage()
+  {
+    debMsg("Executing kernel knQuantize ", 3);
+    debMsg("Kernel range"
+               << " x " << maxX << " y " << maxY << " z " << minZ << " - " << maxZ << " ",
+           4);
+  };
+  void operator()(const tbb::blocked_range<IndexInt> &__r) const
+  {
+    for (IndexInt idx = __r.begin(); idx != (IndexInt)__r.end(); idx++)
+      op(idx, grid, step);
+  }
   void run()
   {
-    const IndexInt _sz = size;
-#pragma omp parallel
-    {
-
-#pragma omp for
-      for (IndexInt i = 0; i < _sz; i++)
-        op(i, grid, step);
-    }
+    tbb::parallel_for(tbb::blocked_range<IndexInt>(0, size), *this);
   }
   Grid<Real> &grid;
   Real step;
@@ -1327,7 +1331,7 @@ struct knQuantizeVec3 : public KernelBase {
     runMessage();
     run();
   }
-  inline void op(IndexInt idx, Grid<Vec3> &grid, Real step)
+  inline void op(IndexInt idx, Grid<Vec3> &grid, Real step) const
   {
     for (int c = 0; c < 3; ++c)
       quantizeReal(grid(idx)[c], step);
@@ -1342,17 +1346,21 @@ struct knQuantizeVec3 : public KernelBase {
     return step;
   }
   typedef Real type1;
-  void runMessage(){};
+  void runMessage()
+  {
+    debMsg("Executing kernel knQuantizeVec3 ", 3);
+    debMsg("Kernel range"
+               << " x " << maxX << " y " << maxY << " z " << minZ << " - " << maxZ << " ",
+           4);
+  };
+  void operator()(const tbb::blocked_range<IndexInt> &__r) const
+  {
+    for (IndexInt idx = __r.begin(); idx != (IndexInt)__r.end(); idx++)
+      op(idx, grid, step);
+  }
   void run()
   {
-    const IndexInt _sz = size;
-#pragma omp parallel
-    {
-
-#pragma omp for
-      for (IndexInt i = 0; i < _sz; i++)
-        op(i, grid, step);
-    }
+    tbb::parallel_for(tbb::blocked_range<IndexInt>(0, size), *this);
   }
   Grid<Vec3> &grid;
   Real step;

extern/mantaflow/preprocessed/fileio/ioutil.cpp

@@ -66,7 +66,7 @@ void *safeGzopen(const char *filename, const char *mode)
 #endif  // NO_ZLIB != 1
 }
 
-#if OPENVDB == 1
+#if defined(OPENVDB)
 // Convert from OpenVDB value to Manta value.
 template<class S, class T> void convertFrom(S &in, T *out)
 {

extern/mantaflow/preprocessed/fileio/iovdb.cpp

@@ -29,10 +29,10 @@
 
 #if OPENVDB == 1
 #  include "openvdb/openvdb.h"
-#  include <openvdb/points/PointConversion.h>
-#  include <openvdb/points/PointCount.h>
-#  include <openvdb/tools/Clip.h>
-#  include <openvdb/tools/Dense.h>
+#  include "openvdb/points/PointConversion.h"
+#  include "openvdb/points/PointCount.h"
+#  include "openvdb/tools/Clip.h"
+#  include "openvdb/tools/Dense.h"
 #endif
 
 #define POSITION_NAME "P"
@@ -433,9 +433,9 @@ int writeObjectsVDB(const string &filename,
         debMsg("Writing int grid '" << mantaGrid->getName() << "' to vdb file " << filename, 1);
         Grid<int> *mantaIntGrid = (Grid<int> *)mantaGrid;
         if (clipGrid && mantaIntGrid->saveSparse()) {
-          // assertMsg(clipGrid->getSize() == mantaGrid->getSize(), "writeObjectsVDB: Clip grid and
-          // exported grid must have the same size " << clipGrid->getSize() << " vs " <<
-          // mantaGrid->getSize());
+          assertMsg(clipGrid->getSize() == mantaGrid->getSize(),
+                    "writeObjectsVDB: Clip grid and exported grid must have the same size "
+                        << clipGrid->getSize() << " vs " << mantaGrid->getSize());
         }
         vdbGrid = exportVDB<int, openvdb::Int32Grid>(mantaIntGrid, clip, vdbClipGrid);
         gridsVDB.push_back(vdbGrid);
@@ -448,9 +448,9 @@ int writeObjectsVDB(const string &filename,
         // Only supply clip grid if real grid is not equal to the clip grid
         openvdb::FloatGrid::Ptr tmpClipGrid = (mantaRealGrid == clipGrid) ? nullptr : vdbClipGrid;
         if (clipGrid && mantaRealGrid->saveSparse()) {
-          // assertMsg(clipGrid->getSize() == mantaGrid->getSize(), "writeObjectsVDB: Clip grid and
-          // exported grid must have the same size " << clipGrid->getSize() << " vs " <<
-          // mantaGrid->getSize());
+          assertMsg(clipGrid->getSize() == mantaGrid->getSize(),
+                    "writeObjectsVDB: Clip grid and exported grid must have the same size "
+                        << clipGrid->getSize() << " vs " << mantaGrid->getSize());
         }
         vdbGrid = exportVDB<Real, openvdb::FloatGrid>(mantaRealGrid, clip, tmpClipGrid);
         gridsVDB.push_back(vdbGrid);
@@ -461,9 +461,9 @@ int writeObjectsVDB(const string &filename,
                                                               openvdb::GRID_UNKNOWN;
         Grid<Vec3> *mantaVec3Grid = (Grid<Vec3> *)mantaGrid;
         if (clipGrid && mantaVec3Grid->saveSparse()) {
-          // assertMsg(clipGrid->getSize() == mantaGrid->getSize(), "writeObjectsVDB: Clip grid and
-          // exported grid must have the same size " << clipGrid->getSize() << " vs " <<
-          // mantaGrid->getSize());
+          assertMsg(clipGrid->getSize() == mantaGrid->getSize(),
+                    "writeObjectsVDB: Clip grid and exported grid must have the same size "
+                        << clipGrid->getSize() << " vs " << mantaGrid->getSize());
         }
         vdbGrid = exportVDB<Vec3, openvdb::Vec3SGrid>(mantaVec3Grid, clip, vdbClipGrid);
         gridsVDB.push_back(vdbGrid);
@@ -519,7 +519,7 @@ int writeObjectsVDB(const string &filename,
     }
   }
 
-  // Write only if the is at least one grid, optionally write with compression.
+  // Write only if there is at least one grid, optionally write with compression.
   if (gridsVDB.size()) {
     int vdb_flags = openvdb::io::COMPRESS_ACTIVE_MASK;
     switch (compression) {
@@ -534,7 +534,8 @@ int writeObjectsVDB(const string &filename,
       }
       case COMPRESSION_BLOSC: {
 #  if OPENVDB_BLOSC == 1
-        vdb_flags |= openvdb::io::COMPRESS_BLOSC;
+        // Cannot use |= here, causes segfault with blosc 1.5.0 (== recommended version)
+        vdb_flags = openvdb::io::COMPRESS_BLOSC;
 #  else
         debMsg("OpenVDB was built without Blosc support, using Zip compression instead", 1);
         vdb_flags |= openvdb::io::COMPRESS_ZIP;
@@ -695,28 +696,36 @@ int readObjectsVDB(const string &filename, std::vector<PbClass *> *objects, floa
 
       // Compare metadata with allocated grid setup. This prevents invalid index access.
       if (notZero(metaRes) && metaRes != origRes) {
-        // debMsg("readObjectsVDB Warning: Grid '" << vdbGrid->getName() << "' has not been read.
-        // Meta grid res " << metaRes << " vs " << origRes << " current grid size", 1);
+        debMsg("readObjectsVDB Warning: Grid '" << vdbGrid->getName()
+                                                << "' has not been read. Meta grid res " << metaRes
+                                                << " vs " << origRes << " current grid size",
+               1);
         readFailure++;
         break;
       }
       if (notZero(metaVoxelSize) && metaVoxelSize != voxelSize) {
-        // debMsg("readObjectsVDB Warning: Grid '" << vdbGrid->getName() << "' has not been read.
-        // Meta voxel size " << metaVoxelSize << " vs " << voxelSize << " current voxel size", 1);
+        debMsg("readObjectsVDB Warning: Grid '"
+                   << vdbGrid->getName() << "' has not been read. Meta voxel size "
+                   << metaVoxelSize << " vs " << voxelSize << " current voxel size",
+               1);
         readFailure++;
         break;
       }
       if (metaBBoxMax.x > origRes.x || metaBBoxMax.y > origRes.y || metaBBoxMax.z > origRes.z) {
-        // debMsg("readObjectsVDB Warning: Grid '" << vdbGrid->getName() << "' has not been read.
-        // Vdb bbox max " << metaBBoxMax << " vs " << origRes << " current grid size", 1);
+        debMsg("readObjectsVDB Warning: Grid '"
+                   << vdbGrid->getName() << "' has not been read. Vdb bbox max " << metaBBoxMax
+                   << " vs " << origRes << " current grid size",
+               1);
         readFailure++;
         break;
       }
       const Vec3i origOrigin(0);
       if (metaBBoxMin.x < origOrigin.x || metaBBoxMin.y < origOrigin.y ||
           metaBBoxMin.z < origOrigin.z) {
-        // debMsg("readObjectsVDB Warning: Grid '" << vdbGrid->getName() << "' has not been read.
-        // Vdb bbox min " << metaBBoxMin << " vs " << origOrigin << " current grid origin", 1);
+        debMsg("readObjectsVDB Warning: Grid '"
+                   << vdbGrid->getName() << "' has not been read. Vdb bbox min " << metaBBoxMin
+                   << " vs " << origOrigin << " current grid origin",
+               1);
         readFailure++;
         break;
       }

extern/mantaflow/preprocessed/fluidsolver.h

@@ -384,6 +384,7 @@ class FluidSolver : public PbClass {
   GridStorage<Real> mGrids4dReal;
   GridStorage<Vec3> mGrids4dVec;
   GridStorage<Vec4> mGrids4dVec4;
+
  public:
   PbArgs _args;
 }

extern/mantaflow/preprocessed/general.h

@@ -242,6 +242,39 @@ inline bool c_isnan(float c)
   return d != d;
 }
 
+//! Swap so that a<b
+template<class T> inline void sort(T &a, T &b)
+{
+  if (a > b)
+    std::swap(a, b);
+}
+
+//! Swap so that a<b<c
+template<class T> inline void sort(T &a, T &b, T &c)
+{
+  if (a > b)
+    std::swap(a, b);
+  if (a > c)
+    std::swap(a, c);
+  if (b > c)
+    std::swap(b, c);
+}
+
+//! Swap so that a<b<c<d
+template<class T> inline void sort(T &a, T &b, T &c, T &d)
+{
+  if (a > b)
+    std::swap(a, b);
+  if (c > d)
+    std::swap(c, d);
+  if (a > c)
+    std::swap(a, c);
+  if (b > d)
+    std::swap(b, d);
+  if (b > c)
+    std::swap(b, c);
+}
+
 }  // namespace Manta
 
 #endif

extern/mantaflow/preprocessed/gitinfo.h

@@ -1,3 +1,3 @@
 
 
-#define MANTA_GIT_VERSION "commit 39b7a415721ecbf6643612a24e8eadd221aeb934"
+#define MANTA_GIT_VERSION "commit 8fbebe02459b7f72575872c20961f7cb757db408"

extern/mantaflow/preprocessed/grid.h

@@ -383,15 +383,13 @@ class GridBase : public PbClass {
     }
   }
 
-  // TODO (sebbas): Moved attributes to public for now
+ protected:
   GridType mType;
   Vec3i mSize;
   Real mDx;
-  bool m3D;
-  // precomputed Z shift: to ensure 2D compatibility, always use this instead of sx*sy !
+  bool m3D;  // precomputed Z shift: to ensure 2D compatibility, always use this instead of sx*sy !
   IndexInt mStrideZ;
 
- protected:
  public:
   PbArgs _args;
 }
@@ -403,7 +401,7 @@ class GridBase : public PbClass {
 template<class T> class Grid : public GridBase {
  public:
   //! init new grid, values are set to zero
-  Grid(FluidSolver *parent, bool show = true, bool sparse = false, bool offload = false);
+  Grid(FluidSolver *parent, bool show = true, bool sparse = false);
   static int _W_10(PyObject *_self, PyObject *_linargs, PyObject *_kwds)
   {
     PbClass *obj = Pb::objFromPy(_self);
@@ -418,8 +416,7 @@ template<class T> class Grid : public GridBase {
         FluidSolver *parent = _args.getPtr<FluidSolver>("parent", 0, &_lock);
         bool show = _args.getOpt<bool>("show", 1, true, &_lock);
         bool sparse = _args.getOpt<bool>("sparse", 2, false, &_lock);
-        bool offload = _args.getOpt<bool>("offload", 3, false, &_lock);
-        obj = new Grid(parent, show, sparse, offload);
+        obj = new Grid(parent, show, sparse);
         obj->registerObject(_self, &_args);
         _args.check();
       }
@@ -493,7 +490,7 @@ template<class T> class Grid : public GridBase {
   }
 
   //! set all cells to zero
-  void clear(bool isOmp = false);
+  void clear();
   static PyObject *_W_13(PyObject *_self, PyObject *_linargs, PyObject *_kwds)
   {
     try {
@@ -504,10 +501,9 @@ template<class T> class Grid : public GridBase {
       PyObject *_retval = nullptr;
       {
         ArgLocker _lock;
-        bool isOmp = _args.getOpt<bool>("isOmp", 0, false, &_lock);
         pbo->_args.copy(_args);
         _retval = getPyNone();
-        pbo->clear(isOmp);
+        pbo->clear();
         pbo->_args.check();
       }
       pbFinalizePlugin(pbo->getParent(), "Grid::clear", !noTiming);
@@ -595,11 +591,6 @@ template<class T> class Grid : public GridBase {
   {
     return mSaveSparse;
   }
-  //! query if this grid should be saved as a sparse grid
-  inline bool isOffload()
-  {
-    return mOffload;
-  }
 
   //! set data
   inline void set(int i, int j, int k, T &val)
@@ -625,8 +616,9 @@ template<class T> class Grid : public GridBase {
         return interpol<T>(mData, mSize, mStrideZ, pos);
       case 2:
         return interpolCubic<T>(mData, mSize, mStrideZ, pos);
+      default:
+        assertMsg(false, "Unknown interpolation order " << order);
     }
-    // default: assertMsg(false, "Unknown interpolation order "<<order); }
     return T(0.);  // should never be reached, just to prevent compiler warnings
   }
 
@@ -636,7 +628,7 @@ template<class T> class Grid : public GridBase {
   //! content...
   // Grid<T>& operator=(const Grid<T>& a);
   //! copy content from other grid (use this one instead of operator= !)
-  Grid<T> &copyFrom(const Grid<T> &a, bool copyType = true, bool isOmp = false);
+  Grid<T> &copyFrom(const Grid<T> &a, bool copyType = true);
   static PyObject *_W_14(PyObject *_self, PyObject *_linargs, PyObject *_kwds)
   {
     try {
@@ -649,9 +641,8 @@ template<class T> class Grid : public GridBase {
         ArgLocker _lock;
         const Grid<T> &a = *_args.getPtr<Grid<T>>("a", 0, &_lock);
         bool copyType = _args.getOpt<bool>("copyType", 1, true, &_lock);
-        bool isOmp = _args.getOpt<bool>("isOmp", 2, false, &_lock);
         pbo->_args.copy(_args);
-        _retval = toPy(pbo->copyFrom(a, copyType, isOmp));
+        _retval = toPy(pbo->copyFrom(a, copyType));
         pbo->_args.check();
       }
       pbFinalizePlugin(pbo->getParent(), "Grid::copyFrom", !noTiming);
@@ -1285,157 +1276,6 @@ template<class T> class Grid : public GridBase {
     }
   }
 
-  //! OpenMP data mapping from / to target device
-  void mapToOmp();
-  static PyObject *_W_38(PyObject *_self, PyObject *_linargs, PyObject *_kwds)
-  {
-    try {
-      PbArgs _args(_linargs, _kwds);
-      Grid *pbo = dynamic_cast<Grid *>(Pb::objFromPy(_self));
-      bool noTiming = _args.getOpt<bool>("notiming", -1, 0);
-      pbPreparePlugin(pbo->getParent(), "Grid::mapToOmp", !noTiming);
-      PyObject *_retval = nullptr;
-      {
-        ArgLocker _lock;
-        pbo->_args.copy(_args);
-        _retval = getPyNone();
-        pbo->mapToOmp();
-        pbo->_args.check();
-      }
-      pbFinalizePlugin(pbo->getParent(), "Grid::mapToOmp", !noTiming);
-      return _retval;
-    }
-    catch (std::exception &e) {
-      pbSetError("Grid::mapToOmp", e.what());
-      return 0;
-    }
-  }
-
-  void mapFromOmp();
-  static PyObject *_W_39(PyObject *_self, PyObject *_linargs, PyObject *_kwds)
-  {
-    try {
-      PbArgs _args(_linargs, _kwds);
-      Grid *pbo = dynamic_cast<Grid *>(Pb::objFromPy(_self));
-      bool noTiming = _args.getOpt<bool>("notiming", -1, 0);
-      pbPreparePlugin(pbo->getParent(), "Grid::mapFromOmp", !noTiming);
-      PyObject *_retval = nullptr;
-      {
-        ArgLocker _lock;
-        pbo->_args.copy(_args);
-        _retval = getPyNone();
-        pbo->mapFromOmp();
-        pbo->_args.check();
-      }
-      pbFinalizePlugin(pbo->getParent(), "Grid::mapFromOmp", !noTiming);
-      return _retval;
-    }
-    catch (std::exception &e) {
-      pbSetError("Grid::mapFromOmp", e.what());
-      return 0;
-    }
-  }
-
-  void mapAllocOmp();
-  static PyObject *_W_40(PyObject *_self, PyObject *_linargs, PyObject *_kwds)
-  {
-    try {
-      PbArgs _args(_linargs, _kwds);
-      Grid *pbo = dynamic_cast<Grid *>(Pb::objFromPy(_self));
-      bool noTiming = _args.getOpt<bool>("notiming", -1, 0);
-      pbPreparePlugin(pbo->getParent(), "Grid::mapAllocOmp", !noTiming);
-      PyObject *_retval = nullptr;
-      {
-        ArgLocker _lock;
-        pbo->_args.copy(_args);
-        _retval = getPyNone();
-        pbo->mapAllocOmp();
-        pbo->_args.check();
-      }
-      pbFinalizePlugin(pbo->getParent(), "Grid::mapAllocOmp", !noTiming);
-      return _retval;
-    }
-    catch (std::exception &e) {
-      pbSetError("Grid::mapAllocOmp", e.what());
-      return 0;
-    }
-  }
-
-  void mapDeleteOmp();
-  static PyObject *_W_41(PyObject *_self, PyObject *_linargs, PyObject *_kwds)
-  {
-    try {
-      PbArgs _args(_linargs, _kwds);
-      Grid *pbo = dynamic_cast<Grid *>(Pb::objFromPy(_self));
-      bool noTiming = _args.getOpt<bool>("notiming", -1, 0);
-      pbPreparePlugin(pbo->getParent(), "Grid::mapDeleteOmp", !noTiming);
-      PyObject *_retval = nullptr;
-      {
-        ArgLocker _lock;
-        pbo->_args.copy(_args);
-        _retval = getPyNone();
-        pbo->mapDeleteOmp();
-        pbo->_args.check();
-      }
-      pbFinalizePlugin(pbo->getParent(), "Grid::mapDeleteOmp", !noTiming);
-      return _retval;
-    }
-    catch (std::exception &e) {
-      pbSetError("Grid::mapDeleteOmp", e.what());
-      return 0;
-    }
-  }
-
-  void updateToOmp();
-  static PyObject *_W_42(PyObject *_self, PyObject *_linargs, PyObject *_kwds)
-  {
-    try {
-      PbArgs _args(_linargs, _kwds);
-      Grid *pbo = dynamic_cast<Grid *>(Pb::objFromPy(_self));
-      bool noTiming = _args.getOpt<bool>("notiming", -1, 0);
-      pbPreparePlugin(pbo->getParent(), "Grid::updateToOmp", !noTiming);
-      PyObject *_retval = nullptr;
-      {
-        ArgLocker _lock;
-        pbo->_args.copy(_args);
-        _retval = getPyNone();
-        pbo->updateToOmp();
-        pbo->_args.check();
-      }
-      pbFinalizePlugin(pbo->getParent(), "Grid::updateToOmp", !noTiming);
-      return _retval;
-    }
-    catch (std::exception &e) {
-      pbSetError("Grid::updateToOmp", e.what());
-      return 0;
-    }
-  }
-
-  void updateFromOmp();
-  static PyObject *_W_43(PyObject *_self, PyObject *_linargs, PyObject *_kwds)
-  {
-    try {
-      PbArgs _args(_linargs, _kwds);
-      Grid *pbo = dynamic_cast<Grid *>(Pb::objFromPy(_self));
-      bool noTiming = _args.getOpt<bool>("notiming", -1, 0);
-      pbPreparePlugin(pbo->getParent(), "Grid::updateFromOmp", !noTiming);
-      PyObject *_retval = nullptr;
-      {
-        ArgLocker _lock;
-        pbo->_args.copy(_args);
-        _retval = getPyNone();
-        pbo->updateFromOmp();
-        pbo->_args.check();
-      }
-      pbFinalizePlugin(pbo->getParent(), "Grid::updateFromOmp", !noTiming);
-      return _retval;
-    }
-    catch (std::exception &e) {
-      pbSetError("Grid::updateFromOmp", e.what());
-      return 0;
-    }
-  }
-
   // c++ only operators
   template<class S> Grid<T> &operator+=(const Grid<S> &a);
   template<class S> Grid<T> &operator+=(const S &a);
@@ -1459,12 +1299,10 @@ template<class T> class Grid : public GridBase {
     return mData[index(i, j, k)];
   }
 
-  // TODO (sebbas): Moved attributes to public for now
-  T *mData;
  protected:
+  T *mData;
   bool mExternalData;  // True if mData is managed outside of the Fluidsolver
   bool mSaveSparse;    // True if this grid may be cached in a sparse structure
-  bool mOffload;       // True if this grid shall be allocated on an OpenMP offload device too
  public:
   PbArgs _args;
 }
@@ -1476,12 +1314,12 @@ template<class T> class Grid : public GridBase {
 //! Special function for staggered grids
 class MACGrid : public Grid<Vec3> {
  public:
-  MACGrid(FluidSolver *parent, bool show = true, bool sparse = false, bool offload = false)
-      : Grid<Vec3>(parent, show, sparse, offload)
+  MACGrid(FluidSolver *parent, bool show = true, bool sparse = false)
+      : Grid<Vec3>(parent, show, sparse)
   {
     mType = (GridType)(TypeMAC | TypeVec3);
   }
-  static int _W_44(PyObject *_self, PyObject *_linargs, PyObject *_kwds)
+  static int _W_38(PyObject *_self, PyObject *_linargs, PyObject *_kwds)
   {
     PbClass *obj = Pb::objFromPy(_self);
     if (obj)
@@ -1495,8 +1333,7 @@ class MACGrid : public Grid<Vec3> {
         FluidSolver *parent = _args.getPtr<FluidSolver>("parent", 0, &_lock);
         bool show = _args.getOpt<bool>("show", 1, true, &_lock);
         bool sparse = _args.getOpt<bool>("sparse", 2, false, &_lock);
-        bool offload = _args.getOpt<bool>("offload", 3, false, &_lock);
-        obj = new MACGrid(parent, show, sparse, offload);
+        obj = new MACGrid(parent, show, sparse);
         obj->registerObject(_self, &_args);
         _args.check();
       }
@@ -1555,16 +1392,17 @@ class MACGrid : public Grid<Vec3> {
       case 1:
         return interpolComponent<comp>(mData, mSize, mStrideZ, pos);
       case 2:
-        return interpolCubicMAC(mData, mSize, mStrideZ, pos)[comp];
-    }  // warning - not yet optimized
-    // default: assertMsg(false, "Unknown interpolation order "<<order); }
+        return interpolCubicMAC(mData, mSize, mStrideZ, pos)[comp];  // warning - not yet optimized
+      default:
+        assertMsg(false, "Unknown interpolation order " << order);
+    }
     return 0.;  // should never be reached, just to prevent compiler warnings
   }
 
   //! set all boundary cells of a MAC grid to certain value (Dirchlet). Respects staggered grid
   //! locations optionally, only set normal components
   void setBoundMAC(Vec3 value, int boundaryWidth, bool normalOnly = false);
-  static PyObject *_W_45(PyObject *_self, PyObject *_linargs, PyObject *_kwds)
+  static PyObject *_W_39(PyObject *_self, PyObject *_linargs, PyObject *_kwds)
   {
     try {
       PbArgs _args(_linargs, _kwds);
@@ -1601,16 +1439,12 @@ class MACGrid : public Grid<Vec3> {
 //! Special functions for FlagGrid
 class FlagGrid : public Grid<int> {
  public:
-  FlagGrid(FluidSolver *parent,
-           int dim = 3,
-           bool show = true,
-           bool sparse = false,
-           bool offload = false)
-      : Grid<int>(parent, show, sparse, offload)
+  FlagGrid(FluidSolver *parent, int dim = 3, bool show = true, bool sparse = false)
+      : Grid<int>(parent, show, sparse)
   {
     mType = (GridType)(TypeFlags | TypeInt);
   }
-  static int _W_46(PyObject *_self, PyObject *_linargs, PyObject *_kwds)
+  static int _W_40(PyObject *_self, PyObject *_linargs, PyObject *_kwds)
   {
     PbClass *obj = Pb::objFromPy(_self);
     if (obj)
@@ -1625,8 +1459,7 @@ class FlagGrid : public Grid<int> {
         int dim = _args.getOpt<int>("dim", 1, 3, &_lock);
         bool show = _args.getOpt<bool>("show", 2, true, &_lock);
         bool sparse = _args.getOpt<bool>("sparse", 3, false, &_lock);
-        bool offload = _args.getOpt<bool>("offload", 4, false, &_lock);
-        obj = new FlagGrid(parent, dim, show, sparse, offload);
+        obj = new FlagGrid(parent, dim, show, sparse);
         obj->registerObject(_self, &_args);
         _args.check();
       }
@@ -1792,7 +1625,7 @@ class FlagGrid : public Grid<int> {
                   const std::string &inflow = "      ",
                   const std::string &outflow = "      ",
                   Grid<Real> *phiWalls = 0x00);
-  static PyObject *_W_47(PyObject *_self, PyObject *_linargs, PyObject *_kwds)
+  static PyObject *_W_41(PyObject *_self, PyObject *_linargs, PyObject *_kwds)
   {
     try {
       PbArgs _args(_linargs, _kwds);
@@ -1826,7 +1659,7 @@ class FlagGrid : public Grid<int> {
 
   //! set fluid flags inside levelset (liquids)
   void updateFromLevelset(LevelsetGrid &levelset);
-  static PyObject *_W_48(PyObject *_self, PyObject *_linargs, PyObject *_kwds)
+  static PyObject *_W_42(PyObject *_self, PyObject *_linargs, PyObject *_kwds)
   {
     try {
       PbArgs _args(_linargs, _kwds);
@@ -1853,7 +1686,7 @@ class FlagGrid : public Grid<int> {
 
   //! set all cells (except obs/in/outflow) to type (fluid by default)
   void fillGrid(int type = TypeFluid);
-  static PyObject *_W_49(PyObject *_self, PyObject *_linargs, PyObject *_kwds)
+  static PyObject *_W_43(PyObject *_self, PyObject *_linargs, PyObject *_kwds)
   {
     try {
       PbArgs _args(_linargs, _kwds);
@@ -1882,7 +1715,7 @@ class FlagGrid : public Grid<int> {
   //! warning for large grids! only regular int returned (due to python interface)
   //! optionally creates mask in RealGrid (1 where flag matches, 0 otherwise)
   int countCells(int flag, int bnd = 0, Grid<Real> *mask = nullptr);
-  static PyObject *_W_50(PyObject *_self, PyObject *_linargs, PyObject *_kwds)
+  static PyObject *_W_44(PyObject *_self, PyObject *_linargs, PyObject *_kwds)
   {
     try {
       PbArgs _args(_linargs, _kwds);
@@ -2035,7 +1868,7 @@ template<class T, class S> struct gridAdd : public KernelBase {
     runMessage();
     run();
   }
-  inline void op(IndexInt idx, Grid<T> &me, const Grid<S> &other)
+  inline void op(IndexInt idx, Grid<T> &me, const Grid<S> &other) const
   {
     me[idx] += other[idx];
   }
@@ -2049,17 +1882,21 @@ template<class T, class S> struct gridAdd : public KernelBase {
     return other;
   }
   typedef Grid<S> type1;
-  void runMessage(){};
+  void runMessage()
+  {
+    debMsg("Executing kernel gridAdd ", 3);
+    debMsg("Kernel range"
+               << " x " << maxX << " y " << maxY << " z " << minZ << " - " << maxZ << " ",
+           4);
+  };
+  void operator()(const tbb::blocked_range<IndexInt> &__r) const
+  {
+    for (IndexInt idx = __r.begin(); idx != (IndexInt)__r.end(); idx++)
+      op(idx, me, other);
+  }
   void run()
   {
-    const IndexInt _sz = size;
-#pragma omp parallel
-    {
-
-#pragma omp for
-      for (IndexInt i = 0; i < _sz; i++)
-        op(i, me, other);
-    }
+    tbb::parallel_for(tbb::blocked_range<IndexInt>(0, size), *this);
   }
   Grid<T> &me;
   const Grid<S> &other;
@@ -2070,7 +1907,7 @@ template<class T, class S> struct gridSub : public KernelBase {
     runMessage();
     run();
   }
-  inline void op(IndexInt idx, Grid<T> &me, const Grid<S> &other)
+  inline void op(IndexInt idx, Grid<T> &me, const Grid<S> &other) const
   {
     me[idx] -= other[idx];
   }
@@ -2084,17 +1921,21 @@ template<class T, class S> struct gridSub : public KernelBase {
     return other;
   }
   typedef Grid<S> type1;
-  void runMessage(){};
+  void runMessage()
+  {
+    debMsg("Executing kernel gridSub ", 3);
+    debMsg("Kernel range"
+               << " x " << maxX << " y " << maxY << " z " << minZ << " - " << maxZ << " ",
+           4);
+  };
+  void operator()(const tbb::blocked_range<IndexInt> &__r) const
+  {
+    for (IndexInt idx = __r.begin(); idx != (IndexInt)__r.end(); idx++)
+      op(idx, me, other);
+  }
   void run()
   {
-    const IndexInt _sz = size;
-#pragma omp parallel
-    {
-
-#pragma omp for
-      for (IndexInt i = 0; i < _sz; i++)
-        op(i, me, other);
-    }
+    tbb::parallel_for(tbb::blocked_range<IndexInt>(0, size), *this);
   }
   Grid<T> &me;
   const Grid<S> &other;
@@ -2105,7 +1946,7 @@ template<class T, class S> struct gridMult : public KernelBase {
     runMessage();
     run();
   }
-  inline void op(IndexInt idx, Grid<T> &me, const Grid<S> &other)
+  inline void op(IndexInt idx, Grid<T> &me, const Grid<S> &other) const
   {
     me[idx] *= other[idx];
   }
@@ -2119,17 +1960,21 @@ template<class T, class S> struct gridMult : public KernelBase {
     return other;
   }
   typedef Grid<S> type1;
-  void runMessage(){};
+  void runMessage()
+  {
+    debMsg("Executing kernel gridMult ", 3);
+    debMsg("Kernel range"
+               << " x " << maxX << " y " << maxY << " z " << minZ << " - " << maxZ << " ",
+           4);
+  };
+  void operator()(const tbb::blocked_range<IndexInt> &__r) const
+  {
+    for (IndexInt idx = __r.begin(); idx != (IndexInt)__r.end(); idx++)
+      op(idx, me, other);
+  }
   void run()
   {
-    const IndexInt _sz = size;
-#pragma omp parallel
-    {
-
-#pragma omp for
-      for (IndexInt i = 0; i < _sz; i++)
-        op(i, me, other);
-    }
+    tbb::parallel_for(tbb::blocked_range<IndexInt>(0, size), *this);
   }
   Grid<T> &me;
   const Grid<S> &other;
@@ -2140,7 +1985,7 @@ template<class T, class S> struct gridDiv : public KernelBase {
     runMessage();
     run();
   }
-  inline void op(IndexInt idx, Grid<T> &me, const Grid<S> &other)
+  inline void op(IndexInt idx, Grid<T> &me, const Grid<S> &other) const
   {
     me[idx] /= other[idx];
   }
@@ -2154,17 +1999,21 @@ template<class T, class S> struct gridDiv : public KernelBase {
     return other;
   }
   typedef Grid<S> type1;
-  void runMessage(){};
+  void runMessage()
+  {
+    debMsg("Executing kernel gridDiv ", 3);
+    debMsg("Kernel range"
+               << " x " << maxX << " y " << maxY << " z " << minZ << " - " << maxZ << " ",
+           4);
+  };
+  void operator()(const tbb::blocked_range<IndexInt> &__r) const
+  {
+    for (IndexInt idx = __r.begin(); idx != (IndexInt)__r.end(); idx++)
+      op(idx, me, other);
+  }
   void run()
   {
-    const IndexInt _sz = size;
-#pragma omp parallel
-    {
-
-#pragma omp for
-      for (IndexInt i = 0; i < _sz; i++)
-        op(i, me, other);
-    }
+    tbb::parallel_for(tbb::blocked_range<IndexInt>(0, size), *this);
   }
   Grid<T> &me;
   const Grid<S> &other;
@@ -2175,7 +2024,7 @@ template<class T, class S> struct gridAddScalar : public KernelBase {
     runMessage();
     run();
   }
-  inline void op(IndexInt idx, Grid<T> &me, const S &other)
+  inline void op(IndexInt idx, Grid<T> &me, const S &other) const
   {
     me[idx] += other;
   }
@@ -2189,17 +2038,21 @@ template<class T, class S> struct gridAddScalar : public KernelBase {
     return other;
   }
   typedef S type1;
-  void runMessage(){};
+  void runMessage()
+  {
+    debMsg("Executing kernel gridAddScalar ", 3);
+    debMsg("Kernel range"
+               << " x " << maxX << " y " << maxY << " z " << minZ << " - " << maxZ << " ",
+           4);
+  };
+  void operator()(const tbb::blocked_range<IndexInt> &__r) const
+  {
+    for (IndexInt idx = __r.begin(); idx != (IndexInt)__r.end(); idx++)
+      op(idx, me, other);
+  }
   void run()
   {
-    const IndexInt _sz = size;
-#pragma omp parallel
-    {
-
-#pragma omp for
-      for (IndexInt i = 0; i < _sz; i++)
-        op(i, me, other);
-    }
+    tbb::parallel_for(tbb::blocked_range<IndexInt>(0, size), *this);
   }
   Grid<T> &me;
   const S &other;
@@ -2210,7 +2063,7 @@ template<class T, class S> struct gridMultScalar : public KernelBase {
     runMessage();
     run();
   }
-  inline void op(IndexInt idx, Grid<T> &me, const S &other)
+  inline void op(IndexInt idx, Grid<T> &me, const S &other) const
   {
     me[idx] *= other;
   }
@@ -2224,22 +2077,25 @@ template<class T, class S> struct gridMultScalar : public KernelBase {
     return other;
   }
   typedef S type1;
-  void runMessage(){};
+  void runMessage()
+  {
+    debMsg("Executing kernel gridMultScalar ", 3);
+    debMsg("Kernel range"
+               << " x " << maxX << " y " << maxY << " z " << minZ << " - " << maxZ << " ",
+           4);
+  };
+  void operator()(const tbb::blocked_range<IndexInt> &__r) const
+  {
+    for (IndexInt idx = __r.begin(); idx != (IndexInt)__r.end(); idx++)
+      op(idx, me, other);
+  }
   void run()
   {
-    const IndexInt _sz = size;
-#pragma omp parallel
-    {
-
-#pragma omp for
-      for (IndexInt i = 0; i < _sz; i++)
-        op(i, me, other);
-    }
+    tbb::parallel_for(tbb::blocked_range<IndexInt>(0, size), *this);
   }
   Grid<T> &me;
   const S &other;
 };
-
 template<class T, class S> struct gridScaledAdd : public KernelBase {
   gridScaledAdd(Grid<T> &me, const Grid<T> &other, const S &factor)
       : KernelBase(&me, 0), me(me), other(other), factor(factor)
@@ -2247,9 +2103,8 @@ template<class T, class S> struct gridScaledAdd : public KernelBase {
     runMessage();
     run();
   }
-  inline void op(int i, int j, int k, Grid<T> &me, const Grid<T> &other, const S &factor)
+  inline void op(IndexInt idx, Grid<T> &me, const Grid<T> &other, const S &factor) const
   {
-    const IndexInt idx = me.index(i, j, k);
     me[idx] += factor * other[idx];
   }
   inline Grid<T> &getArg0()
@@ -2267,35 +2122,21 @@ template<class T, class S> struct gridScaledAdd : public KernelBase {
     return factor;
   }
   typedef S type2;
-  void runMessage(){};
+  void runMessage()
+  {
+    debMsg("Executing kernel gridScaledAdd ", 3);
+    debMsg("Kernel range"
+               << " x " << maxX << " y " << maxY << " z " << minZ << " - " << maxZ << " ",
+           4);
+  };
+  void operator()(const tbb::blocked_range<IndexInt> &__r) const
+  {
+    for (IndexInt idx = __r.begin(); idx != (IndexInt)__r.end(); idx++)
+      op(idx, me, other, factor);
+  }
   void run()
   {
-    const int _maxX = maxX;
-    const int _maxY = maxY;
-    if (maxZ > 1) {
-      Grid<T> &me = getArg0();
-      const Grid<T> &other = getArg1();
-      const S &factor = getArg2();
-#pragma omp target teams distribute parallel for collapse(3) schedule(static, 1)
-      {
-        for (int k = minZ; k < maxZ; k++)
-          for (int j = 0; j < _maxY; j++)
-            for (int i = 0; i < _maxX; i++)
-              op(i, j, k, me, other, factor);
-      }
-    }
-    else {
-      const int k = 0;
-      Grid<T> &me = getArg0();
-      const Grid<T> &other = getArg1();
-      const S &factor = getArg2();
-#pragma omp target teams distribute parallel for collapse(2) schedule(static, 1)
-      {
-        for (int j = 0; j < _maxY; j++)
-          for (int i = 0; i < _maxX; i++)
-            op(i, j, k, me, other, factor);
-      }
-    }
+    tbb::parallel_for(tbb::blocked_range<IndexInt>(0, size), *this);
   }
   Grid<T> &me;
   const Grid<T> &other;
@@ -2308,7 +2149,7 @@ template<class T> struct gridSetConst : public KernelBase {
     runMessage();
     run();
   }
-  inline void op(IndexInt idx, Grid<T> &grid, T value)
+  inline void op(IndexInt idx, Grid<T> &grid, T value) const
   {
     grid[idx] = value;
   }
@@ -2322,17 +2163,21 @@ template<class T> struct gridSetConst : public KernelBase {
     return value;
   }
   typedef T type1;
-  void runMessage(){};
+  void runMessage()
+  {
+    debMsg("Executing kernel gridSetConst ", 3);
+    debMsg("Kernel range"
+               << " x " << maxX << " y " << maxY << " z " << minZ << " - " << maxZ << " ",
+           4);
+  };
+  void operator()(const tbb::blocked_range<IndexInt> &__r) const
+  {
+    for (IndexInt idx = __r.begin(); idx != (IndexInt)__r.end(); idx++)
+      op(idx, grid, value);
+  }
   void run()
   {
-    const IndexInt _sz = size;
-#pragma omp parallel
-    {
-
-#pragma omp for
-      for (IndexInt i = 0; i < _sz; i++)
-        op(i, grid, value);
-    }
+    tbb::parallel_for(tbb::blocked_range<IndexInt>(0, size), *this);
   }
   Grid<T> &grid;
   T value;
@@ -2434,7 +2279,7 @@ template<class S> struct knInterpolateGridTempl : public KernelBase {
                  const Grid<S> &source,
                  const Vec3 &sourceFactor,
                  Vec3 offset,
-                 int orderSpace = 1)
+                 int orderSpace = 1) const
   {
     Vec3 pos = Vec3(i, j, k) * sourceFactor + offset;
     if (!source.is3D())
@@ -2466,34 +2311,36 @@ template<class S> struct knInterpolateGridTempl : public KernelBase {
     return orderSpace;
   }
   typedef int type4;
-  void runMessage(){};
-  void run()
+  void runMessage()
+  {
+    debMsg("Executing kernel knInterpolateGridTempl ", 3);
+    debMsg("Kernel range"
+               << " x " << maxX << " y " << maxY << " z " << minZ << " - " << maxZ << " ",
+           4);
+  };
+  void operator()(const tbb::blocked_range<IndexInt> &__r) const
   {
     const int _maxX = maxX;
     const int _maxY = maxY;
     if (maxZ > 1) {
-
-#pragma omp parallel
-      {
-
-#pragma omp for
-        for (int k = minZ; k < maxZ; k++)
-          for (int j = 0; j < _maxY; j++)
-            for (int i = 0; i < _maxX; i++)
-              op(i, j, k, target, source, sourceFactor, offset, orderSpace);
-      }
-    }
-    else {
-      const int k = 0;
-#pragma omp parallel
-      {
-
-#pragma omp for
+      for (int k = __r.begin(); k != (int)__r.end(); k++)
         for (int j = 0; j < _maxY; j++)
           for (int i = 0; i < _maxX; i++)
             op(i, j, k, target, source, sourceFactor, offset, orderSpace);
-      }
     }
+    else {
+      const int k = 0;
+      for (int j = __r.begin(); j != (int)__r.end(); j++)
+        for (int i = 0; i < _maxX; i++)
+          op(i, j, k, target, source, sourceFactor, offset, orderSpace);
+    }
+  }
+  void run()
+  {
+    if (maxZ > 1)
+      tbb::parallel_for(tbb::blocked_range<IndexInt>(minZ, maxZ), *this);
+    else
+      tbb::parallel_for(tbb::blocked_range<IndexInt>(0, maxY), *this);
   }
   Grid<S> &target;
   const Grid<S> &source;

extern/mantaflow/preprocessed/grid.h.reg.cpp

@@ -8,11 +8,11 @@ namespace Manta {
 #ifdef _C_FlagGrid
 static const Pb::Register _R_26("FlagGrid", "FlagGrid", "Grid<int>");
 template<> const char *Namify<FlagGrid>::S = "FlagGrid";
-static const Pb::Register _R_27("FlagGrid", "FlagGrid", FlagGrid::_W_46);
-static const Pb::Register _R_28("FlagGrid", "initDomain", FlagGrid::_W_47);
-static const Pb::Register _R_29("FlagGrid", "updateFromLevelset", FlagGrid::_W_48);
-static const Pb::Register _R_30("FlagGrid", "fillGrid", FlagGrid::_W_49);
-static const Pb::Register _R_31("FlagGrid", "countCells", FlagGrid::_W_50);
+static const Pb::Register _R_27("FlagGrid", "FlagGrid", FlagGrid::_W_40);
+static const Pb::Register _R_28("FlagGrid", "initDomain", FlagGrid::_W_41);
+static const Pb::Register _R_29("FlagGrid", "updateFromLevelset", FlagGrid::_W_42);
+static const Pb::Register _R_30("FlagGrid", "fillGrid", FlagGrid::_W_43);
+static const Pb::Register _R_31("FlagGrid", "countCells", FlagGrid::_W_44);
 #endif
 #ifdef _C_Grid
 static const Pb::Register _R_32("Grid<int>", "Grid<int>", "GridBase");
@@ -45,104 +45,86 @@ static const Pb::Register _R_57("Grid<int>", "setBound", Grid<int>::_W_34);
 static const Pb::Register _R_58("Grid<int>", "setBoundNeumann", Grid<int>::_W_35);
 static const Pb::Register _R_59("Grid<int>", "getDataPointer", Grid<int>::_W_36);
 static const Pb::Register _R_60("Grid<int>", "printGrid", Grid<int>::_W_37);
-static const Pb::Register _R_61("Grid<int>", "mapToOmp", Grid<int>::_W_38);
-static const Pb::Register _R_62("Grid<int>", "mapFromOmp", Grid<int>::_W_39);
-static const Pb::Register _R_63("Grid<int>", "mapAllocOmp", Grid<int>::_W_40);
-static const Pb::Register _R_64("Grid<int>", "mapDeleteOmp", Grid<int>::_W_41);
-static const Pb::Register _R_65("Grid<int>", "updateToOmp", Grid<int>::_W_42);
-static const Pb::Register _R_66("Grid<int>", "updateFromOmp", Grid<int>::_W_43);
-static const Pb::Register _R_67("Grid<Real>", "Grid<Real>", "GridBase");
+static const Pb::Register _R_61("Grid<Real>", "Grid<Real>", "GridBase");
 template<> const char *Namify<Grid<Real>>::S = "Grid<Real>";
-static const Pb::Register _R_68("Grid<Real>", "Grid", Grid<Real>::_W_10);
-static const Pb::Register _R_69("Grid<Real>", "save", Grid<Real>::_W_11);
-static const Pb::Register _R_70("Grid<Real>", "load", Grid<Real>::_W_12);
-static const Pb::Register _R_71("Grid<Real>", "clear", Grid<Real>::_W_13);
-static const Pb::Register _R_72("Grid<Real>", "copyFrom", Grid<Real>::_W_14);
-static const Pb::Register _R_73("Grid<Real>", "getGridType", Grid<Real>::_W_15);
-static const Pb::Register _R_74("Grid<Real>", "add", Grid<Real>::_W_16);
-static const Pb::Register _R_75("Grid<Real>", "sub", Grid<Real>::_W_17);
-static const Pb::Register _R_76("Grid<Real>", "setConst", Grid<Real>::_W_18);
-static const Pb::Register _R_77("Grid<Real>", "addConst", Grid<Real>::_W_19);
-static const Pb::Register _R_78("Grid<Real>", "addScaled", Grid<Real>::_W_20);
-static const Pb::Register _R_79("Grid<Real>", "mult", Grid<Real>::_W_21);
-static const Pb::Register _R_80("Grid<Real>", "multConst", Grid<Real>::_W_22);
-static const Pb::Register _R_81("Grid<Real>", "safeDivide", Grid<Real>::_W_23);
-static const Pb::Register _R_82("Grid<Real>", "clamp", Grid<Real>::_W_24);
-static const Pb::Register _R_83("Grid<Real>", "stomp", Grid<Real>::_W_25);
-static const Pb::Register _R_84("Grid<Real>", "permuteAxes", Grid<Real>::_W_26);
-static const Pb::Register _R_85("Grid<Real>", "permuteAxesCopyToGrid", Grid<Real>::_W_27);
-static const Pb::Register _R_86("Grid<Real>", "join", Grid<Real>::_W_28);
-static const Pb::Register _R_87("Grid<Real>", "getMaxAbs", Grid<Real>::_W_29);
-static const Pb::Register _R_88("Grid<Real>", "getMax", Grid<Real>::_W_30);
-static const Pb::Register _R_89("Grid<Real>", "getMin", Grid<Real>::_W_31);
-static const Pb::Register _R_90("Grid<Real>", "getL1", Grid<Real>::_W_32);
-static const Pb::Register _R_91("Grid<Real>", "getL2", Grid<Real>::_W_33);
-static const Pb::Register _R_92("Grid<Real>", "setBound", Grid<Real>::_W_34);
-static const Pb::Register _R_93("Grid<Real>", "setBoundNeumann", Grid<Real>::_W_35);
-static const Pb::Register _R_94("Grid<Real>", "getDataPointer", Grid<Real>::_W_36);
-static const Pb::Register _R_95("Grid<Real>", "printGrid", Grid<Real>::_W_37);
-static const Pb::Register _R_96("Grid<Real>", "mapToOmp", Grid<Real>::_W_38);
-static const Pb::Register _R_97("Grid<Real>", "mapFromOmp", Grid<Real>::_W_39);
-static const Pb::Register _R_98("Grid<Real>", "mapAllocOmp", Grid<Real>::_W_40);
-static const Pb::Register _R_99("Grid<Real>", "mapDeleteOmp", Grid<Real>::_W_41);
-static const Pb::Register _R_100("Grid<Real>", "updateToOmp", Grid<Real>::_W_42);
-static const Pb::Register _R_101("Grid<Real>", "updateFromOmp", Grid<Real>::_W_43);
-static const Pb::Register _R_102("Grid<Vec3>", "Grid<Vec3>", "GridBase");
+static const Pb::Register _R_62("Grid<Real>", "Grid", Grid<Real>::_W_10);
+static const Pb::Register _R_63("Grid<Real>", "save", Grid<Real>::_W_11);
+static const Pb::Register _R_64("Grid<Real>", "load", Grid<Real>::_W_12);
+static const Pb::Register _R_65("Grid<Real>", "clear", Grid<Real>::_W_13);
+static const Pb::Register _R_66("Grid<Real>", "copyFrom", Grid<Real>::_W_14);
+static const Pb::Register _R_67("Grid<Real>", "getGridType", Grid<Real>::_W_15);
+static const Pb::Register _R_68("Grid<Real>", "add", Grid<Real>::_W_16);
+static const Pb::Register _R_69("Grid<Real>", "sub", Grid<Real>::_W_17);
+static const Pb::Register _R_70("Grid<Real>", "setConst", Grid<Real>::_W_18);
+static const Pb::Register _R_71("Grid<Real>", "addConst", Grid<Real>::_W_19);
+static const Pb::Register _R_72("Grid<Real>", "addScaled", Grid<Real>::_W_20);
+static const Pb::Register _R_73("Grid<Real>", "mult", Grid<Real>::_W_21);
+static const Pb::Register _R_74("Grid<Real>", "multConst", Grid<Real>::_W_22);
+static const Pb::Register _R_75("Grid<Real>", "safeDivide", Grid<Real>::_W_23);
+static const Pb::Register _R_76("Grid<Real>", "clamp", Grid<Real>::_W_24);
+static const Pb::Register _R_77("Grid<Real>", "stomp", Grid<Real>::_W_25);
+static const Pb::Register _R_78("Grid<Real>", "permuteAxes", Grid<Real>::_W_26);
+static const Pb::Register _R_79("Grid<Real>", "permuteAxesCopyToGrid", Grid<Real>::_W_27);
+static const Pb::Register _R_80("Grid<Real>", "join", Grid<Real>::_W_28);
+static const Pb::Register _R_81("Grid<Real>", "getMaxAbs", Grid<Real>::_W_29);
+static const Pb::Register _R_82("Grid<Real>", "getMax", Grid<Real>::_W_30);
+static const Pb::Register _R_83("Grid<Real>", "getMin", Grid<Real>::_W_31);
+static const Pb::Register _R_84("Grid<Real>", "getL1", Grid<Real>::_W_32);
+static const Pb::Register _R_85("Grid<Real>", "getL2", Grid<Real>::_W_33);
+static const Pb::Register _R_86("Grid<Real>", "setBound", Grid<Real>::_W_34);
+static const Pb::Register _R_87("Grid<Real>", "setBoundNeumann", Grid<Real>::_W_35);
+static const Pb::Register _R_88("Grid<Real>", "getDataPointer", Grid<Real>::_W_36);
+static const Pb::Register _R_89("Grid<Real>", "printGrid", Grid<Real>::_W_37);
+static const Pb::Register _R_90("Grid<Vec3>", "Grid<Vec3>", "GridBase");
 template<> const char *Namify<Grid<Vec3>>::S = "Grid<Vec3>";
-static const Pb::Register _R_103("Grid<Vec3>", "Grid", Grid<Vec3>::_W_10);
-static const Pb::Register _R_104("Grid<Vec3>", "save", Grid<Vec3>::_W_11);
-static const Pb::Register _R_105("Grid<Vec3>", "load", Grid<Vec3>::_W_12);
-static const Pb::Register _R_106("Grid<Vec3>", "clear", Grid<Vec3>::_W_13);
-static const Pb::Register _R_107("Grid<Vec3>", "copyFrom", Grid<Vec3>::_W_14);
-static const Pb::Register _R_108("Grid<Vec3>", "getGridType", Grid<Vec3>::_W_15);
-static const Pb::Register _R_109("Grid<Vec3>", "add", Grid<Vec3>::_W_16);
-static const Pb::Register _R_110("Grid<Vec3>", "sub", Grid<Vec3>::_W_17);
-static const Pb::Register _R_111("Grid<Vec3>", "setConst", Grid<Vec3>::_W_18);
-static const Pb::Register _R_112("Grid<Vec3>", "addConst", Grid<Vec3>::_W_19);
-static const Pb::Register _R_113("Grid<Vec3>", "addScaled", Grid<Vec3>::_W_20);
-static const Pb::Register _R_114("Grid<Vec3>", "mult", Grid<Vec3>::_W_21);
-static const Pb::Register _R_115("Grid<Vec3>", "multConst", Grid<Vec3>::_W_22);
-static const Pb::Register _R_116("Grid<Vec3>", "safeDivide", Grid<Vec3>::_W_23);
-static const Pb::Register _R_117("Grid<Vec3>", "clamp", Grid<Vec3>::_W_24);
-static const Pb::Register _R_118("Grid<Vec3>", "stomp", Grid<Vec3>::_W_25);
-static const Pb::Register _R_119("Grid<Vec3>", "permuteAxes", Grid<Vec3>::_W_26);
-static const Pb::Register _R_120("Grid<Vec3>", "permuteAxesCopyToGrid", Grid<Vec3>::_W_27);
-static const Pb::Register _R_121("Grid<Vec3>", "join", Grid<Vec3>::_W_28);
-static const Pb::Register _R_122("Grid<Vec3>", "getMaxAbs", Grid<Vec3>::_W_29);
-static const Pb::Register _R_123("Grid<Vec3>", "getMax", Grid<Vec3>::_W_30);
-static const Pb::Register _R_124("Grid<Vec3>", "getMin", Grid<Vec3>::_W_31);
-static const Pb::Register _R_125("Grid<Vec3>", "getL1", Grid<Vec3>::_W_32);
-static const Pb::Register _R_126("Grid<Vec3>", "getL2", Grid<Vec3>::_W_33);
-static const Pb::Register _R_127("Grid<Vec3>", "setBound", Grid<Vec3>::_W_34);
-static const Pb::Register _R_128("Grid<Vec3>", "setBoundNeumann", Grid<Vec3>::_W_35);
-static const Pb::Register _R_129("Grid<Vec3>", "getDataPointer", Grid<Vec3>::_W_36);
-static const Pb::Register _R_130("Grid<Vec3>", "printGrid", Grid<Vec3>::_W_37);
-static const Pb::Register _R_131("Grid<Vec3>", "mapToOmp", Grid<Vec3>::_W_38);
-static const Pb::Register _R_132("Grid<Vec3>", "mapFromOmp", Grid<Vec3>::_W_39);
-static const Pb::Register _R_133("Grid<Vec3>", "mapAllocOmp", Grid<Vec3>::_W_40);
-static const Pb::Register _R_134("Grid<Vec3>", "mapDeleteOmp", Grid<Vec3>::_W_41);
-static const Pb::Register _R_135("Grid<Vec3>", "updateToOmp", Grid<Vec3>::_W_42);
-static const Pb::Register _R_136("Grid<Vec3>", "updateFromOmp", Grid<Vec3>::_W_43);
+static const Pb::Register _R_91("Grid<Vec3>", "Grid", Grid<Vec3>::_W_10);
+static const Pb::Register _R_92("Grid<Vec3>", "save", Grid<Vec3>::_W_11);
+static const Pb::Register _R_93("Grid<Vec3>", "load", Grid<Vec3>::_W_12);
+static const Pb::Register _R_94("Grid<Vec3>", "clear", Grid<Vec3>::_W_13);
+static const Pb::Register _R_95("Grid<Vec3>", "copyFrom", Grid<Vec3>::_W_14);
+static const Pb::Register _R_96("Grid<Vec3>", "getGridType", Grid<Vec3>::_W_15);
+static const Pb::Register _R_97("Grid<Vec3>", "add", Grid<Vec3>::_W_16);
+static const Pb::Register _R_98("Grid<Vec3>", "sub", Grid<Vec3>::_W_17);
+static const Pb::Register _R_99("Grid<Vec3>", "setConst", Grid<Vec3>::_W_18);
+static const Pb::Register _R_100("Grid<Vec3>", "addConst", Grid<Vec3>::_W_19);
+static const Pb::Register _R_101("Grid<Vec3>", "addScaled", Grid<Vec3>::_W_20);
+static const Pb::Register _R_102("Grid<Vec3>", "mult", Grid<Vec3>::_W_21);
+static const Pb::Register _R_103("Grid<Vec3>", "multConst", Grid<Vec3>::_W_22);
+static const Pb::Register _R_104("Grid<Vec3>", "safeDivide", Grid<Vec3>::_W_23);
+static const Pb::Register _R_105("Grid<Vec3>", "clamp", Grid<Vec3>::_W_24);
+static const Pb::Register _R_106("Grid<Vec3>", "stomp", Grid<Vec3>::_W_25);
+static const Pb::Register _R_107("Grid<Vec3>", "permuteAxes", Grid<Vec3>::_W_26);
+static const Pb::Register _R_108("Grid<Vec3>", "permuteAxesCopyToGrid", Grid<Vec3>::_W_27);
+static const Pb::Register _R_109("Grid<Vec3>", "join", Grid<Vec3>::_W_28);
+static const Pb::Register _R_110("Grid<Vec3>", "getMaxAbs", Grid<Vec3>::_W_29);
+static const Pb::Register _R_111("Grid<Vec3>", "getMax", Grid<Vec3>::_W_30);
+static const Pb::Register _R_112("Grid<Vec3>", "getMin", Grid<Vec3>::_W_31);
+static const Pb::Register _R_113("Grid<Vec3>", "getL1", Grid<Vec3>::_W_32);
+static const Pb::Register _R_114("Grid<Vec3>", "getL2", Grid<Vec3>::_W_33);
+static const Pb::Register _R_115("Grid<Vec3>", "setBound", Grid<Vec3>::_W_34);
+static const Pb::Register _R_116("Grid<Vec3>", "setBoundNeumann", Grid<Vec3>::_W_35);
+static const Pb::Register _R_117("Grid<Vec3>", "getDataPointer", Grid<Vec3>::_W_36);
+static const Pb::Register _R_118("Grid<Vec3>", "printGrid", Grid<Vec3>::_W_37);
 #endif
 #ifdef _C_GridBase
-static const Pb::Register _R_137("GridBase", "GridBase", "PbClass");
+static const Pb::Register _R_119("GridBase", "GridBase", "PbClass");
 template<> const char *Namify<GridBase>::S = "GridBase";
-static const Pb::Register _R_138("GridBase", "GridBase", GridBase::_W_0);
-static const Pb::Register _R_139("GridBase", "getSizeX", GridBase::_W_1);
-static const Pb::Register _R_140("GridBase", "getSizeY", GridBase::_W_2);
-static const Pb::Register _R_141("GridBase", "getSizeZ", GridBase::_W_3);
-static const Pb::Register _R_142("GridBase", "getSize", GridBase::_W_4);
-static const Pb::Register _R_143("GridBase", "is3D", GridBase::_W_5);
-static const Pb::Register _R_144("GridBase", "is4D", GridBase::_W_6);
-static const Pb::Register _R_145("GridBase", "getSizeT", GridBase::_W_7);
-static const Pb::Register _R_146("GridBase", "getStrideT", GridBase::_W_8);
-static const Pb::Register _R_147("GridBase", "setName", GridBase::_W_9);
+static const Pb::Register _R_120("GridBase", "GridBase", GridBase::_W_0);
+static const Pb::Register _R_121("GridBase", "getSizeX", GridBase::_W_1);
+static const Pb::Register _R_122("GridBase", "getSizeY", GridBase::_W_2);
+static const Pb::Register _R_123("GridBase", "getSizeZ", GridBase::_W_3);
+static const Pb::Register _R_124("GridBase", "getSize", GridBase::_W_4);
+static const Pb::Register _R_125("GridBase", "is3D", GridBase::_W_5);
+static const Pb::Register _R_126("GridBase", "is4D", GridBase::_W_6);
+static const Pb::Register _R_127("GridBase", "getSizeT", GridBase::_W_7);
+static const Pb::Register _R_128("GridBase", "getStrideT", GridBase::_W_8);
+static const Pb::Register _R_129("GridBase", "setName", GridBase::_W_9);
 #endif
 #ifdef _C_MACGrid
-static const Pb::Register _R_148("MACGrid", "MACGrid", "Grid<Vec3>");
+static const Pb::Register _R_130("MACGrid", "MACGrid", "Grid<Vec3>");
 template<> const char *Namify<MACGrid>::S = "MACGrid";
-static const Pb::Register _R_149("MACGrid", "MACGrid", MACGrid::_W_44);
-static const Pb::Register _R_150("MACGrid", "setBoundMAC", MACGrid::_W_45);
+static const Pb::Register _R_131("MACGrid", "MACGrid", MACGrid::_W_38);
+static const Pb::Register _R_132("MACGrid", "setBoundMAC", MACGrid::_W_39);
 #endif
 static const Pb::Register _R_7("GridType_TypeNone", 0);
 static const Pb::Register _R_8("GridType_TypeReal", 1);
@@ -273,24 +255,6 @@ void PbRegister_file_7()
   KEEP_UNUSED(_R_130);
   KEEP_UNUSED(_R_131);
   KEEP_UNUSED(_R_132);
-  KEEP_UNUSED(_R_133);
-  KEEP_UNUSED(_R_134);
-  KEEP_UNUSED(_R_135);
-  KEEP_UNUSED(_R_136);
-  KEEP_UNUSED(_R_137);
-  KEEP_UNUSED(_R_138);
-  KEEP_UNUSED(_R_139);
-  KEEP_UNUSED(_R_140);
-  KEEP_UNUSED(_R_141);
-  KEEP_UNUSED(_R_142);
-  KEEP_UNUSED(_R_143);
-  KEEP_UNUSED(_R_144);
-  KEEP_UNUSED(_R_145);
-  KEEP_UNUSED(_R_146);
-  KEEP_UNUSED(_R_147);
-  KEEP_UNUSED(_R_148);
-  KEEP_UNUSED(_R_149);
-  KEEP_UNUSED(_R_150);
 }
 }
 }  // namespace Manta