Skip to content

Commit

Permalink
Revert "Don't require Cython to recompile cc and h files in cpp/"
Browse files Browse the repository at this point in the history
This reverts commit 5bafb40.
  • Loading branch information
bdice committed Aug 16, 2018
1 parent 5bafb40 commit 48732c6
Show file tree
Hide file tree
Showing 27 changed files with 288 additions and 49 deletions.
15 changes: 15 additions & 0 deletions freud/_bond.pxd
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ from libcpp.map cimport map
cimport freud._box
cimport freud._locality

cdef extern from "BondingAnalysis.cc" namespace "freud::bond":
pass

cdef extern from "BondingAnalysis.h" namespace "freud::bond":
cdef cppclass BondingAnalysis:
BondingAnalysis(unsigned int, unsigned int)
Expand All @@ -25,6 +28,9 @@ cdef extern from "BondingAnalysis.h" namespace "freud::bond":
unsigned int getNumParticles()
unsigned int getNumBonds()

cdef extern from "BondingR12.cc" namespace "freud::bond":
pass

cdef extern from "BondingR12.h" namespace "freud::bond":
cdef cppclass BondingR12:
BondingR12(float, unsigned int, unsigned int, unsigned int,
Expand All @@ -44,6 +50,9 @@ cdef extern from "BondingR12.h" namespace "freud::bond":
map[uint, uint] getListMap()
map[uint, uint] getRevListMap()

cdef extern from "BondingXY2D.cc" namespace "freud::bond":
pass

cdef extern from "BondingXY2D.h" namespace "freud::bond":
cdef cppclass BondingXY2D:
BondingXY2D(float, float, unsigned int, unsigned int, unsigned int,
Expand All @@ -63,6 +72,9 @@ cdef extern from "BondingXY2D.h" namespace "freud::bond":
map[uint, uint] getListMap()
map[uint, uint] getRevListMap()

cdef extern from "BondingXYT.cc" namespace "freud::bond":
pass

cdef extern from "BondingXYT.h" namespace "freud::bond":
cdef cppclass BondingXYT:
BondingXYT(float, float, unsigned int, unsigned int, unsigned int,
Expand All @@ -82,6 +94,9 @@ cdef extern from "BondingXYT.h" namespace "freud::bond":
map[uint, uint] getListMap()
map[uint, uint] getRevListMap()

cdef extern from "BondingXYZ.cc" namespace "freud::bond":
pass

cdef extern from "BondingXYZ.h" namespace "freud::bond":
cdef cppclass BondingXYZ:
BondingXYZ(float, float, float, unsigned int, unsigned int,
Expand Down
3 changes: 3 additions & 0 deletions freud/_box.pxd
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ from libcpp cimport bool
from freud.util._VectorMath cimport vec3
from libcpp.string cimport string

cdef extern from "box.cc" namespace "freud::box":
pass

cdef extern from "box.h" namespace "freud::box":
cdef cppclass Box:
Box()
Expand Down
6 changes: 6 additions & 0 deletions freud/_cluster.pxd
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ from libc.stdint cimport uint32_t
cimport freud._box
cimport freud._locality

cdef extern from "Cluster.cc" namespace "freud::cluster":
pass

cdef extern from "Cluster.h" namespace "freud::cluster":
cdef cppclass Cluster:
Cluster(float)
Expand All @@ -23,6 +26,9 @@ cdef extern from "Cluster.h" namespace "freud::cluster":
shared_ptr[unsigned int] getClusterIdx()
const vector[vector[uint]] getClusterKeys()

cdef extern from "ClusterProperties.cc" namespace "freud::cluster":
pass

cdef extern from "ClusterProperties.h" namespace "freud::cluster":
cdef cppclass ClusterProperties:
ClusterProperties()
Expand Down
5 changes: 3 additions & 2 deletions freud/_cy_kspace.cpp

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 12 additions & 0 deletions freud/_density.pxd
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ from libcpp.memory cimport shared_ptr
cimport freud._box
cimport freud._locality

cdef extern from "CorrelationFunction.cc" namespace "freud::density":
pass

cdef extern from "CorrelationFunction.h" namespace "freud::density":
cdef cppclass CorrelationFunction[T]:
CorrelationFunction(float, float)
Expand All @@ -24,6 +27,9 @@ cdef extern from "CorrelationFunction.h" namespace "freud::density":
shared_ptr[float] getR()
unsigned int getNBins() const

cdef extern from "GaussianDensity.cc" namespace "freud::density":
pass

cdef extern from "GaussianDensity.h" namespace "freud::density":
cdef cppclass GaussianDensity:
GaussianDensity(unsigned int, float, float)
Expand All @@ -44,6 +50,9 @@ cdef extern from "GaussianDensity.h" namespace "freud::density":
unsigned int getWidthY()
unsigned int getWidthZ()

cdef extern from "LocalDensity.cc" namespace "freud::density":
pass

cdef extern from "LocalDensity.h" namespace "freud::density":
cdef cppclass LocalDensity:
LocalDensity(float, float, float)
Expand All @@ -59,6 +68,9 @@ cdef extern from "LocalDensity.h" namespace "freud::density":
shared_ptr[float] getDensity()
shared_ptr[float] getNumNeighbors()

cdef extern from "RDF.cc" namespace "freud::density":
pass

cdef extern from "RDF.h" namespace "freud::density":
cdef cppclass RDF:
RDF(float, float, float)
Expand Down
15 changes: 15 additions & 0 deletions freud/_environment.pxd
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ from libcpp.map cimport map
cimport freud._box
cimport freud._locality

cdef extern from "BondOrder.cc" namespace "freud::environment":
pass

cdef extern from "BondOrder.h" namespace "freud::environment":
cdef cppclass BondOrder:
BondOrder(float, float, unsigned int, unsigned int, unsigned int)
Expand All @@ -33,6 +36,9 @@ cdef extern from "BondOrder.h" namespace "freud::environment":
unsigned int getNBinsTheta()
unsigned int getNBinsPhi()

cdef extern from "LocalDescriptors.cc" namespace "freud::environment":
pass

cdef extern from "LocalDescriptors.h" namespace "freud::environment":
ctypedef enum LocalDescriptorOrientation:
LocalNeighborhood
Expand All @@ -59,6 +65,9 @@ cdef extern from "LocalDescriptors.h" namespace "freud::environment":
const quat[float]*, LocalDescriptorOrientation) nogil except +
shared_ptr[float complex] getSph()

cdef extern from "MatchEnv.cc" namespace "freud::environment":
pass

cdef extern from "MatchEnv.h" namespace "freud::environment":
cdef cppclass MatchEnv:
MatchEnv(const freud._box.Box &, float, unsigned int) nogil except +
Expand Down Expand Up @@ -103,6 +112,9 @@ cdef extern from "MatchEnv.h" namespace "freud::environment":
unsigned int getNumNeighbors()
unsigned int getMaxNumNeighbors()

cdef extern from "Pairing2D.cc" namespace "freud::environment":
pass

cdef extern from "Pairing2D.h" namespace "freud::environment":
cdef cppclass Pairing2D:
Pairing2D(const float, const unsigned int, float)
Expand All @@ -119,6 +131,9 @@ cdef extern from "Pairing2D.h" namespace "freud::environment":
shared_ptr[unsigned int] getPair()
unsigned int getNumParticles()

cdef extern from "AngularSeparation.cc" namespace "freud::environment":
pass

cdef extern from "AngularSeparation.h" namespace "freud::environment":
cdef cppclass AngularSeparation:
AngularSeparation()
Expand Down
3 changes: 3 additions & 0 deletions freud/_interface.pxd
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ from freud.util._VectorMath cimport vec3
cimport freud._box
cimport freud._locality

cdef extern from "InterfaceMeasure.cc" namespace "freud::interface":
pass

cdef extern from "InterfaceMeasure.h" namespace "freud::interface":
cdef cppclass InterfaceMeasure:
InterfaceMeasure(const freud._box.Box &, float)
Expand Down
3 changes: 3 additions & 0 deletions freud/_kspace.pxd
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ from libcpp.memory cimport shared_ptr
from freud.util._VectorMath cimport vec3, quat
from libcpp.complex cimport complex

cdef extern from "kspace.cc" namespace "freud::kspace":
pass

cdef extern from "kspace.h" namespace "freud::kspace":
cdef cppclass FTdelta:
FTDelta()
Expand Down
9 changes: 9 additions & 0 deletions freud/_locality.pxd
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ from libcpp.memory cimport shared_ptr
from libcpp.vector cimport vector
cimport freud._box

cdef extern from "NeighborList.cc" namespace "freud::locality":
pass

cdef extern from "NeighborList.h" namespace "freud::locality":
cdef cppclass NeighborList:
NeighborList()
Expand Down Expand Up @@ -35,6 +38,9 @@ cdef extern from "NeighborList.h" namespace "freud::locality":
void copy(const NeighborList &)
void validate(size_t, size_t) except +

cdef extern from "LinkCell.cc" namespace "freud::locality":
pass

cdef extern from "LinkCell.h" namespace "freud::locality":
cdef cppclass IteratorLinkCell:
IteratorLinkCell()
Expand Down Expand Up @@ -77,6 +83,9 @@ cdef extern from "LinkCell.h" namespace "freud::locality":
bool) nogil except +
NeighborList * getNeighborList()

cdef extern from "NearestNeighbors.cc" namespace "freud::locality":
pass

cdef extern from "NearestNeighbors.h" namespace "freud::locality":
cdef cppclass NearestNeighbors:
NearestNeighbors()
Expand Down
21 changes: 21 additions & 0 deletions freud/_order.pxd
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ from libcpp.map cimport map
cimport freud._box
cimport freud._locality

cdef extern from "CubaticOrderParameter.cc" namespace "freud::order":
pass

cdef extern from "CubaticOrderParameter.h" namespace "freud::order":
cdef cppclass CubaticOrderParameter:
CubaticOrderParameter(float,
Expand All @@ -36,6 +39,9 @@ cdef extern from "CubaticOrderParameter.h" namespace "freud::order":
float getScale()
quat[float] getCubaticOrientation()

cdef extern from "NematicOrderParameter.cc" namespace "freud::order":
pass

cdef extern from "NematicOrderParameter.h" namespace "freud::order":
cdef cppclass NematicOrderParameter:
NematicOrderParameter(vec3[float])
Expand All @@ -49,6 +55,9 @@ cdef extern from "NematicOrderParameter.h" namespace "freud::order":
vec3[float] getNematicDirector()


cdef extern from "HexOrderParameter.cc" namespace "freud::order":
pass

cdef extern from "HexOrderParameter.h" namespace "freud::order":
cdef cppclass HexOrderParameter:
HexOrderParameter(float, unsigned int, unsigned int)
Expand All @@ -63,6 +72,9 @@ cdef extern from "HexOrderParameter.h" namespace "freud::order":
unsigned int getNP()
unsigned int getK()

cdef extern from "TransOrderParameter.cc" namespace "freud::order":
pass

cdef extern from "TransOrderParameter.h" namespace "freud::order":
cdef cppclass TransOrderParameter:
TransOrderParameter(float, float)
Expand All @@ -74,6 +86,9 @@ cdef extern from "TransOrderParameter.h" namespace "freud::order":
shared_ptr[float complex] getDr()
unsigned int getNP()

cdef extern from "LocalQl.cc" namespace "freud::order":
pass

cdef extern from "LocalQl.h" namespace "freud::order":
cdef cppclass LocalQl:
LocalQl(const freud._box.Box &, float, unsigned int, float)
Expand All @@ -96,6 +111,9 @@ cdef extern from "LocalQl.h" namespace "freud::order":
shared_ptr[float] getQlNorm()
shared_ptr[float] getQlAveNorm()

cdef extern from "LocalWl.cc" namespace "freud::order":
pass

cdef extern from "LocalWl.h" namespace "freud::order":
cdef cppclass LocalWl(LocalQl):
LocalWl(const freud._box.Box &, float, unsigned int, float)
Expand All @@ -106,6 +124,9 @@ cdef extern from "LocalWl.h" namespace "freud::order":
void enableNormalization()
void disableNormalization()

cdef extern from "SolLiq.cc" namespace "freud::order":
pass

cdef extern from "SolLiq.h" namespace "freud::order":
cdef cppclass SolLiq:
SolLiq(const freud._box.Box &, float,
Expand Down
3 changes: 3 additions & 0 deletions freud/_parallel.pxd
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# Copyright (c) 2010-2018 The Regents of the University of Michigan
# This file is from the freud project, released under the BSD 3-Clause License.

cdef extern from "tbb_config.cc" namespace "freud::parallel":
pass

cdef extern from "tbb_config.h" namespace "freud::parallel":
void setNumThreads(unsigned int)
15 changes: 15 additions & 0 deletions freud/_pmft.pxd
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ from libcpp.memory cimport shared_ptr
cimport freud._box
cimport freud._locality

cdef extern from "PMFT.cc" namespace "freud::pmft":
pass

cdef extern from "PMFT.h" namespace "freud::pmft":
cdef cppclass PMFT:
PMFT()
Expand All @@ -18,6 +21,9 @@ cdef extern from "PMFT.h" namespace "freud::pmft":
shared_ptr[float] getPCF()
float getRCut()

cdef extern from "PMFTR12.cc" namespace "freud::pmft":
pass

cdef extern from "PMFTR12.h" namespace "freud::pmft":
cdef cppclass PMFTR12(PMFT):
PMFTR12(float, unsigned int, unsigned int, unsigned int)
Expand All @@ -38,6 +44,9 @@ cdef extern from "PMFTR12.h" namespace "freud::pmft":
unsigned int getNBinsT1()
unsigned int getNBinsT2()

cdef extern from "PMFTXYT.cc" namespace "freud::pmft":
pass

cdef extern from "PMFTXYT.h" namespace "freud::pmft":
cdef cppclass PMFTXYT(PMFT):
PMFTXYT(float, float, unsigned int, unsigned int, unsigned int)
Expand All @@ -58,6 +67,9 @@ cdef extern from "PMFTXYT.h" namespace "freud::pmft":
unsigned int getNBinsY()
unsigned int getNBinsT()

cdef extern from "PMFTXY2D.cc" namespace "freud::pmft":
pass

cdef extern from "PMFTXY2D.h" namespace "freud::pmft":
cdef cppclass PMFTXY2D(PMFT):
PMFTXY2D(float, unsigned int, unsigned int, unsigned int)
Expand All @@ -76,6 +88,9 @@ cdef extern from "PMFTXY2D.h" namespace "freud::pmft":
unsigned int getNBinsX()
unsigned int getNBinsY()

cdef extern from "PMFTXYZ.cc" namespace "freud::pmft":
pass

cdef extern from "PMFTXYZ.h" namespace "freud::pmft":
cdef cppclass PMFTXYZ(PMFT):
PMFTXYZ(float, float, float, unsigned int, unsigned int,
Expand Down
3 changes: 3 additions & 0 deletions freud/_voronoi.pxd
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ cimport freud._box

ctypedef unsigned int uint

cdef extern from "VoronoiBuffer.cc" namespace "freud::voronoi":
pass

cdef extern from "VoronoiBuffer.h" namespace "freud::voronoi":
cdef cppclass VoronoiBuffer:
VoronoiBuffer(const freud._box.Box &)
Expand Down

0 comments on commit 48732c6

Please sign in to comment.