[arch-commits] Commit in blender/repos (6 files)

2021-09-13 Thread Konstantin Gizdov via arch-commits 
Date: Monday, September 13, 2021 @ 16:06:27
  Author: kgizdov
Revision: 1014701

archrelease: copy trunk to community-testing-x86_64

Added:
  blender/repos/community-testing-x86_64/
  blender/repos/community-testing-x86_64/D8063-cuda11.diff
(from rev 1014700, blender/trunk/D8063-cuda11.diff)
  blender/repos/community-testing-x86_64/PKGBUILD
(from rev 1014700, blender/trunk/PKGBUILD)
  blender/repos/community-testing-x86_64/blender-openexr3.patch
(from rev 1014700, blender/trunk/blender-openexr3.patch)
  blender/repos/community-testing-x86_64/cuda11.patch
(from rev 1014700, blender/trunk/cuda11.patch)
  blender/repos/community-testing-x86_64/embree.patch
(from rev 1014700, blender/trunk/embree.patch)

+
 D8063-cuda11.diff  |  105 +++
 PKGBUILD   |   89 +++
 blender-openexr3.patch |   42 ++
 cuda11.patch   |   91 
 embree.patch   |   43 +++
 5 files changed, 370 insertions(+)

Copied: blender/repos/community-testing-x86_64/D8063-cuda11.diff (from rev 
1014700, blender/trunk/D8063-cuda11.diff)
===
--- community-testing-x86_64/D8063-cuda11.diff  (rev 0)
+++ community-testing-x86_64/D8063-cuda11.diff  2021-09-13 16:06:27 UTC (rev 
1014701)
@@ -0,0 +1,105 @@
+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(
+

[arch-commits] Commit in blender/repos (6 files)

2021-09-05 Thread Sven-Hendrik Haase via arch-commits 
Date: Monday, September 6, 2021 @ 01:10:54
  Author: svenstaro
Revision: 1011844

archrelease: copy trunk to community-staging-x86_64

Added:
  blender/repos/community-staging-x86_64/
  blender/repos/community-staging-x86_64/D8063-cuda11.diff
(from rev 1011843, blender/trunk/D8063-cuda11.diff)
  blender/repos/community-staging-x86_64/PKGBUILD
(from rev 1011843, blender/trunk/PKGBUILD)
  blender/repos/community-staging-x86_64/blender-openexr3.patch
(from rev 1011843, blender/trunk/blender-openexr3.patch)
  blender/repos/community-staging-x86_64/cuda11.patch
(from rev 1011843, blender/trunk/cuda11.patch)
  blender/repos/community-staging-x86_64/embree.patch
(from rev 1011843, blender/trunk/embree.patch)

+
 D8063-cuda11.diff  |  105 +++
 PKGBUILD   |   90 
 blender-openexr3.patch |   42 ++
 cuda11.patch   |   91 
 embree.patch   |   43 +++
 5 files changed, 371 insertions(+)

Copied: blender/repos/community-staging-x86_64/D8063-cuda11.diff (from rev 
1011843, blender/trunk/D8063-cuda11.diff)
===
--- community-staging-x86_64/D8063-cuda11.diff  (rev 0)
+++ community-staging-x86_64/D8063-cuda11.diff  2021-09-06 01:10:54 UTC (rev 
1011844)
@@ -0,0 +1,105 @@
+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(
+

[arch-commits] Commit in blender/repos (6 files)

2021-08-16 Thread Konstantin Gizdov via arch-commits 
Date: Monday, August 16, 2021 @ 16:38:10
  Author: kgizdov
Revision: 1001056

archrelease: copy trunk to community-testing-x86_64

Added:
  blender/repos/community-testing-x86_64/
  blender/repos/community-testing-x86_64/D8063-cuda11.diff
(from rev 1001055, blender/trunk/D8063-cuda11.diff)
  blender/repos/community-testing-x86_64/PKGBUILD
(from rev 1001055, blender/trunk/PKGBUILD)
  blender/repos/community-testing-x86_64/blender-openexr3.patch
(from rev 1001055, blender/trunk/blender-openexr3.patch)
  blender/repos/community-testing-x86_64/cuda11.patch
(from rev 1001055, blender/trunk/cuda11.patch)
  blender/repos/community-testing-x86_64/embree.patch
(from rev 1001055, blender/trunk/embree.patch)

+
 D8063-cuda11.diff  |  105 +++
 PKGBUILD   |   90 
 blender-openexr3.patch |   42 ++
 cuda11.patch   |   91 
 embree.patch   |   43 +++
 5 files changed, 371 insertions(+)

Copied: blender/repos/community-testing-x86_64/D8063-cuda11.diff (from rev 
1001055, blender/trunk/D8063-cuda11.diff)
===
--- community-testing-x86_64/D8063-cuda11.diff  (rev 0)
+++ community-testing-x86_64/D8063-cuda11.diff  2021-08-16 16:38:10 UTC (rev 
1001056)
@@ -0,0 +1,105 @@
+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

[arch-commits] Commit in blender/repos (6 files)

2021-08-02 Thread Antonio Rojas via arch-commits 
Date: Monday, August 2, 2021 @ 21:07:55
  Author: arojas
Revision: 993112

archrelease: copy trunk to community-staging-x86_64

Added:
  blender/repos/community-staging-x86_64/
  blender/repos/community-staging-x86_64/D8063-cuda11.diff
(from rev 993110, blender/trunk/D8063-cuda11.diff)
  blender/repos/community-staging-x86_64/PKGBUILD
(from rev 993110, blender/trunk/PKGBUILD)
  blender/repos/community-staging-x86_64/blender-openexr3.patch
(from rev 993110, blender/trunk/blender-openexr3.patch)
  blender/repos/community-staging-x86_64/cuda11.patch
(from rev 993110, blender/trunk/cuda11.patch)
  blender/repos/community-staging-x86_64/embree.patch
(from rev 993110, blender/trunk/embree.patch)

+
 D8063-cuda11.diff  |  105 +++
 PKGBUILD   |   90 
 blender-openexr3.patch |   42 ++
 cuda11.patch   |   91 
 embree.patch   |   43 +++
 5 files changed, 371 insertions(+)

Copied: blender/repos/community-staging-x86_64/D8063-cuda11.diff (from rev 
993110, blender/trunk/D8063-cuda11.diff)
===
--- community-staging-x86_64/D8063-cuda11.diff  (rev 0)
+++ community-staging-x86_64/D8063-cuda11.diff  2021-08-02 21:07:55 UTC (rev 
993112)
@@ -0,0 +1,105 @@
+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}

[arch-commits] Commit in blender/repos (6 files)

2021-07-14 Thread Antonio Rojas via arch-commits 
Date: Wednesday, July 14, 2021 @ 19:53:53
  Author: arojas
Revision: 977114

archrelease: copy trunk to community-staging-x86_64

Added:
  blender/repos/community-staging-x86_64/
  blender/repos/community-staging-x86_64/D8063-cuda11.diff
(from rev 977113, blender/trunk/D8063-cuda11.diff)
  blender/repos/community-staging-x86_64/PKGBUILD
(from rev 977113, blender/trunk/PKGBUILD)
  blender/repos/community-staging-x86_64/blender-openexr3.patch
(from rev 977113, blender/trunk/blender-openexr3.patch)
  blender/repos/community-staging-x86_64/cuda11.patch
(from rev 977113, blender/trunk/cuda11.patch)
  blender/repos/community-staging-x86_64/embree.patch
(from rev 977113, blender/trunk/embree.patch)

+
 D8063-cuda11.diff  |  105 +++
 PKGBUILD   |   89 +++
 blender-openexr3.patch |   42 ++
 cuda11.patch   |   91 
 embree.patch   |   43 +++
 5 files changed, 370 insertions(+)

Copied: blender/repos/community-staging-x86_64/D8063-cuda11.diff (from rev 
977113, blender/trunk/D8063-cuda11.diff)
===
--- community-staging-x86_64/D8063-cuda11.diff  (rev 0)
+++ community-staging-x86_64/D8063-cuda11.diff  2021-07-14 19:53:53 UTC (rev 
977114)
@@ -0,0 +1,105 @@
+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}

