diff options
| -rw-r--r-- | .SRCINFO | 3 | ||||
| -rw-r--r-- | PKGBUILD | 7 | ||||
| -rw-r--r-- | disable_cuda.patch | 94 |
3 files changed, 102 insertions, 2 deletions
@@ -32,6 +32,7 @@ pkgbase = luxcorerender source = boost107400.patch source = cpplib.patch source = clang.patch + source = disable_cuda.patch sha256sums = eed186b4ff8002c1e29d882751e42f7a7d66cd622054f7f031a32d6688b5c1c7 sha256sums = f639fb7e31056b6c7214e303c90fe06665572ffafc11e545f7c05128a8d85dc4 sha256sums = 4e04c3eb653f00d2389aff8e7fda2d244e258cbca3a22e32c13388a3984e4bb1 @@ -39,6 +40,7 @@ pkgbase = luxcorerender sha256sums = 8a8a681cce3a3ff39536cb0cbfefed8ed61887665ce1f4b101b3a222a1da50f6 sha256sums = 7203f773f94d632923a992824c66741a64f07a07fad932f5623ac9a257aa73a5 sha256sums = ea4b15887c12931f34f01079ec3e0ff4c14d70b73b42dbc81140e7e19776bcc7 + sha256sums = 1d2cf6114e11fd707c72b6dd42ac93f8912c5d3a1963f931395afca5bca32d7b b2sums = 0ce686271e6c04e9381e587fe083c86bb54a10bb6c85fa5796ebf8ae0f19c954f79699bac3c9517913a3702f7275ca9821f39322328e03ccd88d979cc508798a b2sums = 348fa445b9ac7f738461543f8adadbb9a93dc2f75d96d0d26acbf7168290a0621224d6f11b3af77a6c6e492ae089e57770fc02a987af0748f5bb3e73b8d90f54 b2sums = 2903992389c61fc4720cde8a011d0b637de647a7c9e701609968c01a8ab904277dfb27a90179d4cfcf98382973542e59d1384580236c25f6568aaa7b6ba90528 @@ -46,6 +48,7 @@ pkgbase = luxcorerender b2sums = 04d1e78d044666720a9a099a9b95426ea06fe076354698f642a1a24df25bc27a033e6823a56cbdc21b695cba0e71446f4278c9a1474dba2cfa6aa91945950266 b2sums = 1985ee3dbd596cf7ac4a3041b395792733d59c95de4226dc54ff33887db4ec4adc0ef877d294cf66da2926eb025166397fdf6ceb76bfd280932e3ecd9ae716ec b2sums = a11fa313592ce3fb3d0c59deb3bfcec4209697626e830e0b89a398a4f1a97e47c41c39ed29f164902f183dbace7232378641f3dd43e7a7bdf84e787d043c9590 + b2sums = 4fdcfcc0a14d553c1ff4bff0f5f805ec21ad1a3f120a809f712074a6b1a2070a889061aa76f8c43e1e654b66e6cfb93fe24b4ecf23f931d7ea0a352ae62453f2 pkgname = luxcorerender @@ -39,6 +39,7 @@ source=("https://github.com/LuxCoreRender/LuxCore/archive/${pkgname}_v${_pkgver} "boost107400.patch" "cpplib.patch" "clang.patch" + "disable_cuda.patch" # ::https://github.com/LuxCoreRender/LuxCore/commit/55b64c719a14957c40019bd51ded3ee4931e588d.patch ) sha256sums=('eed186b4ff8002c1e29d882751e42f7a7d66cd622054f7f031a32d6688b5c1c7' 'f639fb7e31056b6c7214e303c90fe06665572ffafc11e545f7c05128a8d85dc4' @@ -46,14 +47,16 @@ sha256sums=('eed186b4ff8002c1e29d882751e42f7a7d66cd622054f7f031a32d6688b5c1c7' 'aec4cb388ed25944ef64abc8bd1dbcaa2da989ac0cf06acc026c1f82a817fa92' '8a8a681cce3a3ff39536cb0cbfefed8ed61887665ce1f4b101b3a222a1da50f6' '7203f773f94d632923a992824c66741a64f07a07fad932f5623ac9a257aa73a5' - 'ea4b15887c12931f34f01079ec3e0ff4c14d70b73b42dbc81140e7e19776bcc7') + 'ea4b15887c12931f34f01079ec3e0ff4c14d70b73b42dbc81140e7e19776bcc7' + '1d2cf6114e11fd707c72b6dd42ac93f8912c5d3a1963f931395afca5bca32d7b') b2sums=('0ce686271e6c04e9381e587fe083c86bb54a10bb6c85fa5796ebf8ae0f19c954f79699bac3c9517913a3702f7275ca9821f39322328e03ccd88d979cc508798a' '348fa445b9ac7f738461543f8adadbb9a93dc2f75d96d0d26acbf7168290a0621224d6f11b3af77a6c6e492ae089e57770fc02a987af0748f5bb3e73b8d90f54' '2903992389c61fc4720cde8a011d0b637de647a7c9e701609968c01a8ab904277dfb27a90179d4cfcf98382973542e59d1384580236c25f6568aaa7b6ba90528' '67cf563120070fc675618bdc4da8b8b224bea42c50ac8aabbd3d6b254b4189f330d0f93678f02cd96748a1bb1560f5275ed4fb0c9b2066f67761027343da86ec' '04d1e78d044666720a9a099a9b95426ea06fe076354698f642a1a24df25bc27a033e6823a56cbdc21b695cba0e71446f4278c9a1474dba2cfa6aa91945950266' '1985ee3dbd596cf7ac4a3041b395792733d59c95de4226dc54ff33887db4ec4adc0ef877d294cf66da2926eb025166397fdf6ceb76bfd280932e3ecd9ae716ec' - 'a11fa313592ce3fb3d0c59deb3bfcec4209697626e830e0b89a398a4f1a97e47c41c39ed29f164902f183dbace7232378641f3dd43e7a7bdf84e787d043c9590') + 'a11fa313592ce3fb3d0c59deb3bfcec4209697626e830e0b89a398a4f1a97e47c41c39ed29f164902f183dbace7232378641f3dd43e7a7bdf84e787d043c9590' + '4fdcfcc0a14d553c1ff4bff0f5f805ec21ad1a3f120a809f712074a6b1a2070a889061aa76f8c43e1e654b66e6cfb93fe24b4ecf23f931d7ea0a352ae62453f2') prepare() { for patch in "${srcdir}"/*.patch; do diff --git a/disable_cuda.patch b/disable_cuda.patch new file mode 100644 index 000000000000..0c88f145a1d9 --- /dev/null +++ b/disable_cuda.patch @@ -0,0 +1,94 @@ +From 55b64c719a14957c40019bd51ded3ee4931e588d Mon Sep 17 00:00:00 2001 +From: David Bucciarelli <dade916@gmail.com> +Date: Thu, 10 Dec 2020 11:50:13 +0100 +Subject: [PATCH] Fixed compilation when CUDA is disabled but OpenCL is still + enabled + +--- + cmake/SpecializedConfig/Config_Dade.cmake | 2 +- + src/luxcore/luxcore.cpp | 4 +++- + src/slg/engines/oclrenderengine.cpp | 4 +++- + src/slg/engines/pathoclbase/pathoclbase.cpp | 2 ++ + 5 files changed, 10 insertions(+), 3 deletions(-) + +diff --git a/cmake/SpecializedConfig/Config_Dade.cmake b/cmake/SpecializedConfig/Config_Dade.cmake +index c44da9f79..451e5eed6 100644 +--- a/cmake/SpecializedConfig/Config_Dade.cmake ++++ b/cmake/SpecializedConfig/Config_Dade.cmake +@@ -21,7 +21,7 @@ SET(CMAKE_LIBRARY_PATH "/home/david/projects/luxcorerender/LinuxCompile/target-6 + SET(Blosc_USE_STATIC_LIBS "ON") + + # Note: CUDA requires to have enabled OpenCL support too +-#SET(LUXRAYS_DISABLE_CUDA TRUE) ++SET(LUXRAYS_DISABLE_CUDA TRUE) + #SET(LUXRAYS_DISABLE_OPENCL TRUE) + #SET(BUILD_LUXCORE_DLL TRUE) + +diff --git a/src/luxcore/luxcore.cpp b/src/luxcore/luxcore.cpp +index 869141ab3..334a327f6 100644 +--- a/src/luxcore/luxcore.cpp ++++ b/src/luxcore/luxcore.cpp +@@ -202,7 +202,8 @@ Properties luxcore::GetOpenCLDeviceDescs() { + Property(prefix + ".maxmemoryallocsize")((unsigned long long)desc->GetMaxMemoryAllocSize()) << + Property(prefix + ".localmemory")((unsigned long long)deviceLocalMem) << + Property(prefix + ".constmemory")((unsigned long long)deviceConstMem); +- ++ ++#if !defined(LUXRAYS_DISABLE_CUDA) + if (desc->GetType() & DEVICE_TYPE_CUDA_ALL) { + const CUDADeviceDescription *cudaDesc = (CUDADeviceDescription *)desc; + +@@ -210,6 +211,7 @@ Properties luxcore::GetOpenCLDeviceDescs() { + Property(prefix + ".cuda.compute.major")(cudaDesc->GetCUDAComputeCapabilityMajor()) << + Property(prefix + ".cuda.compute.minor")(cudaDesc->GetCUDAComputeCapabilityMinor()); + } ++#endif + } + #endif + +diff --git a/src/slg/engines/oclrenderengine.cpp b/src/slg/engines/oclrenderengine.cpp +index 2d283a421..7b21cd7cf 100644 +--- a/src/slg/engines/oclrenderengine.cpp ++++ b/src/slg/engines/oclrenderengine.cpp +@@ -113,11 +113,12 @@ OCLRenderEngine::OCLRenderEngine(const RenderConfig *rcfg, + } + } + ++#if !defined(LUXRAYS_DISABLE_CUDA) + if (!haveSelectionString && hasCUDADevice) { + // If there is, at least, a CUDA device available, use only CUDA devices + DeviceDescription::Filter(DEVICE_TYPE_CUDA_ALL, selectedDeviceDescs); + } +- ++ + // Enable/Disable Optix according cuda.optix.devices.select string + if ((cudaDeviceCount > 0) && (cudaOptixDeviceConfig.length() > 0)) { + size_t cudaDeviceIndex = 0; +@@ -139,6 +140,7 @@ OCLRenderEngine::OCLRenderEngine(const RenderConfig *rcfg, + } + } + } ++#endif + + oclRenderThreadCount = selectedDeviceDescs.size(); + #endif +diff --git a/src/slg/engines/pathoclbase/pathoclbase.cpp b/src/slg/engines/pathoclbase/pathoclbase.cpp +index 029538fba..783c4f4a2 100644 +--- a/src/slg/engines/pathoclbase/pathoclbase.cpp ++++ b/src/slg/engines/pathoclbase/pathoclbase.cpp +@@ -68,6 +68,7 @@ PathOCLBaseRenderEngine::PathOCLBaseRenderEngine(const RenderConfig *rcfg, + // Add CUDA devices + //-------------------------------------------------------------------------- + ++#if !defined(LUXRAYS_DISABLE_CUDA) + SLG_LOG("CUDA devices used:"); + for (size_t i = 0; i < devs.size(); ++i) { + if (devs[i]->GetDeviceDesc()->GetType() & DEVICE_TYPE_CUDA_ALL) { +@@ -84,6 +85,7 @@ PathOCLBaseRenderEngine::PathOCLBaseRenderEngine(const RenderConfig *rcfg, + hwDev->SetAdditionalCompileOpts(compileOpts); + } + } ++#endif + + //-------------------------------------------------------------------------- + // Add OpenCL devices |