From a4dd916471f7f0a956cb5fd8b592a5a76af02a01 Mon Sep 17 00:00:00 2001 From: Ben Greiner Date: Sat, 30 Jan 2021 13:26:20 +0100 Subject: [PATCH 1/2] failok for all windows versions unless BLAS is unset or mkl --- .github/scripts/set-conda-test-matrix.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/scripts/set-conda-test-matrix.py b/.github/scripts/set-conda-test-matrix.py index fcdb2134..f1d91c24 100644 --- a/.github/scripts/set-conda-test-matrix.py +++ b/.github/scripts/set-conda-test-matrix.py @@ -21,11 +21,9 @@ 'os': cos, 'python': cpy, 'blas_lib': cbl} - if (cos == 'windows' and - pyminor < 8 and - cbl not in ['unset', 'Intel10_64lp']): - # fatal windows error because numpy and matplotlib directly - # link to mkl on older versions + if (cos == 'windows' and cbl not in ['unset', 'Intel10_64lp']): + # sporadic fatal windows errors because numpy and matplotlib + # directly link to mkl on older versions cjob['failok'] = "FAILOK" conda_jobs.append(cjob) From 382f92fb7d8d4af5560cc884644c635b40b7d9a4 Mon Sep 17 00:00:00 2001 From: Ben Greiner Date: Wed, 3 Feb 2021 12:32:44 +0100 Subject: [PATCH 2/2] Conda test only unset and mkl on windows --- .github/scripts/set-conda-test-matrix.py | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/.github/scripts/set-conda-test-matrix.py b/.github/scripts/set-conda-test-matrix.py index f1d91c24..954480cb 100644 --- a/.github/scripts/set-conda-test-matrix.py +++ b/.github/scripts/set-conda-test-matrix.py @@ -10,22 +10,25 @@ 'win': 'windows', } +blas_implementations = ['unset', 'Generic', 'OpenBLAS', 'Intel10_64lp'] + +combinations = {'ubuntu': blas_implementations, + 'macos': blas_implementations, + 'windows': ['unset', 'Intel10_64lp'], + } + conda_jobs = [] for conda_pkg_file in Path("slycot-conda-pkgs").glob("*/*.tar.bz2"): cos = osmap[conda_pkg_file.parent.name.split("-")[0]] m = re.search(r'py(\d)(\d+)_', conda_pkg_file.name) pymajor, pyminor = int(m[1]), int(m[2]) cpy = f'{pymajor}.{pyminor}' - for cbl in ['unset', 'Generic', 'OpenBLAS', 'Intel10_64lp']: + for cbl in combinations[cos]: cjob = {'packagekey': f'{cos}-{cpy}', 'os': cos, 'python': cpy, 'blas_lib': cbl} - if (cos == 'windows' and cbl not in ['unset', 'Intel10_64lp']): - # sporadic fatal windows errors because numpy and matplotlib - # directly link to mkl on older versions - cjob['failok'] = "FAILOK" conda_jobs.append(cjob) matrix = { 'include': conda_jobs } -print(json.dumps(matrix)) \ No newline at end of file +print(json.dumps(matrix))