RH-91240: crash on Rhino exit.

Disable OneAPI and SYCL8.

Also:

* make build script defensive
  * stop on PS errors
  * ask for confirmation before deleting
* properly get debug version of openvdb when building
  debug build

Author: jesterKing

build_all_cycles.ps1

@@ -1,3 +1,5 @@
+$ErrorActionPreference = 'Stop'
+
 $cwd = $PSScriptRoot
 
 $configs = @('Debug', 'Release')
@@ -13,14 +15,13 @@ foreach($buildConfig in $configs)
     $biglibs_location = (Convert-Path "$cwd\..\..\..\..\..\..\big_libs\RhinoCycles")
     $biglibs_kernel_location = (Convert-Path "$biglibs_location\lib")
     $biglibs_source_location = (Convert-Path "$biglibs_location\ccycles\source")
+    New-Item -Type Directory -Force "$biglibs_location\ccycles\win\$lowerconfig"
     $biglibs_dll_location = (Convert-Path "$biglibs_location\ccycles\win\$lowerconfig")
     $local_build = (Convert-Path "$cwd\build_$lowerconfig")
     $local_install = (Convert-Path "$cwd\install_$lowerconfig")
     $local_install_release = (Convert-Path "$cwd\install_release")
     $local_install_debug = (Convert-Path "$cwd\install_debug")
 
-    #Remove-Item -Recurse -Force .\install
-
     Push-Location $cwd
 
     .\make_rhino.bat $lowerconfig all
