Skip to content

Commit 3c09ef6

Browse files
authored
Unskip some macOS tests (#14)
* Unskip some macOS tests * Remove old test comments
1 parent 8b668cd commit 3c09ef6

1 file changed

Lines changed: 0 additions & 19 deletions

File tree

tests/test_gpcca.py

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
from typing import Optional
2929
from operator import itemgetter
3030
from itertools import combinations
31-
import sys
3231

3332
import pytest
3433

@@ -164,9 +163,6 @@ def test_init_final_rot_matrix_brandts(
164163

165164
class TestGPCCAMatlabUnit:
166165
def test_do_schur(self, example_matrix_mu: np.ndarray):
167-
if int(example_matrix_mu[2, 4]) == 0 and sys.platform == "darwin":
168-
pytest.skip("On macOS this fails, see: https://github.com/msmdev/pyGPCCA/pull/24")
169-
170166
N = 9
171167
P, sd = get_known_input(example_matrix_mu)
172168
X, RR, _ = _do_schur(P, eta=sd, m=N)
@@ -472,10 +468,6 @@ def test_opt_soft_nelder_mead_more(self):
472468
ks = np.arange(kmin, kmax)
473469

474470
for mu_ in [0, 10, 50, 100, 200, 500, 1000]:
475-
if mu_ == 0 and sys.platform == "darwin":
476-
skipped = True # https://github.com/msmdev/pyGPCCA/pull/24
477-
continue
478-
479471
mu_ = mu(mu_)
480472
P, sd = get_known_input(mu_)
481473
X, _, _ = _do_schur(P, eta=sd, m=kmax)
@@ -533,9 +525,6 @@ def test_use_minChi(self):
533525
skipped = False
534526

535527
for m in [0, 10, 50, 100, 200, 500, 1000]:
536-
if m == 0 and sys.platform == "darwin":
537-
skipped = True
538-
continue
539528
mu_ = mu(m)
540529
P, sd = get_known_input(mu_)
541530
g = GPCCA(P, eta=sd)
@@ -578,10 +567,6 @@ def sort_evals(e: np.ndarray, take: int = 4) -> np.ndarray:
578567
@skip_if_no_petsc_slepc
579568
class TestPETScSLEPc:
580569
def test_do_schur_krylov(self, example_matrix_mu: np.ndarray):
581-
# TODO: if it passes, remove, otherwise uncomment
582-
# if int(example_matrix_mu[2, 4]) == 0 and sys.platform == "darwin":
583-
# pytest.skip("On macOS this fails, see: https://github.com/msmdev/pyGPCCA/pull/24")
584-
585570
N = 9
586571
P, sd = get_known_input(example_matrix_mu)
587572

@@ -602,10 +587,6 @@ def test_do_schur_krylov_eq_brandts(self, example_matrix_mu: np.ndarray):
602587
assert np.max(subspace_angles(X_b, X_k)) < eps
603588

604589
def test_do_schur_sparse(self, example_matrix_mu: np.ndarray):
605-
# TODO: if it passes, remove, otherwise uncomment
606-
# if int(example_matrix_mu[2, 4]) == 0 and sys.platform == "darwin":
607-
# pytest.skip("On macOS this fails, see: https://github.com/msmdev/pyGPCCA/pull/24")
608-
609590
N = 9
610591
P, sd = get_known_input(example_matrix_mu)
611592

0 commit comments

Comments
 (0)