prevent cycles sm_35 kernel to be built on win32 with vs2012 because of ptxas crashes.
authorJürgen Herrmann <shadowrom@me.com>
Sun, 23 Jun 2013 19:07:46 +0000 (19:07 +0000)
committerJürgen Herrmann <shadowrom@me.com>
Sun, 23 Jun 2013 19:07:46 +0000 (19:07 +0000)
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

index 101d0402757e54101859503785063e4ab1903d4c..b9ec5208d5328715fcc932967f81abe96a2aecb7 100644 (file)
@@ -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