Fix cythonize and extension names to generate correct code

Author: mckib2

rawdatarinator/__init__.py

@@ -1,5 +1,5 @@
 '''Bring functions up to correct level.'''
 
-from .twixread import twixread # pylint: disable=E0611
-from .read import read # pylint: disable=E0611
-from .write import write # pylint: disable=E0611
+from .twixread_pyx import twixread # pylint: disable=E0611
+from .readcfl import read # pylint: disable=E0611
+from .writecfl import write # pylint: disable=E0611

setup.py

@@ -44,10 +44,12 @@ def build_extensions(self):
     except subprocess.CalledProcessError:
         print('Cython failed! Going to try to keep going...')
 
-
+MACROS = [
+    ('NPY_NO_DEPRECATED_API', 'NPY_1_7_API_VERSION'),
+]
 extensions = [
     Extension(
-        'rawdatarinator.twixread',
+        'rawdatarinator.twixread_pyx',
         sources=[
             "bart/src/misc/version.c",
             "bart/src/num/vecops.c",
@@ -64,16 +66,19 @@ def build_extensions(self):
             "src/twixread_pyx.c",
         ],
         include_dirs=['src/', 'bart/src/'],
+        define_macros=MACROS,
     ),
     Extension(
-        'rawdatarinator.read',
+        'rawdatarinator.readcfl',
         sources=['src/readcfl.c'],
-        include_dirs=[]
+        include_dirs=[],
+        define_macros=MACROS,
     ),
     Extension(
-        'rawdatarinator.write',
+        'rawdatarinator.writecfl',
         sources=['src/writecfl.c'],
-        include_dirs=[]
+        include_dirs=[],
+        define_macros=MACROS,
     ),
 ]
 

src/twixread_pyx.c

@@ -5,7 +5,7 @@ cimport cython
 cimport numpy as np
 import numpy as np
 from tempfile import NamedTemporaryFile as NTF
-from rawdatarinator import read
+from rawdatarinator import readcfl
 
 cdef extern from "twixread.h":
     int main_twixread(int argc, char* argv[])
@@ -121,7 +121,7 @@ def twixread(
             for ii in range(cargs):
                 vargs[ii] = _vargs[ii]
             retVal = main_twixread(cargs, vargs)
-            return read.read(f.name)
+            return readcfl.read(f.name)
 
     # If we have the outfile, we can just put the data there
     _vargs.append(outname.encode())