Fix benchmarking

EasyScience · Jul 26, 2024 · c83e43a · c83e43a
1 parent 0acde6e
commit c83e43a
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 19 deletions.
diff --git a/.github/workflows/debug.yml b/.github/workflows/debug.yml
@@ -170,6 +170,20 @@ jobs:
           scripts/detect_abi3_violations.sh
           scripts/check_wheel_contents.sh
 
+      - name: Install pyCFML from created Python package wheel
+        shell: bash
+        run: scripts/install_pycfml_from_wheel.sh
+
+      - name: Run pyCFML unit tests
+        shell: bash
+        run: scripts/run_pycfml_unit_tests.sh
+
+      - name: Run pyCFML functional tests
+        shell: bash
+        run: |
+          scripts/run_pycfml_functional_tests_no_benchmarks.sh
+          scripts/run_pycfml_functional_tests_with_benchmarks.sh
+
       - name: Prepare for uploading Python package wheel of pyCFML
         shell: bash
         run: echo "WHEEL_DIR=$(python3 pybuild.py --print-wheel-dir)" >> $GITHUB_ENV
@@ -249,7 +263,7 @@ jobs:
           name: pycfml-wheel_${{ matrix.os }}_${{ matrix.toolchain.exe }}  # name (without .zip) of the zipped artifact uploaded on the previous jobs
           path: ${{ env.WHEEL_DIR }}  # directory to extract downloaded zipped artifacts
 
-      - name: Install pyCFML from downloaded Python package wheel (with dev extras)
+      - name: Install pyCFML from downloaded Python package wheel
         shell: bash
         run: scripts/install_pycfml_from_wheel.sh
 
@@ -262,10 +276,3 @@ jobs:
         run: |
           scripts/run_pycfml_functional_tests_no_benchmarks.sh
           scripts/run_pycfml_functional_tests_with_benchmarks.sh
-
-      - name: Push benchmark results to repository
-        uses: EndBug/add-and-commit@v9
-        with:
-          add: '.benchmarks/pyCFML'
-          message: 'Auto push pyCFML benchmark results by GitHub Action for ${{ runner.os }} + ${{ matrix.toolchain.exe }}'
-          pull: '--rebase --autostash'
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -148,6 +148,20 @@ jobs:
           scripts/create_pycfml_python_wheel.sh
           scripts/rename_pycfml_python_wheel.sh
 
+      - name: Install pyCFML from created Python package wheel
+        shell: bash
+        run: scripts/install_pycfml_from_wheel.sh
+
+      - name: Run pyCFML unit tests
+        shell: bash
+        run: scripts/run_pycfml_unit_tests.sh
+
+      - name: Run pyCFML functional tests
+        shell: bash
+        run: |
+          scripts/run_pycfml_functional_tests_no_benchmarks.sh
+          scripts/run_pycfml_functional_tests_with_benchmarks.sh
+
       - name: Prepare for uploading Python package wheel of pyCFML
         shell: bash
         run: |
@@ -250,7 +264,7 @@ jobs:
           name: pycfml-wheel_${{ matrix.os }}_${{ matrix.python-version }}  # name (without .zip) of the zipped artifact uploaded on the previous jobs
           path: ${{ env.WHEEL_DIR }}  # directory to extract downloaded zipped artifacts
 
-      - name: Install pyCFML from downloaded Python package wheel (with dev extras)
+      - name: Install pyCFML from downloaded Python package wheel
         shell: bash
         run: scripts/install_pycfml_from_wheel.sh
 
@@ -264,7 +278,8 @@ jobs:
           scripts/run_pycfml_functional_tests_no_benchmarks.sh
           scripts/run_pycfml_functional_tests_with_benchmarks.sh
 
-      - name: Push benchmark results to repository
+      - name: Push benchmark results to repository (Python 3.11 only)
+        if: matrix.python-version == '3.11'
         uses: EndBug/add-and-commit@v9
         with:
           add: '.benchmarks/pyCFML'

diff --git a/pybuild.py b/pybuild.py
@@ -838,10 +838,10 @@ def run_cfml_functional_tests_with_benchmarks():
     msg = _echo_msg(f"Running functional tests with benchmarks from '{relpath}'")
     lines.append(msg)
     cmd = CONFIG['template']['run-benchmarks']['base']
-    if _github_branch() == 'master':
-        cmd += ' ' + CONFIG['template']['run-benchmarks']['master-branch']
+    if _github_branch() == 'develop':
+        cmd += ' ' + CONFIG['template']['run-benchmarks']['develop-branch']
     else:
-        cmd += ' ' + CONFIG['template']['run-benchmarks']['non-master-branch']
+        cmd += ' ' + CONFIG['template']['run-benchmarks']['non-develop-branch']
     cmd = cmd.replace('{PATH}', abspath)
     cmd = cmd.replace('{PROJECT}', project_name)
     if _github_actions():
@@ -1393,10 +1393,10 @@ def run_pycfml_functional_tests_with_benchmarks():
     msg = _echo_msg(f"Running functional tests with benchmarks from '{relpath}'")
     lines.append(msg)
     cmd = CONFIG['template']['run-benchmarks']['base']
-    if _github_branch() == 'master':
-        cmd += ' ' + CONFIG['template']['run-benchmarks']['master-branch']
+    if _github_branch() == 'develop':
+        cmd += ' ' + CONFIG['template']['run-benchmarks']['develop-branch']
     else:
-        cmd += ' ' + CONFIG['template']['run-benchmarks']['non-master-branch']
+        cmd += ' ' + CONFIG['template']['run-benchmarks']['non-develop-branch']
     cmd = cmd.replace('{PATH}', abspath)
     cmd = cmd.replace('{PROJECT}', project_name)
     if _github_actions():

diff --git a/pybuild.toml b/pybuild.toml
@@ -71,9 +71,9 @@ install-wheel = 'python3 -m pip install {PACKAGE} --force-reinstall --find-links
 run-python = 'python3 {PATH} {OPTIONS}'
 run-tests = 'pytest {PATH} --color=yes --benchmark-disable'
 run-benchmarks.base = 'pytest {PATH} --color=yes --benchmark-only --benchmark-storage="file://./.benchmarks/{PROJECT}/{RUNNER}/{COMPILER}/{PROCESSOR}" --benchmark-warmup=on --benchmark-columns="median, iqr, ops"'
-run-benchmarks.master-branch = '--benchmark-autosave'
-run-benchmarks.non-master-branch = '--benchmark-autosave'
-#run-benchmarks.non-master-branch = '--benchmark-compare --benchmark-compare-fail=median:25%'
+run-benchmarks.develop-branch = '--benchmark-autosave'
+run-benchmarks.non-develop-branch = '--benchmark-autosave'
+#run-benchmarks.non-develop-branch = '--benchmark-compare --benchmark-compare-fail=median:25%'
 
 ######################
 # Build configurations