Merge pull request #821 from murrayrm/test_matrix-22Dec2022

murrayrm · web-flow · commit f15fc0f3aeb3 · 2022-12-24T09:06:06.000-08:00
Add test matrix against operating environments
diff --git a/.github/conda-env/build-env.yml b/.github/conda-env/build-env.yml
@@ -0,0 +1,4 @@
+name: build-env
+dependencies:
+  - boa
+  - numpy !=1.23.0
diff --git a/.github/conda-env/test-env.yml b/.github/conda-env/test-env.yml
@@ -1,5 +1,6 @@
 name: test-env
 dependencies:
+  - conda-build  # for conda index
   - pip
   - coverage
   - coveralls
diff --git a/.github/scripts/set-conda-test-matrix.py b/.github/scripts/set-conda-test-matrix.py
@@ -0,0 +1,34 @@
+""" set-conda-test-matrix.py
+
+Create test matrix for conda packages
+"""
+import json, re
+from pathlib import Path
+
+osmap = {'linux': 'ubuntu',
+         'osx': 'macos',
+         '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 combinations[cos]:
+        cjob = {'packagekey': f'{cos}-{cpy}',
+                'os': cos,
+                'python': cpy,
+                'blas_lib':  cbl}
+        conda_jobs.append(cjob)
+
+matrix = { 'include': conda_jobs }
+print(json.dumps(matrix))
diff --git a/.github/scripts/set-pip-test-matrix.py b/.github/scripts/set-pip-test-matrix.py
@@ -0,0 +1,28 @@
+""" set-pip-test-matrix.py
+
+Create test matrix for pip wheels
+"""
+import json
+from pathlib import Path
+
+system_opt_blas_libs = {'ubuntu': ['OpenBLAS'],
+                        'macos' : ['OpenBLAS', 'Apple']}
+
+wheel_jobs = []
+for wkey in Path("slycot-wheels").iterdir():
+    wos, wpy, wbl = wkey.name.split("-")
+    wheel_jobs.append({'packagekey':  wkey.name,
+                        'os': wos,
+                        'python': wpy,
+                        'blas_lib': wbl,
+                        })
+    if wbl == "Generic":
+        for bl in system_opt_blas_libs[wos]:
+            wheel_jobs.append({ 'packagekey':  wkey.name,
+                                'os': wos,
+                                'python': wpy,
+                                'blas_lib': bl,
+                                })
+
+matrix = { 'include': wheel_jobs }
+print(json.dumps(matrix))
diff --git a/.github/workflows/os-blas-test-matrix.yml b/.github/workflows/os-blas-test-matrix.yml
diff --git a/control/tests/flatsys_test.py b/control/tests/flatsys_test.py
