[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42518] trunk/blender: Scons/CUDA

[Thomas Dinges]

Revision: 42518
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42518
Author:   dingto
Date:     2011-12-08 19:16:43 +0000 (Thu, 08 Dec 2011)
Log Message:
-----------
Scons/CUDA
* Added missing bitness info to the nvcc_flags. 
This makes sure that the nvcc compiler builds the correct cubins. 

Modified Paths:
--------------
    trunk/blender/SConstruct
    trunk/blender/build_files/scons/tools/Blender.py
    trunk/blender/intern/cycles/kernel/SConscript

Modified: trunk/blender/SConstruct
===================================================================
--- trunk/blender/SConstruct	2011-12-08 17:32:37 UTC (rev 42517)
+++ trunk/blender/SConstruct	2011-12-08 19:16:43 UTC (rev 42518)
@@ -119,6 +119,12 @@
 if tempbitness in (32, 64): # only set if 32 or 64 has been given
     bitness = int(tempbitness)
 
+if bitness:
+    B.bitness = bitness
+else: 
+    B.bitness = tempbitness
+    
+
 # first check cmdline for toolset and we create env to work on
 quickie = B.arguments.get('BF_QUICK', None)
 quickdebug = B.arguments.get('BF_QUICKDEBUG', None)

Modified: trunk/blender/build_files/scons/tools/Blender.py
===================================================================
--- trunk/blender/build_files/scons/tools/Blender.py	2011-12-08 17:32:37 UTC (rev 42517)
+++ trunk/blender/build_files/scons/tools/Blender.py	2011-12-08 19:16:43 UTC (rev 42518)
@@ -50,6 +50,7 @@
 arguments = None
 targets = None
 resources = []
+bitness = 0
 
 #some internals
 blenderdeps = [] # don't manipulate this one outside this module!

Modified: trunk/blender/intern/cycles/kernel/SConscript
===================================================================
--- trunk/blender/intern/cycles/kernel/SConscript	2011-12-08 17:32:37 UTC (rev 42517)
+++ trunk/blender/intern/cycles/kernel/SConscript	2011-12-08 19:16:43 UTC (rev 42518)
@@ -1,6 +1,7 @@
 #!/usr/bin/python
 import sys
 import os
+import Blender as B
 
 def normpath(path):
     return os.path.abspath(os.path.normpath(path))
@@ -9,6 +10,12 @@
 
 kernel_binaries = []
 
+#Bitness
+if B.bitness == 32:
+    bits = 32
+else:
+    bits = 64
+
 if env['WITH_BF_CYCLES_CUDA_BINARIES']:
     kernel = env.Clone()
 
@@ -27,7 +34,8 @@
     svm_dir = os.path.join(source_dir, "../svm")
 
     # nvcc flags
-    nvcc_flags = "--cubin -use_fast_math --ptxas-options=\"-v\" --maxrregcount=24"
+    nvcc_flags = "-m%s" % (bits)
+    nvcc_flags += " --cubin -use_fast_math --ptxas-options=\"-v\" --maxrregcount=24"
     nvcc_flags += " --opencc-options -OPT:Olimit=0"
     nvcc_flags += " -DCCL_NAMESPACE_BEGIN= -DCCL_NAMESPACE_END= -DNVCC"
     nvcc_flags += " -I \"%s\" -I \"%s\"" % (util_dir, svm_dir)