Numba formal integral

tardis/conftest.py

@@ -91,11 +91,9 @@
     PYTEST_HEADER_MODULES["Pandas"] = "pandas"
     PYTEST_HEADER_MODULES["Astropy"] = "astropy"
     PYTEST_HEADER_MODULES["Yaml"] = "yaml"
-    PYTEST_HEADER_MODULES["Cython"] = "cython"
     PYTEST_HEADER_MODULES["h5py"] = "h5py"
     PYTEST_HEADER_MODULES["Matplotlib"] = "matplotlib"
     PYTEST_HEADER_MODULES["Ipython"] = "IPython"
-#     del PYTEST_HEADER_MODULES['h5py']
 except (NameError, KeyError):  # NameError is needed to support Astropy < 1.0
     pass
 

tardis/montecarlo/base.py

@@ -12,7 +12,7 @@
 from tardis.util.base import quantity_linspace
 from tardis.io.util import HDFWriterMixin
 from tardis.montecarlo import packet_source as source
-from tardis.montecarlo.formal_integral import FormalIntegrator
+from tardis.montecarlo.montecarlo_numba.formal_integral import FormalIntegrator
 from tardis.montecarlo import montecarlo_configuration as mc_config_module
 
 
@@ -283,7 +283,6 @@ def run(
 
         set_num_threads(nthreads)
 
-        self._integrator = FormalIntegrator(model, plasma, self)
         self.time_of_simulation = self.calculate_time_of_simulation(model)
         self.volume = model.volume
 
@@ -296,6 +295,7 @@ def run(
 
         configuration_initialize(self, no_of_virtual_packets)
         montecarlo_radial1d(model, plasma, self)
+        self._integrator = FormalIntegrator(model, plasma, self)
         # montecarlo.montecarlo_radial1d(
         #    model, plasma, self,
         #    virtual_packet_flag=no_of_virtual_packets,
@@ -546,7 +546,9 @@ def calculate_f_lambda(self, wavelength):
         pass
 
     @classmethod
-    def from_config(cls, config, packet_source=None, virtual_packet_logging=False):
+    def from_config(
+        cls, config, packet_source=None, virtual_packet_logging=False
+    ):
         """
         Create a new MontecarloRunner instance from a Configuration object.
 
@@ -597,5 +599,8 @@ def from_config(cls, config, packet_source=None, virtual_packet_logging=False):
             debug_packets=config.montecarlo.debug_packets,
             logger_buffer=config.montecarlo.logger_buffer,
             single_packet_seed=config.montecarlo.single_packet_seed,
-            virtual_packet_logging=(config.spectrum.virtual.virtual_packet_logging | virtual_packet_logging),
+            virtual_packet_logging=(
+                config.spectrum.virtual.virtual_packet_logging
+                | virtual_packet_logging
+            ),
         )