[arch-commits] Commit in blender/repos (6 files)

2021-07-02 Thread Antonio Rojas via arch-commits 
Date: Friday, July 2, 2021 @ 18:48:41
  Author: arojas
Revision: 970928

archrelease: copy trunk to community-staging-x86_64

Added:
  blender/repos/community-staging-x86_64/
  blender/repos/community-staging-x86_64/D8063-cuda11.diff
(from rev 970927, blender/trunk/D8063-cuda11.diff)
  blender/repos/community-staging-x86_64/PKGBUILD
(from rev 970927, blender/trunk/PKGBUILD)
  blender/repos/community-staging-x86_64/blender-openexr3.patch
(from rev 970927, blender/trunk/blender-openexr3.patch)
  blender/repos/community-staging-x86_64/cuda11.patch
(from rev 970927, blender/trunk/cuda11.patch)
  blender/repos/community-staging-x86_64/embree.patch
(from rev 970927, blender/trunk/embree.patch)

+
 D8063-cuda11.diff  |  105 +++
 PKGBUILD   |   89 +++
 blender-openexr3.patch |   42 ++
 cuda11.patch   |   91 
 embree.patch   |   43 +++
 5 files changed, 370 insertions(+)

Copied: blender/repos/community-staging-x86_64/D8063-cuda11.diff (from rev 
970927, blender/trunk/D8063-cuda11.diff)
===
--- community-staging-x86_64/D8063-cuda11.diff  (rev 0)
+++ community-staging-x86_64/D8063-cuda11.diff  2021-07-02 18:48:41 UTC (rev 
970928)
@@ -0,0 +1,105 @@
+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}
+

