Skip to content
Snippets Groups Projects
Commit a2b46412 authored by Chichi Lalescu's avatar Chichi Lalescu
Browse files

tox fails

still trying to figure out where tox puts the header files.
parent 1311b163
No related branches found
No related tags found
No related merge requests found
...@@ -110,6 +110,8 @@ class NavierStokes(bfps.code): ...@@ -110,6 +110,8 @@ class NavierStokes(bfps.code):
('enstrophy', np.float64), ('enstrophy', np.float64),
('vel_max', np.float64), ('vel_max', np.float64),
('renergy', np.float64)]) ('renergy', np.float64)])
if not os.path.isdir(self.work_dir):
os.makedirs(self.work_dir)
pickle.dump( pickle.dump(
self.stats_dtype, self.stats_dtype,
open(os.path.join( open(os.path.join(
......
...@@ -39,6 +39,17 @@ except DistributionNotFound: ...@@ -39,6 +39,17 @@ except DistributionNotFound:
__version__ = 'git revision ' + subprocess.check_output(['git', 'rev-parse', 'HEAD']).strip() __version__ = 'git revision ' + subprocess.check_output(['git', 'rev-parse', 'HEAD']).strip()
header_dir = './src' header_dir = './src'
lib_dir = './lib' lib_dir = './lib'
if not os.path.isfile(os.path.join(header_dir, 'base.hpp')):
tdir = os.path.dirname(os.path.realpath(__file__))
header_dir = os.path.join(tdir, os.pardir)
if not os.path.isfile(os.path.join(header_dir, 'base.hpp')):
raise ImportError('can not find base.hpp\n' +
'tdir is {0}\n'.format(tdir) +
'header_dir is {0}\n'.format(header_dir))
if os.path.isfile(os.path.join(header_dir, 'libbfps.so')):
lib_dir = tdir
else:
raise ImportError('can not find libbfps.so')
else: else:
__version__ = _dist.version __version__ = _dist.version
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
import bfps import bfps
from base import base from bfps.base import base
import subprocess import subprocess
import os import os
import shutil import shutil
...@@ -112,7 +112,7 @@ class code(base): ...@@ -112,7 +112,7 @@ class code(base):
for libname in libraries: for libname in libraries:
command_strings += ['-l' + libname] command_strings += ['-l' + libname]
command_strings += [self.name + '.cpp', '-o', self.name] command_strings += [self.name + '.cpp', '-o', self.name]
print command_strings print(command_strings)
# print sum(command_strings) # print sum(command_strings)
return subprocess.call(command_strings) return subprocess.call(command_strings)
def run(self, def run(self,
...@@ -122,7 +122,7 @@ class code(base): ...@@ -122,7 +122,7 @@ class code(base):
if self.compile_code(): if self.compile_code():
current_dir = os.getcwd() current_dir = os.getcwd()
if not os.path.isdir(self.work_dir): if not os.path.isdir(self.work_dir):
os.mkdir(self.work_dir) os.makedirs(self.work_dir)
if self.work_dir != './': if self.work_dir != './':
shutil.copy(self.name, self.work_dir) shutil.copy(self.name, self.work_dir)
os.chdir(self.work_dir) os.chdir(self.work_dir)
......
...@@ -257,11 +257,8 @@ def test(opt): ...@@ -257,11 +257,8 @@ def test(opt):
c.run(ncpu = opt.ncpu, c.run(ncpu = opt.ncpu,
simname = 'test') simname = 'test')
k, enespec = c.read_spec() k, enespec = c.read_spec()
print k, enespec
k, ensspec = c.read_spec(field = 'vorticity') k, ensspec = c.read_spec(field = 'vorticity')
print k, ensspec
k, k2enespec = c.read_spec(field = 'kvelocity') k, k2enespec = c.read_spec(field = 'kvelocity')
print k, k2enespec
# plot energy and enstrophy # plot energy and enstrophy
fig = plt.figure(figsize = (12, 6)) fig = plt.figure(figsize = (12, 6))
......
...@@ -75,7 +75,7 @@ libbfps = Extension( ...@@ -75,7 +75,7 @@ libbfps = Extension(
setup( setup(
name = 'bfps', name = 'bfps',
packages = ['bfps'], packages = ['bfps'],
install_requires = ['numpy>=1.8'], install_requires = ['numpy>=1.8', 'matplotlib>=1.3'],
ext_modules = [libbfps], ext_modules = [libbfps],
data_files = header_list, data_files = header_list,
######################################################################## ########################################################################
......
...@@ -29,6 +29,7 @@ import argparse ...@@ -29,6 +29,7 @@ import argparse
import pickle import pickle
import os import os
import bfps
from bfps.test import convergence_test from bfps.test import convergence_test
from bfps.NavierStokes import test as NStest from bfps.NavierStokes import test as NStest
from bfps.resize import double as resize_test from bfps.resize import double as resize_test
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment