Merge branch 'master', remote branch 'origin'

This commit is contained in:
Jerome Kieffer 2012-06-08 15:41:26 +02:00
commit e10046fecd
1 changed files with 0 additions and 1 deletions

View File

@ -84,7 +84,6 @@ bilinear_dic = dict(name="bilinear",
include_dirs=get_numpy_include_dirs(), include_dirs=get_numpy_include_dirs(),
sources=[src['bilinear']]) sources=[src['bilinear']])
print ocl_azim
ocl_azim_dict = dict(name="ocl_azim", ocl_azim_dict = dict(name="ocl_azim",
sources=ocl_azim, sources=ocl_azim,
include_dirs=["openCL"] + get_numpy_include_dirs(), include_dirs=["openCL"] + get_numpy_include_dirs(),