diff --git a/.gitea/workflows/build_and_test.yml b/.gitea/workflows/build_and_test.yml index 680263583..d90d00470 100644 --- a/.gitea/workflows/build_and_test.yml +++ b/.gitea/workflows/build_and_test.yml @@ -465,7 +465,7 @@ jobs: ./jfjoch_hdf5_test ../../tests/test_data/compression_benchmark.h5 # ---- Validation battery ------------------------------------------------------------------------ - # Every push runs the ci tier of tools/battery (28 sets, about 10 minutes of rugnux on an RTX 5080, + # Every push runs the ci tier of tools/battery (29 sets, about 11 minutes of rugnux on an RTX 5080, # plus the build); the full battery (open + inhouse arms, about 2 hours of rugnux there) runs only # when started by hand (Run workflow, battery_subset empty; no release). It runs on the one machine # that holds the battery data, after the unit tests of the same run (needs:), which share its GPU, diff --git a/tools/battery/README.md b/tools/battery/README.md index 731012dec..2233fbcbc 100644 --- a/tools/battery/README.md +++ b/tools/battery/README.md @@ -244,7 +244,7 @@ R=build/rugnux/rugnux $B run --rugnux $R # full battery: open + inhouse $B run --rugnux $R --tier smoke # 21 sets covering readers, symmetry, known hard cases -$B run --rugnux $R --tier ci # 28 sets every recent release passed (CI, below), plus the wrong-model null +$B run --rugnux $R --tier ci # 29 sets every recent release passed (CI, below), plus the wrong-model null $B nullmodel --rugnux $R # the wrong-model null on its own (CI's second step) $B run --rugnux $R --only 5reo,lyso_ref # named sets $B run --rugnux $R --arm private # the private arm, on its own @@ -282,13 +282,13 @@ run's crash shows as one too. - **smoke** covers the readers, the symmetry classes and some known hard cases; several of its sets fail on purpose. -- **ci** is the routine regression check: 28 sets that passed with the same space group and steady +- **ci** is the routine regression check: 29 sets that passed with the same space group and steady d_min and ISa in every full run of rc174 and rc175, with no warning that questions the lattice or the group (supercell, harmonic, twinning, untested centring). It spans HDF5, miniCBF, cbf.gz, marCCD (both formats) and SMV; every crystal system, centred and high-symmetry lattices, small - molecules, anomalous and long-wavelength data, pink beam, a twinnable P31 and one large set - (8qaw, about 2 minutes) - about 10 minutes of rugnux in all on the RTX 5080. A set that starts - failing for a known, accepted reason leaves the tier; one that is merely slow stays. KDP joined + molecules, anomalous and long-wavelength data, pink beam, a twinnable P31 and two large sets + (8qaw, about 2 minutes; the 4nwv virus capsid, about 1 minute) - about 11 minutes of rugnux in + all on the RTX 5080. A set that starts failing for a known, accepted reason leaves the tier; one that is merely slow stays. KDP joined later than the rest: it passes as an `indistinguishable_alternative` (I41md for I-42d), and its twinning warning is most likely a false alarm from four heavy atoms in the cell. The two no-crystal controls (nothing_1, nothing_2) joined once the no-crystal test got its own significance (1e-9): diff --git a/tools/battery/open.json b/tools/battery/open.json index fdc4e693f..10ea5cf1d 100644 --- a/tools/battery/open.json +++ b/tools/battery/open.json @@ -202,7 +202,7 @@ {"id": "9s02", "input": "9s02/PYCR1-D11_1_master.h5", "wavelength": 0.97625, "ref": {"sg": "P 21 21 2", "sgno": 18, "cell": [163.674, 88.042, 116.731, 90.0, 90.0, 90.0], "dmin": 1.65}, "tags": ["h5", "orthorhombic"], "tiers": {"ci": "HDF5, orthorhombic P21212"}}, {"id": "6gvk", "input": "6gvk/212_3_0001.cbf", "wavelength": 0.97915, "ref": {"sg": "C 1 2 1", "sgno": 5, "cell": [105.58, 59.52, 42.4, 90.0, 113.5, 90.0], "dmin": 1.55}, "tags": ["cbf", "monoclinic"], "pinned": true, "tiers": {"ci": "C-centred monoclinic C2"}}, {"id": "4mtk", "input": "4mtk/sbgrid235/lambda_1.0A_1_00001.cbf", "wavelength": 1.0, "ref": {"sg": "P 61", "sgno": 169, "cell": [168.275, 168.275, 652.849, 90.0, 90.0, 120.0], "dmin": 3.322}, "tags": ["cbf", "hexagonal", "large-cell", "long-axis"]}, - {"id": "4nwv", "input": "4nwv/sbgrid9/formal.001", "wavelength": 1.12706, "ref": {"sg": "I 2 2 2", "sgno": 23, "cell": [402.197, 369.862, 410.511, 90.0, 90.0, 90.0], "dmin": 3.25}, "tags": ["marCCD", "orthorhombic", "large-cell", "virus"]}, + {"id": "4nwv", "input": "4nwv/sbgrid9/formal.001", "wavelength": 1.12706, "ref": {"sg": "I 2 2 2", "sgno": 23, "cell": [402.197, 369.862, 410.511, 90.0, 90.0, 90.0], "dmin": 3.25}, "tags": ["marCCD", "orthorhombic", "large-cell", "virus"], "tiers": {"ci": "virus capsid, 400 A body-centred cell, marCCD"}}, {"id": "7d98", "input": "7d98/xrda13/data/cbnrf006_01_00011.cbf", "wavelength": 1.9, "ref": {"sg": "P 61 2 2", "sgno": 178, "cell": [105.819, 105.819, 602.516, 90.0, 90.0, 120.0], "dmin": 3.6}, "tags": ["cbf", "hexagonal", "large-cell", "long-axis", "long-wavelength"], "pinned": true}, {"id": "9v16", "input": "9v16/xrd-00338/9V16/data01_master.h5", "wavelength": 0.9, "ref": {"sg": "P 41 21 2", "sgno": 92, "cell": [185.604, 185.604, 451.242, 90.0, 90.0, 90.0], "dmin": 3.45}, "tags": ["h5", "tetragonal", "large-cell", "long-axis"]}, {"id": "4p8r", "input": "4p8r/data/4p8r/series/gzn0-7.001", "wavelength": 0.97872, "ref": {"sg": "P 65 2 2", "sgno": 179, "cell": [86.7, 86.7, 701.37, 90.0, 90.0, 120.0], "dmin": 2.2}, "tags": ["marCCD", "hexagonal", "large-cell", "long-axis"]}