[arch-commits] Commit in blender/repos (6 files)

2021-06-12 Thread Sven-Hendrik Haase via arch-commits 
Date: Sunday, June 13, 2021 @ 00:09:17
  Author: svenstaro
Revision: 963224

archrelease: copy trunk to community-testing-x86_64

Added:
  blender/repos/community-testing-x86_64/
  blender/repos/community-testing-x86_64/D8063-cuda11.diff
(from rev 963223, blender/trunk/D8063-cuda11.diff)
  blender/repos/community-testing-x86_64/PKGBUILD
(from rev 963223, blender/trunk/PKGBUILD)
  blender/repos/community-testing-x86_64/blender-openexr3.patch
(from rev 963223, blender/trunk/blender-openexr3.patch)
  blender/repos/community-testing-x86_64/cuda11.patch
(from rev 963223, blender/trunk/cuda11.patch)
  blender/repos/community-testing-x86_64/embree.patch
(from rev 963223, blender/trunk/embree.patch)

+
 D8063-cuda11.diff  |  105 +++
 PKGBUILD   |   89 +++
 blender-openexr3.patch |   42 ++
 cuda11.patch   |   91 
 embree.patch   |   43 +++
 5 files changed, 370 insertions(+)

Copied: blender/repos/community-testing-x86_64/D8063-cuda11.diff (from rev 
963223, blender/trunk/D8063-cuda11.diff)
===
--- community-testing-x86_64/D8063-cuda11.diff  (rev 0)
+++ community-testing-x86_64/D8063-cuda11.diff  2021-06-13 00:09:17 UTC (rev 
963224)
@@ -0,0 +1,105 @@
+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}

[arch-commits] Commit in blender/repos (6 files)

2021-06-08 Thread Felix Yan via arch-commits 
Date: Tuesday, June 8, 2021 @ 18:32:08
  Author: felixonmars
Revision: 959846

archrelease: copy trunk to community-staging-x86_64

Added:
  blender/repos/community-staging-x86_64/
  blender/repos/community-staging-x86_64/D8063-cuda11.diff
(from rev 959845, blender/trunk/D8063-cuda11.diff)
  blender/repos/community-staging-x86_64/PKGBUILD
(from rev 959845, blender/trunk/PKGBUILD)
  blender/repos/community-staging-x86_64/blender-openexr3.patch
(from rev 959845, blender/trunk/blender-openexr3.patch)
  blender/repos/community-staging-x86_64/cuda11.patch
