summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
Diffstat (limited to 'bin')
-rwxr-xr-xbin/analyze-archive.py2
-rwxr-xr-xbin/analyze-timing.py2
-rwxr-xr-xbin/cal-hist2
-rwxr-xr-xbin/eval-accounting-overhead.py2
-rwxr-xr-xbin/eval-outlier-removal.py2
-rwxr-xr-xbin/eval-rel-energy.py2
-rwxr-xr-xbin/gptest.py2
-rwxr-xr-xbin/gradient2
-rwxr-xr-xbin/mim-vs-keysight.py2
-rwxr-xr-xbin/mimosa-etv2
-rwxr-xr-xbin/mimplot2
-rwxr-xr-xbin/test_corrcoef.py2
12 files changed, 12 insertions, 12 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