Merge pull request #2229 from NNPDF/scarlehoff-patch-1

Update regression tests
NNPDF · Nov 27, 2024 · e459fa5 · e459fa5
2 parents b92e378 + 4f4d801
commit e459fa5
Show file tree

Hide file tree

Showing 27 changed files with 6,383 additions and 6,400 deletions.
diff --git a/.github/workflows/redo_regressions.yml b/.github/workflows/redo_regressions.yml
@@ -13,15 +13,7 @@ env:
 jobs:
   build:
     if: contains(github.event.pull_request.labels.*.name, 'redo-regressions')
-    strategy:
-      matrix:
-        os: [ubuntu-latest]
-        python-version: ["3.11"]
-        include:
-          - os: ubuntu-latest
-            CONDA_OS: linux-64
-      fail-fast: false
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-latest
     env:
       NETRC_FILE: ${{ secrets.NETRC_FILE }}
       NNPDF_SSH_KEY: ${{ secrets.NNPDF_SSH_KEY }}
@@ -30,10 +22,9 @@ jobs:
       with:
         fetch-depth: 0
         ref: ${{ github.event.pull_request.head.ref }}
-
     - uses: conda-incubator/setup-miniconda@v3
       with:
-        python-version: ${{ matrix.python-version }}
+        python-version: "3.12"
         use-mamba: true
         auto-update-conda: true
         activate-environment: test

diff --git a/.github/workflows/regression_tests.yml b/.github/workflows/regression_tests.yml
@@ -4,27 +4,20 @@ on: [push]
 
 env:
   # https://keras.io/getting_started/faq/#how-can-i-obtain-reproducible-results-using-keras-during-development
+  # However, results might change between different versions of keras.
   PYTHONHASHSEED: "0"
 
 jobs:
   build:
-    strategy:
-      matrix:
-        os: [ubuntu-latest]
-        python-version: ["3.11"]
-        include:
-          - os: ubuntu-latest
-            CONDA_OS: linux-64
-      fail-fast: false
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-latest
     env:
       NETRC_FILE: ${{ secrets.NETRC_FILE }}
       NNPDF_SSH_KEY: ${{ secrets.NNPDF_SSH_KEY }}
     steps:
     - uses: actions/checkout@v4
     - uses: conda-incubator/setup-miniconda@v3
       with:
-        python-version: ${{ matrix.python-version }}
+        python-version: "3.12"
         use-mamba: true
         auto-update-conda: true
         activate-environment: test

diff --git a/extra_tests/regression_fits/central_16.exportgrid b/extra_tests/regression_fits/central_16.exportgrid
diff --git a/extra_tests/regression_fits/central_16.json b/extra_tests/regression_fits/central_16.json
@@ -51,45 +51,45 @@
   ],
   "stop_epoch": 1100,
   "best_epoch": 1099,
-  "erf_tr": 2.6700093746185303,
-  "erf_vl": 2.5960960388183594,
-  "chi2": 2.1047041416168213,
+  "erf_tr": 2.670008420944214,
+  "erf_vl": 2.596096992492676,
+  "chi2": 2.1046998500823975,
   "pos_state": "POS_VETO",
   "arc_lengths": [
-    1.3207826202191888,
-    1.4752515128602395,
-    1.1834880064420275,
-    1.0011424664941873,
-    1.1960902816154753
+    1.3207828791594132,
+    1.4752509039705253,
+    1.1834881566152593,
+    1.001142511580125,
+    1.196092717720998
   ],
   "integrability": [
-    0.000920316459089382,
-    0.0009203164590875224,
-    4.833296725237357e-05,
-    0.46257925033569225,
-    0.0069633987150139465
+    0.0009203169684056933,
+    0.0009203169684045553,
+    4.833282161953445e-05,
+    0.4625777900218959,
+    0.006963424209969649
   ],
   "timing": {
     "walltime": {
-      "Total": 11.461867332458496,
+      "Total": 11.937033891677856,
       "start": 0.0,
-      "replica_set": 0.22239995002746582,
-      "replica_fitted": 11.46180772781372,
-      "replica_set_to_replica_fitted": 11.239407777786255
+      "replica_set": 0.21915078163146973,
+      "replica_fitted": 11.936966180801392,
+      "replica_set_to_replica_fitted": 11.717815399169922
     },
     "cputime": {
-      "Total": 13.093227772000002,
+      "Total": 13.590334369999997,
       "start": 0.0,
-      "replica_set": 0.22140489500000005,
-      "replica_fitted": 13.093166188000001,
-      "replica_set_to_replica_fitted": 12.871761293
+      "replica_set": 0.2182931840000002,
+      "replica_fitted": 13.59026488,
+      "replica_set_to_replica_fitted": 13.371971696
     }
   },
   "version": {
-    "keras": "3.6.0",
+    "keras": "3.7.0",
     "tensorflow": "2.18.0, mkl=False",
     "numpy": "1.26.4",
-    "nnpdf": "4.0.9.post1608.dev0+77c3343e3",
-    "validphys": "4.0.9.post1608.dev0+77c3343e3"
+    "nnpdf": "4.0.9.post1787.dev0+07f3cbb3f",
+    "validphys": "4.0.9.post1787.dev0+07f3cbb3f"
   }
 }
