diff --git a/benchmarks/benchmark_base.py b/benchmarks/benchmark_base.py index 4fc87332353..4136fd8b6eb 100644 --- a/benchmarks/benchmark_base.py +++ b/benchmarks/benchmark_base.py @@ -24,6 +24,7 @@ from tardis.transport.montecarlo.packet_collections import ( VPacketCollection, ) +from tardis.transport.montecarlo.packet_trackers import RPacketTracker class BenchmarkBase: @@ -361,8 +362,8 @@ def montecarlo_configuration(self): return montecarlo_configuration.MonteCarloConfiguration() @property - def rpacket_tracker(self): - return self.simulation_rpacket_tracking_enabled.transport.transport_state.rpacket_tracker + def rpacket_tracker(self): + return RPacketTracker(0) @property def transport_state(self): diff --git a/benchmarks/transport_montecarlo_interaction.py b/benchmarks/transport_montecarlo_interaction.py index b66fb4b5e11..9dddd515d55 100644 --- a/benchmarks/transport_montecarlo_interaction.py +++ b/benchmarks/transport_montecarlo_interaction.py @@ -2,8 +2,6 @@ Basic TARDIS Benchmark. """ -from asv_runner.benchmarks.mark import parameterize, skip_benchmark - import tardis.transport.montecarlo.interaction as interaction from benchmarks.benchmark_base import BenchmarkBase from tardis.transport.montecarlo.numba_interface import ( @@ -11,7 +9,7 @@ ) -@skip_benchmark + class BenchmarkMontecarloMontecarloNumbaInteraction(BenchmarkBase): """ Class to benchmark the numba interaction function. diff --git a/benchmarks/transport_montecarlo_packet.py b/benchmarks/transport_montecarlo_packet.py index dd3ca959c31..6a5c2834d73 100644 --- a/benchmarks/transport_montecarlo_packet.py +++ b/benchmarks/transport_montecarlo_packet.py @@ -143,7 +143,6 @@ def time_move_packet_across_shell_boundary_emitted(self, parameters): packet, delta_shell, no_of_shells ) - @skip_benchmark @parameterize( { "Parameters": [ diff --git a/benchmarks/transport_montecarlo_single_packet_loop.py b/benchmarks/transport_montecarlo_single_packet_loop.py index a92418e40d2..4da3961d986 100644 --- a/benchmarks/transport_montecarlo_single_packet_loop.py +++ b/benchmarks/transport_montecarlo_single_packet_loop.py @@ -4,7 +4,6 @@ from benchmarks.benchmark_base import BenchmarkBase from tardis.transport.montecarlo import single_packet_loop -from asv_runner.benchmarks.mark import skip_benchmark class BenchmarkMontecarloMontecarloNumbaVpacket(BenchmarkBase): @@ -12,7 +11,6 @@ class BenchmarkMontecarloMontecarloNumbaVpacket(BenchmarkBase): Class to benchmark the single packet loop function. """ - @skip_benchmark def time_single_packet_loop(self): single_packet_loop.single_packet_loop( self.packet, @@ -20,7 +18,7 @@ def time_single_packet_loop(self): self.verysimple_time_explosion, self.verysimple_opacity_state, self.estimators, - self.verysimple_packet_collection, + self.verysimple_3vpacket_collection, self.rpacket_tracker, self.montecarlo_configuration )