[yt-svn] commit/yt: 2 new changesets
commits-noreply at bitbucket.org
commits-noreply at bitbucket.org
Mon Jun 13 08:55:20 PDT 2016
2 new commits in yt:
https://bitbucket.org/yt_analysis/yt/commits/597d27fb6b76/
Changeset: 597d27fb6b76
Branch: yt
User: robertwb
Date: 2016-06-10 23:18:07+00:00
Summary: Use cythonize to build Cython extensions.
Affected #: 1 file
diff -r fd8796c8e06dabb5deee71b1a40a6e7c37adc9b3 -r 597d27fb6b7624ba33c6e8ec5d8d50444f63dffa setup.py
--- a/setup.py
+++ b/setup.py
@@ -390,9 +390,12 @@
_build_py.run(self)
class build_ext(_build_ext):
- # subclass setuptools extension builder to avoid importing numpy
+ # subclass setuptools extension builder to avoid importing cython and numpy
# at top level in setup.py. See http://stackoverflow.com/a/21621689/1382869
def finalize_options(self):
+ from Cython.Build import cythonize
+ self.distribution.ext_modules[:] = cythonize(
+ self.distribution.ext_modules)
_build_ext.finalize_options(self)
# Prevent numpy from thinking it is still in its setup process
# see http://stackoverflow.com/a/21621493/1382869
https://bitbucket.org/yt_analysis/yt/commits/124453298c78/
Changeset: 124453298c78
Branch: yt
User: robertwb
Date: 2016-06-10 23:46:50+00:00
Summary: Remove unneeded .pxd depends declarations.
Affected #: 1 file
diff -r 597d27fb6b7624ba33c6e8ec5d8d50444f63dffa -r 124453298c78e4c52a575398ec927c4da21d7192 setup.py
--- a/setup.py
+++ b/setup.py
@@ -83,116 +83,70 @@
Extension("yt.geometry.grid_visitors",
["yt/geometry/grid_visitors.pyx"],
include_dirs=["yt/utilities/lib"],
- libraries=std_libs,
- depends=["yt/utilities/lib/fp_utils.pxd",
- "yt/geometry/grid_visitors.pxd"]),
+ libraries=std_libs),
Extension("yt.geometry.grid_container",
["yt/geometry/grid_container.pyx"],
include_dirs=["yt/utilities/lib/"],
- libraries=std_libs,
- depends=["yt/utilities/lib/fp_utils.pxd",
- "yt/geometry/grid_container.pxd",
- "yt/geometry/grid_visitors.pxd",
- "yt/geometry/selection_routines.pxd"]),
+ libraries=std_libs),
Extension("yt.geometry.oct_container",
["yt/geometry/oct_container.pyx",
"yt/utilities/lib/tsearch.c"],
include_dirs=["yt/utilities/lib"],
- libraries=std_libs,
- depends=["yt/utilities/lib/fp_utils.pxd",
- "yt/geometry/oct_container.pxd",
- "yt/geometry/selection_routines.pxd"]),
+ libraries=std_libs),
Extension("yt.geometry.oct_visitors",
["yt/geometry/oct_visitors.pyx"],
include_dirs=["yt/utilities/lib/"],
- libraries=std_libs,
- depends=["yt/utilities/lib/fp_utils.pxd",
- "yt/geometry/oct_container.pxd",
- "yt/geometry/selection_routines.pxd"]),
+ libraries=std_libs),
Extension("yt.geometry.particle_oct_container",
["yt/geometry/particle_oct_container.pyx"],
include_dirs=["yt/utilities/lib/"],
- libraries=std_libs,
- depends=["yt/utilities/lib/fp_utils.pxd",
- "yt/geometry/oct_container.pxd",
- "yt/geometry/selection_routines.pxd"]),
+ libraries=std_libs),
Extension("yt.geometry.selection_routines",
["yt/geometry/selection_routines.pyx"],
include_dirs=["yt/utilities/lib/"],
- libraries=std_libs,
- depends=["yt/utilities/lib/fp_utils.pxd",
- "yt/utilities/lib/grid_traversal.pxd",
- "yt/geometry/oct_container.pxd",
- "yt/geometry/oct_visitors.pxd",
- "yt/geometry/grid_container.pxd",
- "yt/geometry/grid_visitors.pxd",
- "yt/geometry/selection_routines.pxd"]),
+ libraries=std_libs),
Extension("yt.geometry.particle_deposit",
["yt/geometry/particle_deposit.pyx"],
include_dirs=["yt/utilities/lib/"],
- libraries=std_libs,
- depends=["yt/utilities/lib/fp_utils.pxd",
- "yt/geometry/oct_container.pxd",
- "yt/geometry/selection_routines.pxd",
- "yt/geometry/particle_deposit.pxd"]),
+ libraries=std_libs),
Extension("yt.geometry.particle_smooth",
["yt/geometry/particle_smooth.pyx"],
include_dirs=["yt/utilities/lib/"],
- libraries=std_libs,
- depends=["yt/utilities/lib/fp_utils.pxd",
- "yt/geometry/oct_container.pxd",
- "yt/geometry/selection_routines.pxd",
- "yt/geometry/particle_deposit.pxd",
- "yt/geometry/particle_smooth.pxd"]),
+ libraries=std_libs),
Extension("yt.geometry.fake_octree",
["yt/geometry/fake_octree.pyx"],
include_dirs=["yt/utilities/lib/"],
- libraries=std_libs,
- depends=["yt/utilities/lib/fp_utils.pxd",
- "yt/geometry/oct_container.pxd",
- "yt/geometry/selection_routines.pxd"]),
+ libraries=std_libs),
Extension("yt.utilities.spatial.ckdtree",
["yt/utilities/spatial/ckdtree.pyx"],
include_dirs=["yt/utilities/lib/"],
libraries=std_libs),
Extension("yt.utilities.lib.bitarray",
["yt/utilities/lib/bitarray.pyx"],
- libraries=std_libs, depends=["yt/utilities/lib/bitarray.pxd"]),
+ libraries=std_libs),
Extension("yt.utilities.lib.bounding_volume_hierarchy",
["yt/utilities/lib/bounding_volume_hierarchy.pyx"],
include_dirs=["yt/utilities/lib/"],
extra_compile_args=omp_args,
extra_link_args=omp_args,
libraries=std_libs,
- depends=["yt/utilities/lib/element_mappings.pxd",
- "yt/utilities/lib/mesh_triangulation.h",
- "yt/utilities/lib/vec3_ops.pxd",
- "yt/utilities/lib/primitives.pxd"]),
+ depends=["yt/utilities/lib/mesh_triangulation.h"]),
Extension("yt.utilities.lib.contour_finding",
["yt/utilities/lib/contour_finding.pyx"],
include_dirs=["yt/utilities/lib/",
"yt/geometry/"],
- libraries=std_libs,
- depends=["yt/utilities/lib/fp_utils.pxd",
- "yt/utilities/lib/amr_kdtools.pxd",
- "yt/utilities/lib/grid_traversal.pxd",
- "yt/utilities/lib/contour_finding.pxd",
- "yt/geometry/oct_container.pxd",
- "yt/geometry/selection_routines.pxd"]),
+ libraries=std_libs),
Extension("yt.utilities.lib.geometry_utils",
["yt/utilities/lib/geometry_utils.pyx"],
extra_compile_args=omp_args,
extra_link_args=omp_args,
- libraries=std_libs, depends=["yt/utilities/lib/fp_utils.pxd"]),
+ libraries=std_libs),
Extension("yt.utilities.lib.marching_cubes",
["yt/utilities/lib/marching_cubes.pyx",
"yt/utilities/lib/fixed_interpolator.c"],
include_dirs=["yt/utilities/lib/"],
libraries=std_libs,
- depends=["yt/utilities/lib/fp_utils.pxd",
- "yt/utilities/lib/fixed_interpolator.pxd",
- "yt/utilities/lib/fixed_interpolator.h",
- ]),
+ depends=["yt/utilities/lib/fixed_interpolator.h"]),
Extension("yt.utilities.lib.mesh_triangulation",
["yt/utilities/lib/mesh_triangulation.pyx"],
depends=["yt/utilities/lib/mesh_triangulation.h"]),
@@ -200,15 +154,11 @@
["yt/utilities/lib/pixelization_routines.pyx",
"yt/utilities/lib/pixelization_constants.c"],
include_dirs=["yt/utilities/lib/"],
- libraries=std_libs, depends=["yt/utilities/lib/fp_utils.pxd",
- "yt/utilities/lib/pixelization_constants.h",
- "yt/utilities/lib/element_mappings.pxd"]),
+ libraries=std_libs,
+ depends=["yt/utilities/lib/pixelization_constants.h"]),
Extension("yt.utilities.lib.primitives",
["yt/utilities/lib/primitives.pyx"],
- libraries=std_libs,
- depends=["yt/utilities/lib/primitives.pxd",
- "yt/utilities/lib/vec3_ops.pxd",
- "yt/utilities/lib/bounding_volume_hierarchy.pxd"]),
+ libraries=std_libs),
Extension("yt.utilities.lib.origami",
["yt/utilities/lib/origami.pyx",
"yt/utilities/lib/origami_tags.c"],
@@ -222,15 +172,11 @@
libraries=std_libs,
extra_compile_args=omp_args,
extra_link_args=omp_args,
- depends=["yt/utilities/lib/fp_utils.pxd",
- "yt/utilities/lib/kdtree.h",
- "yt/utilities/lib/fixed_interpolator.h",
- "yt/utilities/lib/fixed_interpolator.pxd",
- "yt/utilities/lib/field_interpolation_tables.pxd",
- "yt/utilities/lib/vec3_ops.pxd"]),
+ depends=["yt/utilities/lib/kdtree.h",
+ "yt/utilities/lib/fixed_interpolator.h"]),
Extension("yt.utilities.lib.element_mappings",
["yt/utilities/lib/element_mappings.pyx"],
- libraries=std_libs, depends=["yt/utilities/lib/element_mappings.pxd"]),
+ libraries=std_libs),
Extension("yt.utilities.lib.alt_ray_tracers",
["yt/utilities/lib/alt_ray_tracers.pyx"],
libraries=std_libs),
@@ -243,13 +189,14 @@
"amr_kdtools"
]
for ext_name in lib_exts:
- lib_deps = ["yt/utilities/lib/fp_utils.pxd"]
+ lib_deps = []
if ext_name == 'misc_utilities':
lib_deps.append('yt/geometry/selection_routines.pxd')
cython_extensions.append(
Extension("yt.utilities.lib.{}".format(ext_name),
["yt/utilities/lib/{}.pyx".format(ext_name)],
- libraries=std_libs, depends=lib_deps))
+ libraries=std_libs,
+ depends=lib_deps))
lib_exts = ["write_array", "ragged_arrays", "line_integral_convolution"]
for ext_name in lib_exts:
@@ -270,11 +217,7 @@
include_dirs=["yt/frontends/artio/artio_headers/",
"yt/geometry/",
"yt/utilities/lib/"],
- depends=glob.glob("yt/frontends/artio/artio_headers/*.c") +
- ["yt/utilities/lib/fp_utils.pxd",
- "yt/geometry/oct_container.pxd",
- "yt/geometry/selection_routines.pxd",
- "yt/geometry/particle_deposit.pxd"]),
+ depends=glob.glob("yt/frontends/artio/artio_headers/*.c")),
Extension("yt.utilities.spatial._distance_wrap",
glob.glob("yt/utilities/spatial/src/*.c")),
Extension("yt.visualization._MPL",
@@ -290,31 +233,13 @@
embree_extensions = [
Extension("yt.utilities.lib.mesh_construction",
["yt/utilities/lib/mesh_construction.pyx"],
- depends=["yt/utilities/lib/mesh_construction.pxd",
- "yt/utilities/lib/mesh_triangulation.h",
- "yt/utilities/lib/mesh_intersection.pxd",
- "yt/utilities/lib/mesh_samplers.pxd",
- "yt/utilities/lib/mesh_traversal.pxd"]),
+ depends=["yt/utilities/lib/mesh_triangulation.h"]),
Extension("yt.utilities.lib.mesh_traversal",
- ["yt/utilities/lib/mesh_traversal.pyx"],
- depends=["yt/utilities/lib/mesh_traversal.pxd",
- "yt/utilities/lib/grid_traversal.pxd",
- "yt/utilities/lib/bounding_volume_hierarchy.pxd"]),
+ ["yt/utilities/lib/mesh_traversal.pyx"]),
Extension("yt.utilities.lib.mesh_samplers",
- ["yt/utilities/lib/mesh_samplers.pyx"],
- depends=["yt/utilities/lib/mesh_samplers.pxd",
- "yt/utilities/lib/element_mappings.pxd",
- "yt/utilities/lib/mesh_construction.pxd",
- "yt/utilities/lib/bounding_volume_hierarchy.pxd",
- "yt/utilities/lib/primitives.pxd"]),
+ ["yt/utilities/lib/mesh_samplers.pyx"]),
Extension("yt.utilities.lib.mesh_intersection",
- ["yt/utilities/lib/mesh_intersection.pyx"],
- depends=["yt/utilities/lib/mesh_intersection.pxd",
- "yt/utilities/lib/mesh_construction.pxd",
- "yt/utilities/lib/bounding_volume_hierarchy.pxd",
- "yt/utilities/lib/mesh_samplers.pxd",
- "yt/utilities/lib/primitives.pxd",
- "yt/utilities/lib/vec3_ops.pxd"]),
+ ["yt/utilities/lib/mesh_intersection.pyx"]),
]
embree_prefix = os.path.abspath(read_embree_location())
Repository URL: https://bitbucket.org/yt_analysis/yt/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
More information about the yt-svn
mailing list