Small benchmarks updates

.github/workflows/pytest.yml → .github/workflows/benchmarks.yml

@@ -22,10 +22,10 @@ jobs:
     strategy:
       max-parallel: 2
       matrix:
-        python-version: [3.7]
+        python-version: [3.8]
         include:
-          - python-version: 3.7
-            conda-py: 37
+          - python-version: 3.8
+            conda-py: 38
     env:
       CONDA_PY: ${{ matrix.conda-py }} # strange way to manage env vars inclusion
 
@@ -89,7 +89,7 @@ jobs:
         run: |
           conda activate yadism
           #
-          conda install -y pylint
+          conda install -y pylint toml
           # Search for actual errors
           pylint src/*/*.py -E
           # For warnings instead return always zero
@@ -118,8 +118,8 @@ jobs:
         run: |
           conda activate yadism
           # install needed lhapdf PDFSets
-          lhapdf update
-          lhapdf get CT14llo_NF3
+          #lhapdf update
+          #lhapdf get CT14llo_NF3
           # generate input db
           cd benchmarks/data
           python theory.py
@@ -133,10 +133,18 @@ jobs:
         run: |
           conda activate yadism
           # run tests
-          #pytest -m quick_check --cov=src --cov-report html
-          pytest
-      #- name: Archive code coverage results
-      #  uses: actions/upload-artifact@v1
-      #  with:
-      #    name: htmlcov
-      #    path: htmlcov
+          pytest -m quick_check benchmarks
+          #pytest
+      - name: Archive code coverage results
+        uses: actions/upload-artifact@v1
+        with:
+          name: htmlcov
+          path: htmlcov
+      - name: Upload coverage to Codecov
+        uses: codecov/codecov-action@v1
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
+          file: ./coverage.xml
+          flags: benchmarks
+          name: codecov-umbrella
+          fail_ci_if_error: true

.github/workflows/unittests.yml

@@ -0,0 +1,138 @@
+name: yadism - unit tests
+
+on:
+  - push
+
+defaults:
+  run:
+    shell: bash -l {0}
+
+env:
+  UPLOAD_NON_MASTER: false
+
+jobs:
+  # build is the <job_id>
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      max-parallel: 2
+      matrix:
+        python-version: [3.8]
+        include:
+          - python-version: 3.8
+            conda-py: 38
+    env:
+      CONDA_PY: ${{ matrix.conda-py }} # strange way to manage env vars inclusion
+
+    steps:
+      # checkout the repo on the github runner
+      - uses: actions/checkout@v2
+      # checkout submodules
+      - name: Checkout submodules
+        uses: actions/checkout@v2
+        with:
+          repository: N3PDF/eko
+          token: ${{ secrets.ALE_DIS_PAT }}
+          path: eko
+      # fetch all tags & stuffs
+      #   in order to make GIT_DESCRIBE_* available (from git describe --tags)
+      #   --> needed only for the conda-recipe
+      - name: Fetch tags
+        run: git fetch --unshallow --no-recurse-submodules
+      # use an external action to setup miniconda
+      #   - also setup a conda virtual environment named 'yadism'
+      #
+      # (in order to use the conda venv at each step you need to login with
+      # 'bash -l {0}' in the 'shell' field, and to activate the environment)
+      - uses: goanpeca/setup-miniconda@v1
+        with:
+          auto-update-conda: true
+          miniconda-version: "latest"
+          activate-environment: yadism
+          python-version: ${{ matrix.python-version }}
+      # install lhapdf and apfel from the nnpdf conda repo
+      - name: Install lhapdf and apfel with conda
+        run: |
+          conda activate yadism
+          #
+          conda config --add channels https://packages.nnpdf.science/conda
+          conda install -y lhapdf
+          conda install -y apfel
+      # install eko
+      #   - @ the correct commit (no official suitable tag currently available)
+      #   - providing the C dependencies
+      - name: Install eko
+        run: |
+          conda activate yadism
+          #
+          cd eko
+          # git fetch --unshallow
+          # git checkout 8b4f1c44664ed699d455c52c80f2bd1f9c0c642d
+          cd ..
+          # install Gnu Scientific Library (GSL)
+          #   sudo works passwordless on github-workflow
+          sudo apt-get install libgsl-dev
+          # install eko (trailing '/' needed!)
+          pip install eko/
+      # pass with the linter
+      #   - only for 'dis', 'eko' is a dependency (supposed to be delivered
+      #     already checked)
+      - name: Lint with pylint
+        run: |
+          conda activate yadism
+          #
+          conda install -y pylint toml
+          # Search for actual errors
+          pylint src/*/*.py -E
+          # For warnings instead return always zero
+          pylint src/*/*.py --exit-zero
+      # install the actual python package 'yadism'
+      - name: Install yadism
+        run: |
+          conda activate yadism
+          #
+          pip install .
+      - name: debug - Explore file system
+        run: |
+          conda activate yadism
+          #
+          sudo apt install tree
+          tree > dir_tree.txt
+      - name: debug - Report file system exploration
+        uses: actions/upload-artifact@v1
+        with:
+          name: dir_tree
+          path: dir_tree.txt
+      - name: Prepare Test environment
+        run: |
+          conda activate yadism
+          # install needed lhapdf PDFSets
+          #lhapdf update
+          #lhapdf get CT14llo_NF3
+          # generate input db
+          cd benchmarks/data
+          python theory.py
+          python observables.py
+          cd ../..
+          # install pytest and extensions
+          pip install pytest pytest-cov
+      #  run the test with 'pytest'
+      - name: Test yadism
+        run: |
+          conda activate yadism
+          # run tests
+          pytest -m quick_check tests
+          #pytest
+      - name: Archive code coverage results
+        uses: actions/upload-artifact@v1
+        with:
+          name: htmlcov
+          path: htmlcov
+      - name: Upload coverage to Codecov
+        uses: codecov/codecov-action@v1
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
+          file: ./coverage.xml
+          flags: unittests
+          name: codecov-umbrella
+          fail_ci_if_error: true

.pylintrc

@@ -51,6 +51,7 @@ confidence=
 # no Warning level messages displayed, use"--disable=all --enable=classes
 # --disable=W"
 disable=
+    no-else-return,
     print-statement,
 	parameter-unpacking,
 	unpacking-in-except,
@@ -194,35 +195,50 @@ min-similarity-lines=4
 # Naming hint for argument names
 argument-name-hint=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$
 
+# Naming style matching correct argument names.
+argument-naming-style=snake_case
+
 # Regular expression matching correct argument names
-argument-rgx=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$
+#argument-rgx=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$
 
 # Naming hint for attribute names
 attr-name-hint=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$
 
+# Naming style matching correct argument names.
+attr-naming-style=snake_case
+
 # Regular expression matching correct attribute names
-attr-rgx=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$
+#attr-rgx=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$
 
 # Bad variable names which should always be refused, separated by a comma
 bad-names=foo,bar,baz,toto,tutu,tata
 
 # Naming hint for class attribute names
 class-attribute-name-hint=([A-Za-z_][A-Za-z0-9_]{2,30}|(__.*__))$
 
+# Naming style matching correct class attribute names.
+class-attribute-naming-style=any
+
 # Regular expression matching correct class attribute names
-class-attribute-rgx=([A-Za-z_][A-Za-z0-9_]{2,30}|(__.*__))$
+#class-attribute-rgx=([A-Za-z_][A-Za-z0-9_]{2,30}|(__.*__))$
 
 # Naming hint for class names
 class-name-hint=[A-Z_][a-zA-Z0-9]+$
 
+# Naming style matching correct class names.
+class-naming-style=PascalCase
+
 # Regular expression matching correct class names
-class-rgx=[A-Z_][a-zA-Z0-9]+$
+#class-rgx=[A-Z_][a-zA-Z0-9]+$
 
 # Naming hint for constant names
 const-name-hint=(([A-Z_][A-Z0-9_]*)|(__.*__))$
 
+# Naming style matching correct constant names.
+const-naming-style=snake_case
+
 # Regular expression matching correct constant names
-const-rgx=(([A-Z_][A-Z0-9_]*)|(__.*__))$
+#const-rgx=(([A-Z_][A-Z0-9_]*)|(__.*__))$
 
 # Minimum line length for functions/classes that require docstrings, shorter
 # ones are exempt.
@@ -231,8 +247,11 @@ docstring-min-length=-1
 # Naming hint for function names
 function-name-hint=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$
 
+# Naming style matching correct function names.
+function-naming-style=snake_case
+
 # Regular expression matching correct function names
-function-rgx=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$
+#function-rgx=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$
 
 # Good variable names which should always be accepted, separated by a comma
 good-names=i,j,k,ex,Run,_
@@ -243,20 +262,29 @@ include-naming-hint=no
 # Naming hint for inline iteration names
 inlinevar-name-hint=[A-Za-z_][A-Za-z0-9_]*$
 
+# Naming style matching correct inline iteration names.
+inlinevar-naming-style=any
+
 # Regular expression matching correct inline iteration names
-inlinevar-rgx=[A-Za-z_][A-Za-z0-9_]*$
+#inlinevar-rgx=[A-Za-z_][A-Za-z0-9_]*$
 
 # Naming hint for method names
 method-name-hint=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$
 
+# Naming style matching correct method names.
+method-naming-style=snake_case
+
 # Regular expression matching correct method names
-method-rgx=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$
+#method-rgx=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$
 
 # Naming hint for module names
 module-name-hint=(([a-z_][a-z0-9_]*)|([A-Z][a-zA-Z0-9]+))$
 
+# Naming style matching correct module names.
+module-naming-style=snake_case
+
 # Regular expression matching correct module names
-module-rgx=(([a-z_][a-z0-9_]*)|([A-Z][a-zA-Z0-9]+))$
+#module-rgx=(([a-z_][a-z0-9_]*)|([A-Z][a-zA-Z0-9]+))$
 
 # Colon-delimited sets of names that determine each other's naming style when
 # the name regexes allow several styles.
@@ -273,8 +301,11 @@ property-classes=abc.abstractproperty
 # Naming hint for variable names
 variable-name-hint=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$
 
+# Naming style matching correct variable names.
+variable-naming-style=snake_case
+
 # Regular expression matching correct variable names
-variable-rgx=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$
+#variable-rgx=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$
 
 
 [VARIABLES]

README.md

@@ -1,5 +1,7 @@
 <p align="center">
   <a href="https://github.com/N3PDF/dis/actions?query=workflow%3A%22yadism%22"><img alt="Tests" src="https://github.com/N3PDF/dis/workflows/yadism/badge.svg"></a>
+  <a href="https://codecov.io/gh/N3PDF/dis"><img src="https://codecov.io/gh/N3PDF/dis/branch/master/graph/badge.svg?token=qgCFyUQ6oG"/></a>
+  <a href="https://www.codefactor.io/repository/github/n3pdf/dis/overview/benchmarks/small-updates"><img src="https://www.codefactor.io/repository/github/n3pdf/dis/badge/benchmarks/small-updates?s=dd1c326325585a549c157120b9f55c06e6ea2b22" alt="CodeFactor" /></a>
   <a href="https://n3pdf.github.io/dis/"><img alt="Docs" src="https://github.com/N3PDF/dis/workflows/docs/badge.svg"></a>
 </p>
 

benchmarks/aux/templatePDF/templatePDF.info

@@ -1,12 +1,12 @@
-SetDesc: {{ description }} 
-SetIndex: 13206 
+SetDesc: {{ description }}
+SetIndex: 13206
 Authors: F. Hekhorn, A. Candido
 Reference:
 Format: lhagrid1
 DataVersion: 1
 NumMembers: 1
 Particle: 2212
-Flavors: {{ pids }} 
+Flavors: {{ pids }}
 ForcePositive: 1
 OrderQCD: 0
 FlavorScheme: variable

benchmarks/benchmark_against_apfel.py

@@ -9,6 +9,7 @@
 
 @pytest.mark.quick_check
 class TestPlain:
+    # def test_LO(self, DBInterface):
     def test_LO(self):
         """
         Test the full LO order against APFEL's.
@@ -31,7 +32,7 @@ def test_NLO(self):
         t_query &= p._theory_query.XIR == 1.0
         t_query &= p._theory_query.XIF == 1.0
 
-        o_query = p._obs_query
+        o_query = p._obs_query.prDIS.exists()
 
         p.run_all_tests(t_query, o_query, ["ToyLH"])
 
@@ -61,27 +62,27 @@ def test_LO(self):
         p = DBInterface()
         t_query = p._theory_query.PTO == 0
 
-        o_query = p._obs_query
+        o_query = p._obs_query.prDIS.exists()
 
         p.run_all_tests(t_query, o_query, ["ToyLH", "CT14llo_NF3"])
 
     def test_NLO(self):
         p = DBInterface()
         t_query = p._theory_query.PTO == 1
 
-        o_query = p._obs_query
+        o_query = p._obs_query.prDIS.exists()
 
         p.run_all_tests(t_query, o_query, ["ToyLH", "CT14llo_NF3"])
 
 
 if __name__ == "__main__":
     plain = TestPlain()
     plain.test_LO()
-    #plain.test_NLO()
+    # plain.test_NLO()
 
     sv = TestScaleVariations()
     # sv.test_LO()
     # sv.test_NLO()
 
     f = TestFull()
-    #f.test_LO()
+    # f.test_LO()