diff --git a/bfps/base.py b/bfps/base.py index 2ed050f870e521abc024f772381905592121efe9..ecff18efd00c2b63cf2c6cba2d90c130f8adc638 100644 --- a/bfps/base.py +++ b/bfps/base.py @@ -86,8 +86,7 @@ class base(object): src_txt += 'return 0;\n}\n' # finishing read_parameters return src_txt def cprint_pars(self): - key = self.parameters.keys() - key.sort() + key = sorted(list(self.parameters.keys())) src_txt = '' for i in range(len(key)): if type(self.parameters[key[i]]) == int: diff --git a/bfps/fluid_converter.py b/bfps/fluid_converter.py index b448d8db870303bc7b8822277711b7db198a527a..04f113c4ed44d99fb020d4a782bb7d28ae09adbb 100644 --- a/bfps/fluid_converter.py +++ b/bfps/fluid_converter.py @@ -37,12 +37,14 @@ class fluid_converter(bfps.fluid_base.fluid_particle_base): name = 'fluid_converter', work_dir = './', simname = 'test', - fluid_precision = 'single'): + fluid_precision = 'single', + use_fftw_wisdom = True): super(fluid_converter, self).__init__( name = name, work_dir = work_dir, simname = simname, - dtype = fluid_precision) + dtype = fluid_precision, + use_fftw_wisdom = use_fftw_wisdom) self.parameters['write_rvelocity'] = 1 self.parameters['write_rvorticity'] = 1 self.parameters['fluid_name'] = 'test' diff --git a/bfps/fluid_resize.py b/bfps/fluid_resize.py index c022627931c29534c24f26934504712def959e90..5c4e6c5ed001c9ca698d19824677c335a6a0ff53 100644 --- a/bfps/fluid_resize.py +++ b/bfps/fluid_resize.py @@ -35,12 +35,14 @@ class fluid_resize(bfps.fluid_base.fluid_particle_base): name = 'fluid_resize', work_dir = './', simname = 'test', - dtype = np.float32): + dtype = np.float32, + use_fftw_wisdom = False): super(fluid_resize, self).__init__( name = name, work_dir = work_dir, simname = simname, - dtype = dtype) + dtype = dtype, + use_fftw_wisdom = use_fftw_wisdom) self.parameters['src_simname'] = 'test' self.parameters['dst_iter'] = 0 self.parameters['dst_nx'] = 32 diff --git a/setup.py b/setup.py index 094c4fb5f83ea307aaedc29381bd192d2f7ae083..5ef07d2904e9fd111aba3f105bc87f27f53a9f3a 100644 --- a/setup.py +++ b/setup.py @@ -110,9 +110,6 @@ class CustomBuild(DistutilsBuild): subprocess.call(command_strings) command_strings = ['ar', 'rvs', 'bfps/libbfps.a'] command_strings += ['obj/' + fname + '.o' for fname in src_file_list] - #command_strings += ['-l' + libname for libname in libraries] - #command_strings += ['-L' + ldir for ldir in library_dirs] - #command_strings += ['-o', 'libbfps.a'] print(' '.join(command_strings)) subprocess.call(command_strings) DistutilsBuild.run(self) diff --git a/tests/test_convergence.py b/tests/test_convergence.py index 0b27504d10c275c79fabb4aa5df8fb715758a1b9..636dea9bc9487241b62166d35ac7367272e513b3 100755 --- a/tests/test_convergence.py +++ b/tests/test_convergence.py @@ -71,7 +71,9 @@ def convergence_test( code_class = code_class, tracer_state_file = h5py.File(os.path.join(c0.work_dir, c0.simname + '.h5'), 'r')) # get real space fields - converter = bfps.fluid_converter(fluid_precision = opt.precision) + converter = bfps.fluid_converter( + fluid_precision = opt.precision, + use_fftw_wisdom = False) converter.write_src() converter.set_host_info({'type' : 'pc'}) for c in [c0, c1, c2]: diff --git a/tox_io.ini b/tox_io.ini index 994d35525286ef31df4a896a341f796287c3ba2e..f754e7b824a4a03113724845a2a9b4d21676c693 100644 --- a/tox_io.ini +++ b/tox_io.ini @@ -1,6 +1,7 @@ [tox] -envlist = py27 +envlist = py34 [testenv] +deps = matplotlib whitelist_externals = echo cp