@@ -88,15 +89,6 @@ foreach($buildConfig in $configs)
             $_.Name.ToLower() -notmatch 'o_2' `
             -and $_.Name.ToLower() -notmatch 'loader.dll'
         }
-        # add back openvdb, since that is always linked as openvdb.dll
-        $openvdb = (Convert-Path "$local_install_release\ccycles\openvdb.dll")
-        $dependencies += Get-Item $openvdb
-        # also need tbb12.dll
-        $tbb12 = (Convert-Path "$local_install_release\ccycles\tbb12.dll")
-        $dependencies += Get-Item $tbb12
-        # and OpenColorIO_d_2_4.dll
-        $oiio = (Convert-Path "$local_install_release\ccycles\OpenColorIO_d_2_4.dll")
-        $dependencies += Get-Item $oiio
     }
     else {
         $dependencies = $deps | Where-Object {
@@ -107,12 +99,12 @@ foreach($buildConfig in $configs)
         }
     }
 
-    Remove-Item -Recurse -Force "$biglibs_kernel_location\*"
+    Remove-Item -Confirm -Recurse -Force "$biglibs_kernel_location\*"
     Copy-Item -Recurse -Force "$local_install\lib\*" "$biglibs_kernel_location\."
-    Remove-Item -Recurse -Force "$biglibs_source_location\*"
+    Remove-Item -Confirm -Recurse -Force "$biglibs_source_location\*"
     Copy-Item -Recurse -Force "$local_install\source\*" "$biglibs_source_location\."
 
-    Remove-Item -Recurse -Force "$biglibs_dll_location\*"
+    Remove-Item -Confirm -Recurse -Force "$biglibs_dll_location\*"
     foreach($dependency in $dependencies)
     {
         Write-Host "${buildConfig}: Copying $dependency"

make_rhino.bat

@@ -49,10 +49,10 @@ if not "%ARG1%" == "cudabin" (
 	)
 )
 
-set BUILDING_ONEAPI="Yes"
+set BUILDING_ONEAPI="No"
 set BUILD_ONEAPI_CMD= ^
-	-DWITH_CYCLES_DEVICE_ONEAPI=ON ^
-	-DWITH_CYCLES_ONEAPI_BINARIES=ON ^
+	-DWITH_CYCLES_DEVICE_ONEAPI=OFF ^
+	-DWITH_CYCLES_ONEAPI_BINARIES=OFF ^
 	-DMSVC_REDIST_DIR=%MSVC_REDIST_DIR% ^
 	-DLEVEL_ZERO_INCLUDE_DIR=%LEVELZERO_INC% ^
 	-DLEVEL_ZERO_LIBRARY=%LEVELZERO_LIB% ^
@@ -104,6 +104,7 @@ echo BUILDING CONFIG %CONFIG%
 if "%BUILDING%" == "Yes" (
 	cmake -G Ninja -DCMAKE_BUILD_TYPE=%CONFIG% -B %BUILD_DIR% ^
 	-DCMAKE_INSTALL_PREFIX=%INSTALL_DIR% ^
+	-DWITH_CYCLES_DEVICE_ONEAPI=OFF ^
 	-DWITH_CYCLES_ALEMBIC=OFF ^
 	-DWITH_CYCLES_USD=OFF ^
 	-DWITH_CYCLES_OSL=OFF ^
@@ -116,7 +117,6 @@ if "%BUILDING%" == "Yes" (
 	-DCUDA_NVCC_FLAGS=--allow-unsupported-compiler ^
 	%BUILD_CUDA_CMD% ^
 	%BUILD_CUDABIN_CMD% ^
-	%BUILD_ONEAPI_CMD% ^
 	%BUILD_HIP_CMD% ^
 	&& cd %BUILD_DIR% && cmake --build . --target install --config %CONFIG%
 ) else if "%COMMAND%" == "clean" (

src/ccycles/CMakeLists.txt

@@ -45,6 +45,15 @@ if(WITH_CYCLES_OSL)
   list(APPEND LIB cycles_kernel_osl)
 endif()
 
+if(WITH_CYCLES_DEVICE_ONEAPI)
+  list(APPEND LIB
+    ${SYCL_LIBRARIES}
+  )
+  list(APPEND INC_SYS
+    ${SYCL_INCLUDE_DIR}
+  )
+endif()
+
 if(CYCLES_STANDALONE_REPOSITORY)
   list(APPEND LIB extern_sky)
 else()

src/ccycles/ccycles.cpp

@@ -721,6 +721,10 @@ CCL_CAPI void cycles_initialise(unsigned int mask)
     }
 }
 
+CCL_CAPI void cycles_shutdown()
+{
+}
+
 CCL_CAPI unsigned int cycles_number_devices()
 {
     return static_cast<unsigned int>(devices.size());

src/ccycles/internal_types.h

@@ -82,6 +82,10 @@ namespace fs = std::filesystem;
 #include <OpenImageIO/imagebufalgo.h>
 #include <OpenImageIO/ustring.h>
 
+#if WITH_ONEAPI
+#include <sycl/sycl.hpp>
+#endif
+
 using OIIO::ustring;
 
 #pragma warning ( pop )

src/cmake/Modules/FindOpenVDB.cmake

@@ -38,6 +38,16 @@ find_path(OPENVDB_INCLUDE_DIR
     include
 )
 
+if(CMAKE_BUILD_TYPE STREQUAL "Debug")
+find_library(OPENVDB_LIBRARY
+  NAMES
+    openvdb_d
+  HINTS
+    ${_openvdb_SEARCH_DIRS}
+  PATH_SUFFIXES
+    lib64 lib
+)
+else()
 find_library(OPENVDB_LIBRARY
   NAMES
     openvdb
@@ -46,6 +56,7 @@ find_library(OPENVDB_LIBRARY
   PATH_SUFFIXES
     lib64 lib
 )
+endif()
 
 # handle the QUIETLY and REQUIRED arguments and set OPENVDB_FOUND to TRUE if
 # all listed variables are TRUE

src/cmake/external_libs.cmake

@@ -78,7 +78,12 @@ else()
   message(FATAL_ERROR "Unsupported platform for Rhino")
 endif()
 
-set(_cycles_lib_dir "${_top_source_dir}/${_cycles_lib_platform}")
+string(TOLOWER ${CMAKE_BUILD_TYPE} _build_config)
+if(_build_config STREQUAL "relwithdebinfo")
+    set(_build_config "release")
+endif()
+
+set(_cycles_lib_dir "${_top_source_dir}${_cycles_lib_platform}/${_build_config}")
 
 # Use legacy libraries for compatibility with Houdini or USD without oneTBB.
 set(_cycles_lib_dir_legacy "${_top_source_dir}/lib/legacy/${_cycles_lib_platform}")

src/kernel/CMakeLists.txt

@@ -470,6 +470,8 @@ if(WITH_CYCLES_CUDA_BINARIES)
   string(REGEX REPLACE ".*release ([0-9]+)\\.([0-9]+).*" "\\2" CUDA_VERSION_MINOR "${NVCC_OUT}")
   set(CUDA_VERSION "${CUDA_VERSION_MAJOR}${CUDA_VERSION_MINOR}")
 
+  message(STATUS "have ${CUDA_NVCC_EXECUTABLE} and ${CUDAVERSION}")
+
   # warn for other versions
   if((CUDA_VERSION STREQUAL "101") OR
      (CUDA_VERSION STREQUAL "102") OR