Skip to content

Commit 5d66cba

Browse files
committed
Remove pytest cache
Moved timing of original numpy operations after optimized matrix operations in performance tests. This improves readability and ensures consistent measurement order.
1 parent 532dee4 commit 5d66cba

1 file changed

Lines changed: 19 additions & 19 deletions

File tree

tests/test_matrix_variable.py

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -262,16 +262,16 @@ def test_matrix_sum_axis_is_none_performance(n):
262262
model = Model()
263263
x = model.addMatrixVar((n, n))
264264

265-
# Original sum via `np.ndarray.sum`
266-
start = time()
267-
x.view(np.ndarray).sum()
268-
orig = time() - start
269-
270265
# Optimized sum via `quicksum`
271266
start = time()
272267
x.sum()
273268
matrix = time() - start
274269

270+
# Original sum via `np.ndarray.sum`
271+
start = time()
272+
x.view(np.ndarray).sum()
273+
orig = time() - start
274+
275275
assert model.isGT(orig, matrix)
276276

277277

@@ -280,16 +280,16 @@ def test_matrix_sum_axis_not_none_performance(n):
280280
model = Model()
281281
x = model.addMatrixVar((n, n))
282282

283-
# Original sum via `np.ndarray.sum`
284-
start = time()
285-
x.view(np.ndarray).sum(axis=0)
286-
orig = time() - start
287-
288283
# Optimized sum via `quicksum`
289284
start = time()
290285
x.sum(axis=0)
291286
matrix = time() - start
292287

288+
# Original sum via `np.ndarray.sum`
289+
start = time()
290+
x.view(np.ndarray).sum(axis=0)
291+
orig = time() - start
292+
293293
assert model.isGT(orig, matrix)
294294

295295

@@ -298,16 +298,16 @@ def test_matrix_mean_performance(n):
298298
model = Model()
299299
x = model.addMatrixVar((n, n))
300300

301-
# Original mean via `np.ndarray.mean`
302-
start = time()
303-
x.view(np.ndarray).mean(axis=0)
304-
orig = time() - start
305-
306301
# Optimized mean via `quicksum`
307302
start = time()
308303
x.mean(axis=0)
309304
matrix = time() - start
310305

306+
# Original mean via `np.ndarray.mean`
307+
start = time()
308+
x.view(np.ndarray).mean(axis=0)
309+
orig = time() - start
310+
311311
assert model.isGT(orig, matrix)
312312

313313

@@ -325,14 +325,14 @@ def test_matrix_dot_performance(n):
325325
x = model.addMatrixVar((n, n))
326326
a = np.random.rand(n, n)
327327

328-
start = time()
329-
a @ x.view(np.ndarray)
330-
orig = time() - start
331-
332328
start = time()
333329
a @ x
334330
matrix = time() - start
335331

332+
start = time()
333+
a @ x.view(np.ndarray)
334+
orig = time() - start
335+
336336
assert model.isGT(orig, matrix)
337337

338338

0 commit comments

Comments
 (0)