ms_srs: fix numpy import
numpy is used in a few places in the class code so we need to jhave it available in a bigger scope, while still only loading when needed. Change-Id: Iea66e623e1c980a62d691e20dacb00df99fdd78f
This commit is contained in:
parent
aebaa3cf31
commit
620d2ee5ba
|
@ -353,6 +353,8 @@ class srsUE(MS):
|
||||||
metrics = srsUEMetrics(self.metrics_file)
|
metrics = srsUEMetrics(self.metrics_file)
|
||||||
return metrics.verify(value, operation, metric, criterion)
|
return metrics.verify(value, operation, metric, criterion)
|
||||||
|
|
||||||
|
numpy = None
|
||||||
|
|
||||||
class srsUEMetrics(log.Origin):
|
class srsUEMetrics(log.Origin):
|
||||||
|
|
||||||
VALID_OPERATIONS = ['avg', 'sum']
|
VALID_OPERATIONS = ['avg', 'sum']
|
||||||
|
@ -365,7 +367,10 @@ class srsUEMetrics(log.Origin):
|
||||||
super().__init__(log.C_RUN, 'srsue_metrics')
|
super().__init__(log.C_RUN, 'srsue_metrics')
|
||||||
self.raw_data = None
|
self.raw_data = None
|
||||||
self.metrics_file = metrics_file
|
self.metrics_file = metrics_file
|
||||||
import numpy
|
global numpy
|
||||||
|
if numpy is None:
|
||||||
|
import numpy as numpy_module
|
||||||
|
numpy = numpy_module
|
||||||
# read CSV, guessing data type with first row being the legend
|
# read CSV, guessing data type with first row being the legend
|
||||||
try:
|
try:
|
||||||
self.raw_data = numpy.genfromtxt(self.metrics_file, names=True, delimiter=';', dtype=None)
|
self.raw_data = numpy.genfromtxt(self.metrics_file, names=True, delimiter=';', dtype=None)
|
||||||
|
|
Loading…
Reference in New Issue