Skip to content

Commit

Permalink
Unskip some macOS tests (#14)
Browse files Browse the repository at this point in the history
* Unskip some macOS tests

* Remove old test comments
  • Loading branch information
michalk8 committed Jan 26, 2021
1 parent 8b668cd commit 3c09ef6
Showing 1 changed file with 0 additions and 19 deletions.
19 changes: 0 additions & 19 deletions tests/test_gpcca.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
from typing import Optional
from operator import itemgetter
from itertools import combinations
import sys

import pytest

Expand Down Expand Up @@ -164,9 +163,6 @@ def test_init_final_rot_matrix_brandts(

class TestGPCCAMatlabUnit:
def test_do_schur(self, example_matrix_mu: np.ndarray):
if int(example_matrix_mu[2, 4]) == 0 and sys.platform == "darwin":
pytest.skip("On macOS this fails, see: https://github.com/msmdev/pyGPCCA/pull/24")

N = 9
P, sd = get_known_input(example_matrix_mu)
X, RR, _ = _do_schur(P, eta=sd, m=N)
Expand Down Expand Up @@ -472,10 +468,6 @@ def test_opt_soft_nelder_mead_more(self):
ks = np.arange(kmin, kmax)

for mu_ in [0, 10, 50, 100, 200, 500, 1000]:
if mu_ == 0 and sys.platform == "darwin":
skipped = True # https://github.com/msmdev/pyGPCCA/pull/24
continue

mu_ = mu(mu_)
P, sd = get_known_input(mu_)
X, _, _ = _do_schur(P, eta=sd, m=kmax)
Expand Down Expand Up @@ -533,9 +525,6 @@ def test_use_minChi(self):
skipped = False

for m in [0, 10, 50, 100, 200, 500, 1000]:
if m == 0 and sys.platform == "darwin":
skipped = True
continue
mu_ = mu(m)
P, sd = get_known_input(mu_)
g = GPCCA(P, eta=sd)
Expand Down Expand Up @@ -578,10 +567,6 @@ def sort_evals(e: np.ndarray, take: int = 4) -> np.ndarray:
@skip_if_no_petsc_slepc
class TestPETScSLEPc:
def test_do_schur_krylov(self, example_matrix_mu: np.ndarray):
# TODO: if it passes, remove, otherwise uncomment
# if int(example_matrix_mu[2, 4]) == 0 and sys.platform == "darwin":
# pytest.skip("On macOS this fails, see: https://github.com/msmdev/pyGPCCA/pull/24")

N = 9
P, sd = get_known_input(example_matrix_mu)

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

def test_do_schur_sparse(self, example_matrix_mu: np.ndarray):
# TODO: if it passes, remove, otherwise uncomment
# if int(example_matrix_mu[2, 4]) == 0 and sys.platform == "darwin":
# pytest.skip("On macOS this fails, see: https://github.com/msmdev/pyGPCCA/pull/24")

N = 9
P, sd = get_known_input(example_matrix_mu)

Expand Down

0 comments on commit 3c09ef6

Please sign in to comment.