From 2257705b1d549f70eb45ab1aba6830b58a1c6c7b Mon Sep 17 00:00:00 2001 From: dexter2206 Date: Mon, 21 Jan 2019 17:54:43 +0100 Subject: [PATCH] Style fixes --- setup.py | 39 +++++++++++++++++++++------------------ setup_helpers.py | 24 +++++++++++++----------- 2 files changed, 34 insertions(+), 29 deletions(-) diff --git a/setup.py b/setup.py index 5489e5e..38e8238 100644 --- 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 index 39701b7..5c9ce11 100644 --- 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')