community/blender to 2.93.5-2

2025-01-17 23:34:07 +00:00 · 2021-10-11 05:22:26 +00:00 · 2021-10-11 05:22:26 +00:00 · 68cf99e738
commit 68cf99e738
parent 58e83eb19d
4 changed files with 2 additions and 241 deletions
--- a/community/blender/D8063-cuda11.diff
+++ b/community/blender/D8063-cuda11.diff
@ -1,105 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -375,7 +375,7 @@
- option(WITH_CYCLES_CUBIN_COMPILER   "Build cubins with nvrtc based compiler instead of nvcc" OFF)
- option(WITH_CYCLES_CUDA_BUILD_SERIAL "Build cubins one after another (useful on machines with limited RAM)" OFF)
- mark_as_advanced(WITH_CYCLES_CUDA_BUILD_SERIAL)
-set(CYCLES_CUDA_BINARIES_ARCH sm_30 sm_35 sm_37 sm_50 sm_52 sm_60 sm_61 sm_70 sm_75 CACHE STRING "CUDA architectures to build binaries for")
-+set(CYCLES_CUDA_BINARIES_ARCH sm_30 sm_35 sm_37 sm_50 sm_52 sm_60 sm_61 sm_70 sm_75 sm_80 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)
-diff --git a/build_files/cmake/config/blender_release.cmake b/build_files/cmake/config/blender_release.cmake
--- a/build_files/cmake/config/blender_release.cmake
-+++ b/build_files/cmake/config/blender_release.cmake
-@@ -52,7 +52,7 @@
- set(WITH_MEM_JEMALLOC          ON  CACHE BOOL "" FORCE)
- set(WITH_CYCLES_CUDA_BINARIES  ON  CACHE BOOL "" FORCE)
- set(WITH_CYCLES_CUBIN_COMPILER OFF CACHE BOOL "" FORCE)
-set(CYCLES_CUDA_BINARIES_ARCH sm_30;sm_35;sm_37;sm_50;sm_52;sm_60;sm_61;sm_70;sm_75 CACHE STRING "" FORCE)
-+set(CYCLES_CUDA_BINARIES_ARCH sm_30;sm_35;sm_37;sm_50;sm_52;sm_60;sm_61;sm_70;sm_75;sm_80 CACHE STRING "" FORCE)
- set(WITH_CYCLES_DEVICE_OPTIX   ON CACHE BOOL "" FORCE)
- 
- # platform dependent options
-diff --git a/intern/cycles/CMakeLists.txt b/intern/cycles/CMakeLists.txt
--- a/intern/cycles/CMakeLists.txt
-+++ b/intern/cycles/CMakeLists.txt
-@@ -313,7 +313,7 @@
-       set(MAX_MSVC 1910)
-     elseif(${CUDA_VERSION} EQUAL "9.1")
-       set(MAX_MSVC 1911)
-    elseif(${CUDA_VERSION} LESS "11.0")
-+    elseif(${CUDA_VERSION} LESS "12.0")
-       set(MAX_MSVC 1999)
-     endif()
-     if(NOT MSVC_VERSION LESS ${MAX_MSVC} OR CMAKE_C_COMPILER_ID MATCHES "Clang")
-diff --git a/intern/cycles/kernel/CMakeLists.txt b/intern/cycles/kernel/CMakeLists.txt
--- a/intern/cycles/kernel/CMakeLists.txt
-+++ b/intern/cycles/kernel/CMakeLists.txt
-@@ -485,8 +485,12 @@
-   foreach(arch ${CYCLES_CUDA_BINARIES_ARCH})
-     if(${arch} MATCHES "sm_2.")
-       message(STATUS "CUDA binaries for ${arch} are no longer supported, skipped.")
-+    elseif(${arch} MATCHES "sm_30" AND ${CUDA_VERSION} GREATER 109)
-+      message(STATUS "CUDA binaries for ${arch} are no longer supported, skipped.")
-     elseif(${arch} MATCHES "sm_7." AND ${CUDA_VERSION} LESS 100)
-       message(STATUS "CUDA binaries for ${arch} require CUDA 10.0+, skipped.")
-+    elseif(${arch} MATCHES "sm_8." AND ${CUDA_VERSION} LESS 110)
-+      message(STATUS "CUDA binaries for ${arch} require CUDA 11.0+, skipped.")
-     else()
-       # Compile regular kernel
-       CYCLES_CUDA_KERNEL_ADD(${arch} ${prev_arch} filter "" "${cuda_filter_sources}" FALSE)
-@@ -525,6 +529,11 @@
-       set(cuda_flags ${cuda_flags}
-         -D __KERNEL_DEBUG__)
-     endif()
-+    set(OPTIX_TARGET 30)
-+    if(${CUDA_VERSION} GREATER 109) #cuda 11
-+      set(OPTIX_TARGET 52)
-+    endif()
-+
-     if(WITH_CYCLES_CUBIN_COMPILER)
- 
-       # Needed to find libnvrtc-builtins.so. Can't do it from inside
-@@ -536,7 +545,6 @@
-         set(CUBIN_CC_ENV ${CMAKE_COMMAND}
-           -E env LD_LIBRARY_PATH="${CUDA_TOOLKIT_ROOT_DIR}/lib64")
-       endif()
-
-       add_custom_command(
-         OUTPUT ${output}
-         DEPENDS
-@@ -551,7 +559,7 @@
-           ${SRC_UTIL_HEADERS}
-         COMMAND ${CUBIN_CC_ENV}
-             "$<TARGET_FILE:cycles_cubin_cc>"
-            -target 30
-+            -target ${OPTIX_TARGET}
-             -ptx
-             -i ${CMAKE_CURRENT_SOURCE_DIR}/${input}
-             ${cuda_flags}
-@@ -575,7 +583,7 @@
-         COMMAND
-           ${CUDA_NVCC_EXECUTABLE}
-           --ptx
-          -arch=sm_30
-+          -arch=sm_${OPTIX_TARGET}
-           ${cuda_flags}
-           ${input}
-         WORKING_DIRECTORY
-diff --git a/intern/cycles/kernel/kernels/cuda/kernel_config.h b/intern/cycles/kernel/kernels/cuda/kernel_config.h
--- a/intern/cycles/kernel/kernels/cuda/kernel_config.h
-+++ b/intern/cycles/kernel/kernels/cuda/kernel_config.h
-@@ -70,8 +70,8 @@
- #  endif
- #  define CUDA_KERNEL_BRANCHED_MAX_REGISTERS 63
- 
-/* 7.x */
-#elif __CUDA_ARCH__ <= 799
-+/* 7.x / 8.x */
-+#elif __CUDA_ARCH__ <= 899
- #  define CUDA_MULTIPRESSOR_MAX_REGISTERS 65536
- #  define CUDA_MULTIPROCESSOR_MAX_BLOCKS 32
- #  define CUDA_BLOCK_MAX_THREADS 1024
-
--- a/community/blender/PKGBUILD
+++ b/community/blender/PKGBUILD
@ -15,7 +15,7 @@ buildarch=8

 pkgname=blender
 pkgver=2.93.5
-pkgrel=1
+pkgrel=2
 epoch=17
 pkgdesc="A fully integrated 3D graphics creation suite"
 arch=('x86_64')
@ -62,7 +62,7 @@ build() {

  local PYTHON_VER=3.9

-  cmake . \
+  cmake \
    -Bbuild \
    -GNinja \
    -Cbuild_files/cmake/config/blender_release.cmake \
--- a/community/blender/cuda11.patch
+++ b/community/blender/cuda11.patch
@ -1,91 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 76d2d578dc3..e0c83cb5e18 100644
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -375,7 +375,7 @@ option(WITH_CYCLES_CUDA_BINARIES    "Build Cycles CUDA binaries" OFF)
- option(WITH_CYCLES_CUBIN_COMPILER   "Build cubins with nvrtc based compiler instead of nvcc" OFF)
- option(WITH_CYCLES_CUDA_BUILD_SERIAL "Build cubins one after another (useful on machines with limited RAM)" OFF)
- mark_as_advanced(WITH_CYCLES_CUDA_BUILD_SERIAL)
-set(CYCLES_CUDA_BINARIES_ARCH sm_30 sm_35 sm_37 sm_50 sm_52 sm_60 sm_61 sm_70 sm_75 compute_75 CACHE STRING "CUDA architectures to build binaries for")
-+set(CYCLES_CUDA_BINARIES_ARCH sm_35 sm_37 sm_50 sm_52 sm_60 sm_61 sm_70 sm_75 compute_75 sm_80 compute_80 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)
-diff --git a/build_files/cmake/config/blender_release.cmake b/build_files/cmake/config/blender_release.cmake
-index c6aa359c82c..8d8bf109958 100644
--- a/build_files/cmake/config/blender_release.cmake
-+++ b/build_files/cmake/config/blender_release.cmake
-@@ -55,7 +55,7 @@ set(WITH_USD                 ON  CACHE BOOL "" FORCE)
- set(WITH_MEM_JEMALLOC          ON  CACHE BOOL "" FORCE)
- set(WITH_CYCLES_CUDA_BINARIES  ON  CACHE BOOL "" FORCE)
- set(WITH_CYCLES_CUBIN_COMPILER OFF CACHE BOOL "" FORCE)
-set(CYCLES_CUDA_BINARIES_ARCH sm_30;sm_35;sm_37;sm_50;sm_52;sm_60;sm_61;sm_70;sm_75;compute_75 CACHE STRING "" FORCE)
-+set(CYCLES_CUDA_BINARIES_ARCH sm_30;sm_35;sm_37;sm_50;sm_52;sm_60;sm_61;sm_70;sm_75;compute_75;sm_80;compute_80 CACHE STRING "" FORCE)
- set(WITH_CYCLES_DEVICE_OPTIX   ON CACHE BOOL "" FORCE)
- 
- # platform dependent options
-diff --git a/intern/cycles/CMakeLists.txt b/intern/cycles/CMakeLists.txt
-index e5a5e9773d3..1bc11953db2 100644
--- a/intern/cycles/CMakeLists.txt
-+++ b/intern/cycles/CMakeLists.txt
-@@ -314,7 +314,7 @@ if(WITH_CYCLES_CUDA_BINARIES AND (NOT WITH_CYCLES_CUBIN_COMPILER))
-       set(MAX_MSVC 1910)
-     elseif(${CUDA_VERSION} EQUAL "9.1")
-       set(MAX_MSVC 1911)
-    elseif(${CUDA_VERSION} LESS "11.0")
-+    elseif(${CUDA_VERSION} LESS "12.0")
-       set(MAX_MSVC 1999)
-     endif()
-     if(NOT MSVC_VERSION LESS ${MAX_MSVC} OR CMAKE_C_COMPILER_ID MATCHES "Clang")
-diff --git a/intern/cycles/kernel/CMakeLists.txt b/intern/cycles/kernel/CMakeLists.txt
-index db146226dc7..7993fb8c263 100644
--- a/intern/cycles/kernel/CMakeLists.txt
-+++ b/intern/cycles/kernel/CMakeLists.txt
-@@ -473,8 +473,12 @@ if(WITH_CYCLES_CUDA_BINARIES)
-   foreach(arch ${CYCLES_CUDA_BINARIES_ARCH})
-     if(${arch} MATCHES "sm_2.")
-       message(STATUS "CUDA binaries for ${arch} are no longer supported, skipped.")
-+    elseif(${arch} MATCHES "sm_30" AND ${CUDA_VERSION} GREATER 109)
-+      message(STATUS "CUDA binaries for ${arch} are no longer supported, skipped.")
-     elseif(${arch} MATCHES "sm_7." AND ${CUDA_VERSION} LESS 100)
-       message(STATUS "CUDA binaries for ${arch} require CUDA 10.0+, skipped.")
-+    elseif(${arch} MATCHES "sm_8." AND ${CUDA_VERSION} LESS 110)
-+      message(STATUS "CUDA binaries for ${arch} require CUDA 11.0+, skipped.")
-     else()
-       # Compile regular kernel
-       CYCLES_CUDA_KERNEL_ADD(${arch} ${prev_arch} filter "" "${cuda_filter_sources}" FALSE)
-@@ -513,6 +517,11 @@ if(WITH_CYCLES_DEVICE_OPTIX AND WITH_CYCLES_CUDA_BINARIES)
-       set(cuda_flags ${cuda_flags}
-         -D __KERNEL_DEBUG__)
-     endif()
-+    set(OPTIX_TARGET 30)
-+    if(${CUDA_VERSION} GREATER 109) #cuda 11
-+      set(OPTIX_TARGET 52)
-+    endif()
-+
-     if(WITH_CYCLES_CUBIN_COMPILER)
- 
-       # Needed to find libnvrtc-builtins.so. Can't do it from inside
-@@ -524,7 +533,6 @@ if(WITH_CYCLES_DEVICE_OPTIX AND WITH_CYCLES_CUDA_BINARIES)
-         set(CUBIN_CC_ENV ${CMAKE_COMMAND}
-           -E env LD_LIBRARY_PATH="${CUDA_TOOLKIT_ROOT_DIR}/lib64")
-       endif()
-
-       add_custom_command(
-         OUTPUT ${output}
-         DEPENDS
-diff --git a/intern/cycles/kernel/kernels/cuda/kernel_config.h b/intern/cycles/kernel/kernels/cuda/kernel_config.h
-index 3ec00762e72..8e650129d8b 100644
--- a/intern/cycles/kernel/kernels/cuda/kernel_config.h
-+++ b/intern/cycles/kernel/kernels/cuda/kernel_config.h
-@@ -70,8 +70,8 @@
- #  endif
- #  define CUDA_KERNEL_BRANCHED_MAX_REGISTERS 63
- 
-/* 7.x */
-#elif __CUDA_ARCH__ <= 799
-+/* 7.x / 8.x */
-+#elif __CUDA_ARCH__ <= 899
- #  define CUDA_MULTIPRESSOR_MAX_REGISTERS 65536
- #  define CUDA_MULTIPROCESSOR_MAX_BLOCKS 32
- #  define CUDA_BLOCK_MAX_THREADS 1024
--- a/community/blender/embree.patch
+++ b/community/blender/embree.patch
@ -1,43 +0,0 @@
-diff --git a/intern/cycles/blender/CMakeLists.txt b/intern/cycles/blender/CMakeLists.txt
-index d9a2ebf8571..f3b7d156024 100644
--- a/intern/cycles/blender/CMakeLists.txt
-+++ b/intern/cycles/blender/CMakeLists.txt
-@@ -66,6 +66,12 @@ if(WITH_CYCLES_LOGGING)
-   )
- endif()
- 
-+if(WITH_CYCLES_EMBREE)
-+  list(APPEND LIB
-+    ${EMBREE_LIBRARIES}
-+  )
-+endif()
-+
- set(ADDON_FILES
-   addon/__init__.py
-   addon/engine.py
-diff --git a/build_files/cmake/Modules/FindEmbree.cmake b/build_files/cmake/Modules/FindEmbree.cmake
-index d9d525d4586..03b509a28f3 100644
--- a/build_files/cmake/Modules/FindEmbree.cmake
-+++ b/build_files/cmake/Modules/FindEmbree.cmake
-@@ -72,7 +72,7 @@ ENDFOREACH()
- 
- FIND_LIBRARY(EMBREE_LIBRARY
-   NAMES
-    libembree3
-+    embree3
-   HINTS
-     ${_embree_SEARCH_DIRS}
-   PATH_SUFFIXES
-@@ -83,10 +83,10 @@ FIND_LIBRARY(EMBREE_LIBRARY
- # all listed variables are TRUE
- INCLUDE(FindPackageHandleStandardArgs)
- FIND_PACKAGE_HANDLE_STANDARD_ARGS(EMBREE DEFAULT_MSG
-    _embree_LIBRARIES EMBREE_INCLUDE_DIR)
-+    EMBREE_LIBRARY EMBREE_INCLUDE_DIR)
- 
- IF(EMBREE_FOUND)
-  SET(EMBREE_LIBRARIES ${_embree_LIBRARIES})
-+  SET(EMBREE_LIBRARIES ${EMBREE_LIBRARY})
-   SET(EMBREE_INCLUDE_DIRS ${EMBREE_INCLUDE_DIR})
- ENDIF(EMBREE_FOUND)
-