From 296674819fe23a841730d00cc41260126d4caada Mon Sep 17 00:00:00 2001 From: gagolews Date: Thu, 22 Apr 2021 16:48:34 +1000 Subject: [PATCH] gh action update --- .github/workflows/cibuildwheel.yml | 4 ++-- devel/pytest/test_approx.py | 28 +++++++++++++++++----------- setup.py | 2 +- 3 files changed, 20 insertions(+), 14 deletions(-) diff --git a/.github/workflows/cibuildwheel.yml b/.github/workflows/cibuildwheel.yml index a70b9168..d6cf164f 100644 --- a/.github/workflows/cibuildwheel.yml +++ b/.github/workflows/cibuildwheel.yml @@ -3,9 +3,9 @@ name: wheels on: workflow_dispatch env: - CIBW_SKIP: cp2* pp* cp35* cp36* + # nmslib does not build on 32bit Windows + CIBW_SKIP: cp2* pp* cp35* cp36* cp37-win32 cp38-win32 cp39-win32 cp39-win_amd64 CIBW_BEFORE_BUILD: pip install -r requirements.txt --upgrade - CIBW_ARCHS_WINDOWS: auto64 jobs: build_wheels: diff --git a/devel/pytest/test_approx.py b/devel/pytest/test_approx.py index 52027cb4..09d05f38 100644 --- a/devel/pytest/test_approx.py +++ b/devel/pytest/test_approx.py @@ -128,11 +128,7 @@ def __test_genie_approx(metric='euclidean'): print("") -def test_genie_approx(): - __test_genie_approx('euclidean') - __test_genie_approx('manhattan') - __test_genie_approx('cosine') - __test_genie_approx('maximum') + def __test_sparse(affinity='euclidean_sparse'): @@ -147,12 +143,7 @@ def __test_sparse(affinity='euclidean_sparse'): genieclust.Genie(affinity=affinity, exact=False).fit(X) -def test_sparse(): - __test_sparse('euclidean_sparse') - __test_sparse('manhattan_sparse') - __test_sparse('cosine_sparse') - __test_sparse('cosine_sparse_fast') - __test_sparse('chebyshev_sparse') + def __test_string(affinity='leven'): @@ -166,6 +157,21 @@ def __test_string(affinity='leven'): genieclust.Genie(affinity=affinity, exact=False, cast_float32=False).fit(X) + +def test_genie_approx(): + __test_genie_approx('euclidean') + __test_genie_approx('manhattan') + __test_genie_approx('cosine') + __test_genie_approx('maximum') + + +def test_sparse(): + __test_sparse('euclidean_sparse') + __test_sparse('manhattan_sparse') + __test_sparse('cosine_sparse') + __test_sparse('cosine_sparse_fast') + __test_sparse('chebyshev_sparse') + def test_string(): __test_string('leven') diff --git a/setup.py b/setup.py index 99ad4f1d..bcb4f47f 100644 --- a/setup.py +++ b/setup.py @@ -149,7 +149,7 @@ def build_extensions(self): "cython", "matplotlib", "scikit-learn", - "nmslib" + "nmslib" # nmslib does not build on 32bit Windows... ], extras_require={ "mlpack": ["mlpack"] # as of 2021-04-22, mlpack is not available for Python 3.9