removed extra cython file, symlink to standard orientation instead
This commit is contained in:
parent
c73382e51f
commit
3824b683bc
1
Makefile
1
Makefile
|
@ -21,6 +21,7 @@ marc:
|
|||
processing:
|
||||
@if hash cython 2>/dev/null; then \
|
||||
cd ./lib/damask; \
|
||||
ln -s orientation.py corientation.pyx; \
|
||||
CC=gcc python setup_corientation.py build_ext --inplace; \
|
||||
rm -rv build; \
|
||||
rm *.c; \
|
||||
|
|
|
@ -1,2 +1,3 @@
|
|||
core.so
|
||||
corientation.so
|
||||
*.pyx
|
||||
|
|
|
@ -10,12 +10,11 @@ from .environment import Environment # noqa
|
|||
from .asciitable import ASCIItable # noqa
|
||||
from .config import Material # noqa
|
||||
from .colormaps import Colormap, Color # noqa
|
||||
from .orientation import Quaternion, Rodrigues, Symmetry, Orientation # noqa
|
||||
# try:
|
||||
# from .corientation import Quaternion, Rodrigues, Symmetry, Orientation
|
||||
# print "Import Cython version of Orientation module"
|
||||
# except:
|
||||
# from .orientation import Quaternion, Rodrigues, Symmetry, Orientation
|
||||
try:
|
||||
from .corientation import Quaternion, Rodrigues, Symmetry, Orientation
|
||||
print "Import Cython version of Orientation module"
|
||||
except:
|
||||
from .orientation import Quaternion, Rodrigues, Symmetry, Orientation
|
||||
#from .block import Block # only one class
|
||||
from .result import Result # noqa
|
||||
from .geometry import Geometry # noqa
|
||||
|
|
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue