From d7b99389ba97d2561e01e79d2abfe14703121dbf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Herrmann?= Date: Sun, 23 Jun 2013 19:07:46 +0000 Subject: prevent cycles sm_35 kernel to be built on win32 with vs2012 because of ptxas crashes. Workaround to keep buildbot running. I filed a bug report to NVidia, will remove this as soon as the problem is fixed. --- build_files/scons/config/win32-vc-config.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'build_files') diff --git a/build_files/scons/config/win32-vc-config.py b/build_files/scons/config/win32-vc-config.py index 101d0402757..b9ec5208d53 100644 --- a/build_files/scons/config/win32-vc-config.py +++ b/build_files/scons/config/win32-vc-config.py @@ -215,7 +215,12 @@ BF_BOOST_LIBPATH = '${BF_BOOST}/lib' #CUDA WITH_BF_CYCLES_CUDA_BINARIES = False #BF_CYCLES_CUDA_NVCC = "" # Path to the nvidia compiler -BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_20', 'sm_21', 'sm_30', 'sm_35'] + +# Workaround for ptxas.exe crash on VS2012 and cuda 5.5 +if VC_VERSION == '11.0': + BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_20', 'sm_21', 'sm_30'] +else: + BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_20', 'sm_21', 'sm_30', 'sm_35'] #Ray trace optimization WITH_BF_RAYOPTIMIZATION = True -- cgit v1.2.3