[arch-commits] Commit in blender/repos/community-x86_64 (10 files)

2021-10-06 Thread Sven-Hendrik Haase via arch-commits 
Date: Wednesday, October 6, 2021 @ 15:02:43
  Author: svenstaro
Revision: 1027854

archrelease: copy trunk to community-x86_64

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

+
 D8063-cuda11.diff  |  210 +++
 PKGBUILD   |  178 +++
 blender-openexr3.patch |   84 +-
 cuda11.patch   |  182 
 embree.patch   |   86 +--
 5 files changed, 370 insertions(+), 370 deletions(-)

Deleted: D8063-cuda11.diff
===
--- D8063-cuda11.diff   2021-10-06 15:02:29 UTC (rev 1027853)
+++ D8063-cuda11.diff   2021-10-06 15:02:43 UTC (rev 1027854)
@@ -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()

[arch-commits] Commit in blender/repos/community-x86_64 (10 files)

2021-09-01 Thread Frederik Schwan via arch-commits 
Date: Wednesday, September 1, 2021 @ 18:45:16
  Author: freswa
Revision: 1010343

archrelease: copy trunk to community-x86_64

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

+
 D8063-cuda11.diff  |  210 +++
 PKGBUILD   |  180 
 blender-openexr3.patch |   84 +-
 cuda11.patch   |  182 
 embree.patch   |   86 +--
 5 files changed, 371 insertions(+), 371 deletions(-)

Deleted: D8063-cuda11.diff
===
--- D8063-cuda11.diff   2021-09-01 18:45:11 UTC (rev 1010342)
+++ D8063-cuda11.diff   2021-09-01 18:45:16 UTC (rev 1010343)
@@ -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()

[arch-commits] Commit in blender/repos/community-x86_64 (10 files)

2021-08-23 Thread Sven-Hendrik Haase via arch-commits 
Date: Monday, August 23, 2021 @ 15:00:41
  Author: svenstaro
Revision: 1004387

archrelease: copy trunk to community-x86_64

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

+
 D8063-cuda11.diff  |  210 +++
 PKGBUILD   |  180 
 blender-openexr3.patch |   84 +-
 cuda11.patch   |  182 
 embree.patch   |   86 +--
 5 files changed, 371 insertions(+), 371 deletions(-)

Deleted: D8063-cuda11.diff
===
--- D8063-cuda11.diff   2021-08-23 15:00:28 UTC (rev 1004386)
+++ D8063-cuda11.diff   2021-08-23 15:00:41 UTC (rev 1004387)
@@ -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()
--

[arch-commits] Commit in blender/repos/community-x86_64 (10 files)

2021-07-23 Thread Kpcyrd via arch-commits 
Date: Friday, July 23, 2021 @ 13:36:37
  Author: kpcyrd
Revision: 984495

archrelease: copy trunk to community-x86_64

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

+
 D8063-cuda11.diff  |  210 +++
 PKGBUILD   |  179 
 blender-openexr3.patch |   84 +-
 cuda11.patch   |  182 
 embree.patch   |   86 +--
 5 files changed, 371 insertions(+), 370 deletions(-)

Deleted: D8063-cuda11.diff
===
--- D8063-cuda11.diff   2021-07-23 13:36:32 UTC (rev 984494)
+++ D8063-cuda11.diff   2021-07-23 13:36:37 UTC (rev 984495)
@@ -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()
--
-

[arch-commits] Commit in blender/repos/community-x86_64 (10 files)

2021-07-20 Thread Sven-Hendrik Haase via arch-commits 
Date: Tuesday, July 20, 2021 @ 17:06:12
  Author: svenstaro
Revision: 980356

archrelease: copy trunk to community-x86_64

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

+
 D8063-cuda11.diff  |  210 +++
 PKGBUILD   |  178 +++
 blender-openexr3.patch |   84 +-
 cuda11.patch   |  182 
 embree.patch   |   86 +--
 5 files changed, 370 insertions(+), 370 deletions(-)

Deleted: D8063-cuda11.diff
===
--- D8063-cuda11.diff   2021-07-20 17:06:05 UTC (rev 980355)
+++ D8063-cuda11.diff   2021-07-20 17:06:12 UTC (rev 980356)
@@ -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()
--
-

[arch-commits] Commit in blender/repos/community-x86_64 (10 files)

2021-06-20 Thread Sven-Hendrik Haase via arch-commits 
Date: Sunday, June 20, 2021 @ 21:48:17
  Author: svenstaro
Revision: 966084

archrelease: copy trunk to community-x86_64

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

+
 D8063-cuda11.diff  |  210 +++
 PKGBUILD   |  178 +++
 blender-openexr3.patch |   84 +-
 cuda11.patch   |  182 
 embree.patch   |   86 +--
 5 files changed, 370 insertions(+), 370 deletions(-)

Deleted: D8063-cuda11.diff
===
--- D8063-cuda11.diff   2021-06-20 21:48:03 UTC (rev 966083)
+++ D8063-cuda11.diff   2021-06-20 21:48:17 UTC (rev 966084)
@@ -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()
--
-

