Merge pull request #210 from wkerzendorf/montecarlo/restructure

a restructure of the C-file file structure

.gitignore

@@ -8,6 +8,7 @@ __pycache__
 # Ignore .c files by default to avoid including generated code. If you want to
 # add a non-generated .c extension, use `git add -f filename.c`.
 *.c
+!tardis/montecarlo/src/*.c
 
 # Other generated files
 */version.py

tardis/model.py

@@ -10,7 +10,7 @@
 import scipy.special
 
 from tardis import packet_source, plasma_array
-import montecarlo
+from tardis.montecarlo import montecarlo
 from util import intensity_black_body
 
 

tardis/montecarlo/__init__.py

@@ -0,0 +1 @@
+

tardis/montecarlo.pyx → tardis/montecarlo/montecarlo.pyx

@@ -15,7 +15,7 @@ np.import_array()
 
 ctypedef np.int64_t int_type_t
 
-cdef extern from "cmontecarlo.h":
+cdef extern from "src/cmontecarlo.h":
     ctypedef enum rpacket_status_t:
         TARDIS_PACKET_STATUS_IN_PROCESS = 0
         TARDIS_PACKET_STATUS_EMITTED = 1

tardis/montecarlo/setup_package.py

@@ -0,0 +1,19 @@
+#setting the right include
+from setuptools import Extension
+import numpy as np
+import os
+
+from glob import glob
+
+
+def get_extensions():
+    sources = ['tardis/montecarlo/montecarlo.pyx']
+    sources += [os.path.relpath(fname) for fname in glob(
+        os.path.join(os.path.dirname(__file__), 'src', '*.c'))]
+    sources += [os.path.relpath(fname) for fname in glob(
+        os.path.join(os.path.dirname(__file__), 'src/randomkit', '*.c'))]
+
+    return [Extension('tardis.montecarlo.montecarlo', sources,
+                      include_dirs=['tardis/montecarlo/src',
+                                    'tardis/montecarlo/src/randomkit',
+                                    np.get_include()])]

tardis/cmontecarlo.h → tardis/montecarlo/src/cmontecarlo.h

@@ -7,7 +7,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <math.h>
-#include "randomkit.h"
+#include "randomkit/randomkit.h"
 
 #ifdef __clang__
 #define INLINE extern inline