removed extra cython file, symlink to standard orientation instead

This commit is contained in:
Martin Diehl 2016-03-24 15:06:04 +01:00
parent c73382e51f
commit 3824b683bc
4 changed files with 7 additions and 1283 deletions

View File

@ -21,6 +21,7 @@ marc:
processing: processing:
@if hash cython 2>/dev/null; then \ @if hash cython 2>/dev/null; then \
cd ./lib/damask; \ cd ./lib/damask; \
ln -s orientation.py corientation.pyx; \
CC=gcc python setup_corientation.py build_ext --inplace; \ CC=gcc python setup_corientation.py build_ext --inplace; \
rm -rv build; \ rm -rv build; \
rm *.c; \ rm *.c; \

View File

@ -1,2 +1,3 @@
core.so core.so
corientation.so corientation.so
*.pyx

View File

@ -10,12 +10,11 @@ from .environment import Environment # noqa
from .asciitable import ASCIItable # noqa from .asciitable import ASCIItable # noqa
from .config import Material # noqa from .config import Material # noqa
from .colormaps import Colormap, Color # noqa from .colormaps import Colormap, Color # noqa
from .orientation import Quaternion, Rodrigues, Symmetry, Orientation # noqa try:
# try: from .corientation import Quaternion, Rodrigues, Symmetry, Orientation
# from .corientation import Quaternion, Rodrigues, Symmetry, Orientation print "Import Cython version of Orientation module"
# print "Import Cython version of Orientation module" except:
# except: from .orientation import Quaternion, Rodrigues, Symmetry, Orientation
# from .orientation import Quaternion, Rodrigues, Symmetry, Orientation
#from .block import Block # only one class #from .block import Block # only one class
from .result import Result # noqa from .result import Result # noqa
from .geometry import Geometry # noqa from .geometry import Geometry # noqa

File diff suppressed because it is too large Load Diff