diff options
| -rwxr-xr-x | bin/analyze-archive.py | 2 | ||||
| -rwxr-xr-x | bin/analyze-timing.py | 2 | ||||
| -rwxr-xr-x | bin/cal-hist | 2 | ||||
| -rwxr-xr-x | bin/eval-accounting-overhead.py | 2 | ||||
| -rwxr-xr-x | bin/eval-outlier-removal.py | 2 | ||||
| -rwxr-xr-x | bin/eval-rel-energy.py | 2 | ||||
| -rwxr-xr-x | bin/gptest.py | 2 | ||||
| -rwxr-xr-x | bin/gradient | 2 | ||||
| -rwxr-xr-x | bin/mim-vs-keysight.py | 2 | ||||
| -rwxr-xr-x | bin/mimosa-etv | 2 | ||||
| -rwxr-xr-x | bin/mimplot | 2 | ||||
| -rwxr-xr-x | bin/test_corrcoef.py | 2 | ||||
| -rw-r--r-- | lib/loader.py (renamed from lib/dfatool.py) | 0 | ||||
| -rwxr-xr-x | test/test_ptamodel.py | 2 | ||||
| -rwxr-xr-x | test/test_timingharness.py | 2 |
15 files changed, 14 insertions, 14 deletions
diff --git a/bin/analyze-archive.py b/bin/analyze-archive.py index 7cac27a..175570b 100755 --- a/bin/analyze-archive.py +++ b/bin/analyze-archive.py @@ -113,7 +113,7 @@ import random import re import sys from dfatool import plotter -from dfatool.dfatool import RawData, pta_trace_to_aggregate +from dfatool.loader import RawData, pta_trace_to_aggregate from dfatool.functions import gplearn_to_function from dfatool.model import PTAModel from dfatool.validation import CrossValidator diff --git a/bin/analyze-timing.py b/bin/analyze-timing.py index 3503279..ed9c571 100755 --- a/bin/analyze-timing.py +++ b/bin/analyze-timing.py @@ -79,7 +79,7 @@ import logging import re import sys from dfatool import plotter -from dfatool.dfatool import TimingData, pta_trace_to_aggregate +from dfatool.loader import TimingData, pta_trace_to_aggregate from dfatool.functions import gplearn_to_function from dfatool.model import AnalyticModel from dfatool.validation import CrossValidator diff --git a/bin/cal-hist b/bin/cal-hist index ba2ff47..07ab597 100755 --- a/bin/cal-hist +++ b/bin/cal-hist @@ -7,7 +7,7 @@ import struct import sys import tarfile import matplotlib.pyplot as plt -from dfatool.dfatool import MIMOSA +from dfatool.loader import MIMOSA from dfatool.utils import running_mean voltage = float(sys.argv[1]) diff --git a/bin/eval-accounting-overhead.py b/bin/eval-accounting-overhead.py index 7ea0807..1c03bf8 100755 --- a/bin/eval-accounting-overhead.py +++ b/bin/eval-accounting-overhead.py @@ -13,7 +13,7 @@ providing overhead per transition and getEnergy overhead """ -from dfatool.dfatool import AnalyticModel, TimingData, pta_trace_to_aggregate +from dfatool.loader import AnalyticModel, TimingData, pta_trace_to_aggregate import json import sys diff --git a/bin/eval-outlier-removal.py b/bin/eval-outlier-removal.py index b81c33a..c03266d 100755 --- a/bin/eval-outlier-removal.py +++ b/bin/eval-outlier-removal.py @@ -3,7 +3,7 @@ import getopt import re import sys -from dfatool.dfatool import RawData, pta_trace_to_aggregate +from dfatool.loader import RawData, pta_trace_to_aggregate from dfatool.model import PTAModel opt = dict() diff --git a/bin/eval-rel-energy.py b/bin/eval-rel-energy.py index 2af2cff..66c3ae2 100755 --- a/bin/eval-rel-energy.py +++ b/bin/eval-rel-energy.py @@ -3,7 +3,7 @@ import getopt import re import sys -from dfatool.dfatool import RawData, pta_trace_to_aggregate +from dfatool.loader import RawData, pta_trace_to_aggregate from dfatool.model import PTAModel opt = dict() diff --git a/bin/gptest.py b/bin/gptest.py index bcfb7aa..b5012e5 100755 --- a/bin/gptest.py +++ b/bin/gptest.py @@ -2,7 +2,7 @@ import sys import numpy as np -from dfatool.dfatool import ( +from dfatool.loader import ( RawData, pta_trace_to_aggregate, ) diff --git a/bin/gradient b/bin/gradient index 8280794..0409c38 100755 --- a/bin/gradient +++ b/bin/gradient @@ -7,7 +7,7 @@ import struct import sys import tarfile import matplotlib.pyplot as plt -from dfatool.dfatool import MIMOSA +from dfatool.loader import MIMOSA from dfatool.utils import running_mean voltage = float(sys.argv[1]) diff --git a/bin/mim-vs-keysight.py b/bin/mim-vs-keysight.py index c214f2f..c9a7249 100755 --- a/bin/mim-vs-keysight.py +++ b/bin/mim-vs-keysight.py @@ -3,7 +3,7 @@ import numpy as np import sys import matplotlib.pyplot as plt -from dfatool.dfatool import MIMOSA, KeysightCSV +from dfatool.loader import MIMOSA, KeysightCSV from dfatool.utils import running_mean voltage = float(sys.argv[1]) diff --git a/bin/mimosa-etv b/bin/mimosa-etv index 431e275..9b6e897 100755 --- a/bin/mimosa-etv +++ b/bin/mimosa-etv @@ -8,7 +8,7 @@ import numpy as np import os import re import sys -from dfatool.dfatool import MIMOSA +from dfatool.loader import MIMOSA from dfatool.model import aggregate_measures from dfatool.utils import running_mean diff --git a/bin/mimplot b/bin/mimplot index 2a888ee..0d4ba0e 100755 --- a/bin/mimplot +++ b/bin/mimplot @@ -9,7 +9,7 @@ import struct import sys import tarfile import matplotlib.pyplot as plt -from dfatool.dfatool import MIMOSA +from dfatool.loader import MIMOSA from dfatool.utils import running_mean opt = dict() diff --git a/bin/test_corrcoef.py b/bin/test_corrcoef.py index fef0b24..b8c8eae 100755 --- a/bin/test_corrcoef.py +++ b/bin/test_corrcoef.py @@ -4,7 +4,7 @@ import getopt import re import sys from dfatool import plotter -from dfatool.dfatool import RawData, pta_trace_to_aggregate +from dfatool.loader import RawData, pta_trace_to_aggregate from dfatool.functions import gplearn_to_function from dfatool.model import PTAModel diff --git a/lib/dfatool.py b/lib/loader.py index e8b5090..e8b5090 100644 --- a/lib/dfatool.py +++ b/lib/loader.py diff --git a/test/test_ptamodel.py b/test/test_ptamodel.py index e153280..94ee842 100755 --- a/test/test_ptamodel.py +++ b/test/test_ptamodel.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 -from dfatool.dfatool import RawData, pta_trace_to_aggregate +from dfatool.loader import RawData, pta_trace_to_aggregate from dfatool.model import PTAModel import os import unittest diff --git a/test/test_timingharness.py b/test/test_timingharness.py index cc4b766..917e4e2 100755 --- a/test/test_timingharness.py +++ b/test/test_timingharness.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 -from dfatool.dfatool import TimingData, pta_trace_to_aggregate +from dfatool.loader import TimingData, pta_trace_to_aggregate from dfatool.model import AnalyticModel from dfatool.parameters import prune_dependent_parameters import unittest |