Make rational into a subpackage of npytypes

npytypes/quaternion/__init__.py

@@ -1,12 +1,12 @@
-from info import __doc__
+import numpy as np
 
-__all__ = ['quaternion']
+from .numpy_quaternion import quaternion
+from .info import __doc__
 
-import numpy
-from numpy_quaternion import quaternion
+__all__ = ['quaternion']
 
-if numpy.__dict__.get('quaternion') is not None:
+if np.__dict__.get('quaternion') is not None:
     raise RuntimeError('The NumPy package already has a quaternion type')
 
-numpy.quaternion = quaternion
-numpy.typeDict['quaternion'] = numpy.dtype(quaternion)
+np.quaternion = quaternion
+np.typeDict['quaternion'] = np.dtype(quaternion)

npytypes/rational/rational.c

@@ -974,7 +974,7 @@ rational_matrix_multiply(char **args, npy_intp *dimensions, npy_intp *steps)
     npy_intp os_p = steps[5];
 
     /* core dimensions counters */
-    npy_intp m, n, p;
+    npy_intp m, p;
 
     /* calculate dot product for each row/column vector pair */
     for (m = 0; m < dm; m++) {

setup.py

@@ -3,7 +3,7 @@
 
 ext_modules = []
 
-ext = Extension('npytypes.rational',
+ext = Extension('npytypes.rational.rational',
                 sources=['npytypes/rational/rational.c'],
                 include_dirs=[np.get_include()])
 ext_modules.append(ext)
@@ -20,6 +20,6 @@
       description='NumPy type extensions',
       packages=['npytypes',
                 'npytypes.quaternion',
-                # 'npytypes.rational'
+                'npytypes.rational'
                 ],
       ext_modules=ext_modules)