diff --git a/extra_tests/regression_fits/diagonal_45.exportgrid b/extra_tests/regression_fits/diagonal_45.exportgrid
diff --git a/extra_tests/regression_fits/diagonal_45.json b/extra_tests/regression_fits/diagonal_45.json
@@ -51,45 +51,45 @@
   ],
   "stop_epoch": 1100,
   "best_epoch": 1099,
-  "erf_tr": 3.7433693408966064,
-  "erf_vl": 3.065732717514038,
-  "chi2": 2.1767027378082275,
+  "erf_tr": 3.7433674335479736,
+  "erf_vl": 3.0657362937927246,
+  "chi2": 2.1767046451568604,
   "pos_state": "POS_VETO",
   "arc_lengths": [
-    1.3174405034929306,
-    1.5070529634387448,
-    1.1761946839779471,
-    1.0013647273646804,
-    1.2246958247975697
+    1.3174412808078453,
+    1.507056700647889,
+    1.1761946212451913,
+    1.0013647595041133,
+    1.224693450344471
   ],
   "integrability": [
-    0.0008957564787127614,
-    0.0008957564787128725,
-    4.80677109626626e-05,
-    0.46389447897672587,
-    0.007004046346990256
+    0.0008957577374548997,
+    0.0008957577374534287,
+    4.806768413267992e-05,
+    0.46389435231685505,
+    0.007004016137214464
   ],
   "timing": {
     "walltime": {
-      "Total": 10.632083654403687,
+      "Total": 11.051729440689087,
       "start": 0.0,
-      "replica_set": 0.24991393089294434,
-      "replica_fitted": 10.63199520111084,
-      "replica_set_to_replica_fitted": 10.382081270217896
+      "replica_set": 0.22888803482055664,
+      "replica_fitted": 11.051657915115356,
+      "replica_set_to_replica_fitted": 10.8227698802948
     },
     "cputime": {
-      "Total": 12.098074116,
+      "Total": 12.532767175,
       "start": 0.0,
-      "replica_set": 0.24743486699999995,
-      "replica_fitted": 12.097983746999997,
-      "replica_set_to_replica_fitted": 11.850548879999998
+      "replica_set": 0.22790395100000005,
+      "replica_fitted": 12.532694279000001,
+      "replica_set_to_replica_fitted": 12.304790328
     }
   },
   "version": {
-    "keras": "3.6.0",
+    "keras": "3.7.0",
     "tensorflow": "2.18.0, mkl=False",
     "numpy": "1.26.4",
-    "nnpdf": "4.0.9.post1608.dev0+77c3343e3",
-    "validphys": "4.0.9.post1608.dev0+77c3343e3"
+    "nnpdf": "4.0.9.post1787.dev0+07f3cbb3f",
+    "validphys": "4.0.9.post1787.dev0+07f3cbb3f"
   }
 }