(from rev 959845, blender/trunk/cuda11.patch)
  blender/repos/community-staging-x86_64/embree.patch
(from rev 959845, blender/trunk/embree.patch)

+
 D8063-cuda11.diff  |  105 +++
 PKGBUILD   |   89 +++
 blender-openexr3.patch |   42 ++
 cuda11.patch   |   91 
 embree.patch   |   43 +++
 5 files changed, 370 insertions(+)

Copied: blender/repos/community-staging-x86_64/D8063-cuda11.diff (from rev 
959845, blender/trunk/D8063-cuda11.diff)
===
--- community-staging-x86_64/D8063-cuda11.diff  (rev 0)
+++ community-staging-x86_64/D8063-cuda11.diff  2021-06-08 18:32:08 UTC (rev 
959846)
@@ -0,0 +1,105 @@
+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

[arch-commits] Commit in blender/repos (6 files)

2021-04-25 Thread Antonio Rojas via arch-commits 
Date: Sunday, April 25, 2021 @ 12:21:04
  Author: arojas
Revision: 924146

archrelease: copy trunk to community-staging-x86_64

Added:
  blender/repos/community-staging-x86_64/
  blender/repos/community-staging-x86_64/D8063-cuda11.diff
(from rev 924145, blender/trunk/D8063-cuda11.diff)
  blender/repos/community-staging-x86_64/PKGBUILD
(from rev 924145, blender/trunk/PKGBUILD)
  blender/repos/community-staging-x86_64/blender-openexr3.patch
(from rev 924145, blender/trunk/blender-openexr3.patch)
  blender/repos/community-staging-x86_64/cuda11.patch
(from rev 924145, blender/trunk/cuda11.patch)
  blender/repos/community-staging-x86_64/embree.patch
(from rev 924145, blender/trunk/embree.patch)

+
 D8063-cuda11.diff  |  105 +++
 PKGBUILD   |   89 +++
 blender-openexr3.patch |   42 ++
 cuda11.patch   |   91 
 embree.patch   |   43 +++
 5 files changed, 370 insertions(+)

Copied: blender/repos/community-staging-x86_64/D8063-cuda11.diff (from rev 
924145, blender/trunk/D8063-cuda11.diff)
===
--- community-staging-x86_64/D8063-cuda11.diff  (rev 0)
+++ community-staging-x86_64/D8063-cuda11.diff  2021-04-25 12:21:04 UTC (rev 
924146)
@@ -0,0 +1,105 @@
+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}
+

[arch-commits] Commit in blender/repos (6 files)

2021-02-16 Thread Konstantin Gizdov via arch-commits 
Date: Tuesday, February 16, 2021 @ 09:15:17
  Author: kgizdov
Revision: 862269

archrelease: copy trunk to community-testing-x86_64

Added:
  blender/repos/community-testing-x86_64/
  blender/repos/community-testing-x86_64/D8063-cuda11.diff
(from rev 862268, blender/trunk/D8063-cuda11.diff)
  blender/repos/community-testing-x86_64/PKGBUILD
(from rev 862268, blender/trunk/PKGBUILD)
  blender/repos/community-testing-x86_64/cuda11.patch
(from rev 862268, blender/trunk/cuda11.patch)
  blender/repos/community-testing-x86_64/embree.patch
(from rev 862268, blender/trunk/embree.patch)
  blender/repos/community-testing-x86_64/gltf-import-fix.patch
(from rev 862268, blender/trunk/gltf-import-fix.patch)

---+
 D8063-cuda11.diff |  105 
 PKGBUILD  |   90 +
 cuda11.patch  |   91 +
 embree.patch  |   43 +++
 gltf-import-fix.patch |   11 +
 5 files changed, 340 insertions(+)

Copied: blender/repos/community-testing-x86_64/D8063-cuda11.diff (from rev 
862268, blender/trunk/D8063-cuda11.diff)
===
--- community-testing-x86_64/D8063-cuda11.diff  (rev 0)
+++ community-testing-x86_64/D8063-cuda11.diff  2021-02-16 09:15:17 UTC (rev 
862269)
@@ -0,0 +1,105 @@
+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}
+