[arch-commits] Commit in blender/repos/community-x86_64 (10 files)

2021-06-06 Thread Sven-Hendrik Haase via arch-commits 
Date: Sunday, June 6, 2021 @ 21:35:29
  Author: svenstaro
Revision: 956398

archrelease: copy trunk to community-x86_64

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

+
 D8063-cuda11.diff  |  210 +++
 PKGBUILD   |  178 +++
 blender-openexr3.patch |   84 +-
 cuda11.patch   |  182 
 embree.patch   |   86 +--
 5 files changed, 370 insertions(+), 370 deletions(-)

Deleted: D8063-cuda11.diff
===
--- D8063-cuda11.diff   2021-06-06 21:35:22 UTC (rev 956397)
+++ D8063-cuda11.diff   2021-06-06 21:35:29 UTC (rev 956398)
@@ -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()
--
-

[arch-commits] Commit in blender/repos/community-x86_64 (10 files)

2021-06-05 Thread Sven-Hendrik Haase via arch-commits 
Date: Saturday, June 5, 2021 @ 08:30:24
  Author: svenstaro
Revision: 955989

archrelease: copy trunk to community-x86_64

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

+
 D8063-cuda11.diff  |  210 +++
 PKGBUILD   |  178 +++
 blender-openexr3.patch |   84 +-
 cuda11.patch   |  182 
 embree.patch   |   86 +--
 5 files changed, 370 insertions(+), 370 deletions(-)

Deleted: D8063-cuda11.diff
===
--- D8063-cuda11.diff   2021-06-05 08:30:00 UTC (rev 955988)
+++ D8063-cuda11.diff   2021-06-05 08:30:24 UTC (rev 955989)
@@ -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()
--
-

[arch-commits] Commit in blender/repos/community-x86_64 (10 files)

2021-02-18 Thread Sven-Hendrik Haase via arch-commits 
Date: Thursday, February 18, 2021 @ 11:26:22
  Author: svenstaro
Revision: 864030

archrelease: copy trunk to community-x86_64

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

---+
 D8063-cuda11.diff |  210 
 PKGBUILD  |  180 -
 cuda11.patch  |  182 -
 embree.patch  |   86 +--
 gltf-import-fix.patch |   22 ++---
 5 files changed, 340 insertions(+), 340 deletions(-)

Deleted: D8063-cuda11.diff
===
--- D8063-cuda11.diff   2021-02-18 11:26:15 UTC (rev 864029)
+++ D8063-cuda11.diff   2021-02-18 11:26:22 UTC (rev 864030)
@@ -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()
--
-

[arch-commits] Commit in blender/repos/community-x86_64 (10 files)

2021-01-31 Thread Sven-Hendrik Haase via arch-commits 
Date: Monday, February 1, 2021 @ 04:36:10
  Author: svenstaro
Revision: 839291

archrelease: copy trunk to community-x86_64

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

---+
 D8063-cuda11.diff |  210 
 PKGBUILD  |  180 -
 cuda11.patch  |  182 -
 embree.patch  |   86 +--
 gltf-import-fix.patch |   22 ++---
 5 files changed, 340 insertions(+), 340 deletions(-)

Deleted: D8063-cuda11.diff
===
--- D8063-cuda11.diff   2021-02-01 04:36:05 UTC (rev 839290)
+++ D8063-cuda11.diff   2021-02-01 04:36:10 UTC (rev 839291)
@@ -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()
--
-

[arch-commits] Commit in blender/repos/community-x86_64 (10 files)

2021-01-26 Thread Sven-Hendrik Haase via arch-commits 
Date: Tuesday, January 26, 2021 @ 22:17:04
  Author: svenstaro
Revision: 831061

archrelease: copy trunk to community-x86_64

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

---+
 D8063-cuda11.diff |  210 
 PKGBUILD  |  177 
 cuda11.patch  |  182 -
 embree.patch  |   86 +--
 gltf-import-fix.patch |   22 ++---
 5 files changed, 340 insertions(+), 337 deletions(-)

Deleted: D8063-cuda11.diff
===
--- D8063-cuda11.diff   2021-01-26 22:16:56 UTC (rev 831060)
+++ D8063-cuda11.diff   2021-01-26 22:17:04 UTC (rev 831061)
@@ -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()
--
-

[arch-commits] Commit in blender/repos/community-x86_64 (10 files)

2021-01-20 Thread Sven-Hendrik Haase via arch-commits 
Date: Wednesday, January 20, 2021 @ 16:46:00
  Author: svenstaro
Revision: 823973

archrelease: copy trunk to community-x86_64

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

---+
 D8063-cuda11.diff |  210 
 PKGBUILD  |  174 +++
 cuda11.patch  |  182 -
 embree.patch  |   86 +--
 gltf-import-fix.patch |   22 ++---
 5 files changed, 337 insertions(+), 337 deletions(-)

Deleted: D8063-cuda11.diff
===
--- D8063-cuda11.diff   2021-01-20 16:45:52 UTC (rev 823972)
+++ D8063-cuda11.diff   2021-01-20 16:46:00 UTC (rev 823973)
@@ -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()
--
-