Style fixes

dexter2206 · Jan 21, 2019 · 2257705 · 2257705
1 parent da1e9d1
commit 2257705
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 29 deletions.
diff --git a/setup.py b/setup.py
@@ -17,26 +17,29 @@
     CPP_EXT = '.cpp'
 
 CPU_SEARCH_EXT = Extension('isingcpu',
-                           extra_compile_args=['-fPIC',
-                                               '-fopenmp',
-                                               '-DTHRUST_DEVICE_SYSTEM=THRUST_DEVICE_SYSTEM_OMP',
-                                               '-lstdc++'],
-                           sources=['./ising/ext_sources/bucketSelectCPU' + CPP_EXT,
-                                    './ising/ext_sources/bucketselectcpu.f90',
-                                    './ising/ext_sources/cpucsort' + CPP_EXT,
-                                    './ising/ext_sources/cpu_thrust_sort.f90',
-                                    './ising/ext_sources/cpusearch.pyf',
-                                    './ising/ext_sources/cpusearch.f90'])
+                           extra_compile_args=[
+                               '-fPIC',
+                               '-fopenmp',
+                               '-DTHRUST_DEVICE_SYSTEM=THRUST_DEVICE_SYSTEM_OMP',
+                               '-lstdc++'],
+                           sources=[
+                               './ising/ext_sources/bucketSelectCPU' + CPP_EXT,
+                               './ising/ext_sources/bucketselectcpu.f90',
+                               './ising/ext_sources/cpucsort' + CPP_EXT,
+                               './ising/ext_sources/cpu_thrust_sort.f90',
+                               './ising/ext_sources/cpusearch.pyf',
+                               './ising/ext_sources/cpusearch.f90'])
 
 GPU_SEARCH_EXT = Extension('isinggpu',
-                           sources=['./ising/ext_sources/gpusearch.pyf',
-                                    './ising/ext_sources/gpucsort.cu',
-                                    './ising/ext_sources/global.f90',
-                                    './ising/ext_sources/gpu_thrust_sort.f90',
-                                    './ising/ext_sources/bucketSelect.cu',
-                                    './ising/ext_sources/bucketselect.f90',
-                                    './ising/ext_sources/search.f90',
-                                    './ising/ext_sources/gpusearch.f90'],
+                           sources=[
+                               './ising/ext_sources/gpusearch.pyf',
+                               './ising/ext_sources/gpucsort.cu',
+                               './ising/ext_sources/global.f90',
+                               './ising/ext_sources/gpu_thrust_sort.f90',
+                               './ising/ext_sources/bucketSelect.cu',
+                               './ising/ext_sources/bucketselect.f90',
+                               './ising/ext_sources/search.f90',
+                               './ising/ext_sources/gpusearch.f90'],
                            extra_link_args=['-Mcuda'],
                            extra_f90_compile_args=['-v', '-Mcuda,nordc'])
 

diff --git a/setup_helpers.py b/setup_helpers.py
@@ -84,18 +84,20 @@ def customize_compiler_for_nvcc(compiler):
     def _compile(obj, src, ext, cc_args, extra_postargs, pp_opts):
         if ext == '.cu':
             if 'cpu' in os.path.split(src)[1].lower():
-                postargs = ['-c',
-                            '-O3',
-                            '-Xcompiler',
-                            '-fPIC',
-                            '-Xcompiler',
-                            '-fopenmp',
-                            '-DTHRUST_DEVICE_SYSTEM=THRUST_DEVICE_SYSTEM_OMP',
-                            '-lstdc++',
-                            '-lcudart']
+                postargs = [
+                    '-c',
+                    '-O3',
+                    '-Xcompiler',
+                    '-fPIC',
+                    '-Xcompiler',
+                    '-fopenmp',
+                    '-DTHRUST_DEVICE_SYSTEM=THRUST_DEVICE_SYSTEM_OMP',
+                    '-lstdc++',
+                    '-lcudart']
             else:
-                postargs = ['-Xcompiler',
-                            '-fPIC']
+                postargs = [
+                    '-Xcompiler',
+                    '-fPIC']
 
             # use the cuda for .cu filese
             compiler.set_executable('compiler_so', 'nvcc')