Fixed bugs and imports

2 files changed, 5 insertions, 24 deletions

diff --git a/pyecsca/sca/stacked_traces/stacked_traces.py b/pyecsca/sca/stacked_traces/stacked_traces.py
index 8387ce1..73532c3 100644
--- a/pyecsca/sca/stacked_traces/stacked_traces.py
+++ b/pyecsca/sca/stacked_traces/stacked_traces.py
@@ -4,7 +4,7 @@ from public import public
 from typing import Any, Mapping, MutableSequence, Tuple
 from math import sqrt
 
-from pyecsca.pyecsca.sca.trace.trace import CombinedTrace
+from pyecsca.sca.trace.trace import CombinedTrace
 
 
 @public
@@ -166,7 +166,7 @@ def gpu_avg_var(samples: np.ndarray, result_avg: np.ndarray,
     if col >= samples.shape[1]:
         return
 
-    _gpu_average(samples, result_avg)
+    _gpu_average(col, samples, result_avg)
     _gpu_var_from_avg(col, samples, result_avg, result_var)
 
 
diff --git a/test/sca/test_stacked_combine.py b/test/sca/test_stacked_combine.py
index 63f51cc..91ad4fd 100644
--- a/test/sca/test_stacked_combine.py
+++ b/test/sca/test_stacked_combine.py
@@ -2,7 +2,7 @@ from unittest import TestCase
 import unittest
 
 import numpy as np
-from pyecsca.pyecsca.sca import (
+from pyecsca.sca import (
     Trace,
     StackedTraces,
     GPUTraceManager,
@@ -32,7 +32,7 @@ class StackedCombineTests(TestCase):
             stacked.samples.shape,
             (self.samples.shape[0], min_len)
         )
-        self.assertTrue((stacked.samples, self.samples[:,:min_len]).all())
+        self.assertTrue((stacked.samples == self.samples[:,:min_len]).all())
     
     def test_fromtraceset(self):
         max_len = self.samples.shape[1]
@@ -42,7 +42,7 @@ class StackedCombineTests(TestCase):
             for t
             in self.samples
         ]
-        tset = TraceSet(traces)
+        tset = TraceSet(*traces)
         min_len = min(map(len, traces))
         stacked = StackedTraces.fromtraceset(tset)
 
@@ -103,22 +103,3 @@ class StackedCombineTests(TestCase):
         )
         self.assertTrue(all(np.isclose(avg_trace.samples, avg_cmp)))
         self.assertTrue(all(np.isclose(var_trace.samples, var_cmp)))
-
-
-    # def test_average():
-    #     samples = np.random.rand(4 * TPB, 8 * TPB)
-    #     ts = StackedTraces.fromarray(np.array(samples))
-    #     res = GPUTraceManager.average(ts)
-    #     check_res = samples.sum(0) / ts.traces.shape[0]
-    #     print(all(check_res == res))
-
-    # def test_standard_deviation():
-    #     samples: np.ndarray = np.random.rand(4 * TPB, 8 * TPB)
-    #     ts = StackedTraces.fromarray(np.array(samples))
-    #     res = GPUTraceManager.standard_deviation(ts)
-    #     check_res = samples.std(0, dtype=samples.dtype)
-    #     print(all(np.isclose(res, check_res)))
-
-
-if __name__ == '__main__':
-    unittest.main()
\ No newline at end of file