Hi,

During training, you should always use the computed stats.
During evaluation, you should use computed stats if track_running_stats is False. Because you were not tracking stats, you cannot use them at evaluation time.

So self.training or not self.track_running_stats looks correct to me.