[cig-commits] [commit] master: Some indentation issues fixed modified: wscript (2f330a8)

[cig_noreply at geodynamics.org]

Repository : https://github.com/geodynamics/relax

On branch  : master
Link       : https://github.com/geodynamics/relax/compare/afc5fb16f867dce2b0d364b8b96d28b885a47c09...2f330a8481a5df32477d6505a981a34b69ce9d38

>---------------------------------------------------------------

commit 2f330a8481a5df32477d6505a981a34b69ce9d38
Author: sagar masuti <sagar.masuti at gmail.com>
Date:   Mon Aug 11 18:41:19 2014 +0800

    Some indentation issues fixed
    	modified:   wscript


>---------------------------------------------------------------

2f330a8481a5df32477d6505a981a34b69ce9d38
 wscript | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/wscript b/wscript
index 551f13a..3c2b1e6 100644
--- a/wscript
+++ b/wscript
@@ -124,13 +124,13 @@ def configure(cnf):
     if cnf.options.use_cuda:
         cnf.env.CUDA=cnf.options.use_cuda
         cnf.load('cuda',tooldir='.')   
-    if not cnf.env.CUDAFLAGS:
-        cnf.env.CUDAFLAGS = ['-gencode','arch=compute_35,code=sm_35']
-#       cnf.env.CUDAFLAGS += ['-Xptxas', '-dlcm=cg']
-#       cnf.env.CUDAFLAGS += ['--maxrregcount=32']
-#       cnf.env.CUDAFLAGS = ['-gencode','arch=compute_30,code=sm_30']
-#       cnf.env.CUDAFLAGS = ['-gencode','arch=compute_20,code=sm_20']
-        cnf.env.CXXFLAGS=['-m64']
+        if not cnf.env.CUDAFLAGS:
+            cnf.env.CUDAFLAGS = ['-gencode','arch=compute_35,code=sm_35']
+    #       cnf.env.CUDAFLAGS += ['-Xptxas', '-dlcm=cg']
+    #       cnf.env.CUDAFLAGS += ['--maxrregcount=32']
+    #       cnf.env.CUDAFLAGS = ['-gencode','arch=compute_30,code=sm_30']
+    #       cnf.env.CUDAFLAGS = ['-gencode','arch=compute_20,code=sm_20']
+            cnf.env.CXXFLAGS=['-m64']
         if cnf.options.cuda_dir:
             if not cnf.options.cuda_incdir:
                 cnf.options.cuda_incdir=cnf.options.cuda_dir + "/include"
@@ -144,11 +144,11 @@ def configure(cnf):
         for inc in includedirs:
             try:
                 cnf.check_cc(msg="Checking for cuda.h", 
-                         header_name='cuda.h', includes=inc,
-                         libpath=[cnf.options.cuda_libdir], 
-                         rpath=[cnf.options.cuda_libdir], 
-                         lib=['cudart', 'cufft','stdc++'], uselib_store='cuda',
-                         define_name="USING_CUDA") 
+                             header_name='cuda.h', includes=inc,
+                             libpath=[cnf.options.cuda_libdir], 
+                             rpath=[cnf.options.cuda_libdir], 
+                             lib=['cudart', 'cufft','stdc++'], uselib_store='cuda',
+                             define_name="USING_CUDA") 
             except cnf.errors.ConfigurationError:
                 pass
             else:
@@ -301,7 +301,7 @@ def build(bld):
                         'src/getopt_m.f90',
                         'src/input.f90',
                         'src/mkl_dfti.f90',
-			'src/papi_prof.c',
+            'src/papi_prof.c',
                         'src/cu_fft.cu',
                         'src/cu_elastic.cu'],
                 install_path='${PREFIX}/bin',