Merge branch 'dev' into feat/SOF-6892

Exabyte-io · Nov 23, 2023 · fe62b73 · fe62b73
2 parents ae91bf3 + d6e1a8c
commit fe62b73
Show file tree

Hide file tree

Showing 56 changed files with 358 additions and 1,099 deletions.
diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml
@@ -29,39 +29,40 @@ jobs:
           python-version: 3.8
           targets: ./applications ./assets ./executables ./methods ./models ./templates
 
-  run-py-tests:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        python-version: [3.7, 3.8]
-
-    steps:
-      - name: Checkout this repository
-        uses: actions/checkout@v2
-        with:
-          lfs: true
-
-      - name: Checkout actions repository
-        uses: actions/checkout@v2
-        with:
-          repository: Exabyte-io/actions
-          token: ${{ secrets.BOT_GITHUB_TOKEN }}
-          path: actions
-
-      - name: Run python tests
-        uses: ./actions/py/test
-        with:
-          python-version: ${{ matrix.python-version }}
-          unit-test-directory: test/pythonml
+# TODO: Uncomment when python tests are ready/re-added from `dev-python-ml-in-fixtures
+#  run-py-tests:
+#    runs-on: ubuntu-latest
+#    strategy:
+#      matrix:
+#        python-version: [3.7, 3.8]
+#
+#    steps:
+#      - name: Checkout this repository
+#        uses: actions/checkout@v2
+#        with:
+#          lfs: true
+#
+#      - name: Checkout actions repository
+#        uses: actions/checkout@v2
+#        with:
+#          repository: Exabyte-io/actions
+#          token: ${{ secrets.BOT_GITHUB_TOKEN }}
+#          path: actions
+#
+#      - name: Run python tests
+#        uses: ./actions/py/test
+#        with:
+#          python-version: ${{ matrix.python-version }}
+#          unit-test-directory: test/pythonml
 
   run-js-tests:
     runs-on: ubuntu-latest
     strategy:
       matrix:
         node-version:
-          - 12.x
           - 14.x
           - 16.x
+          - 18.x
 
     steps:
       - name: Checkout this repository
@@ -82,7 +83,9 @@ jobs:
           node-version: ${{ matrix.node-version }}
 
   publish-js-package:
-    needs: [run-py-tests, run-js-tests]
+    needs:
+      - run-js-tests
+#      - run-py-tests
     runs-on: ubuntu-latest
     if: github.ref_name == 'dev'
 

diff --git a/models/espresso/5.2.1.yml b/models/espresso/5.2.1.yml
@@ -4,20 +4,26 @@ Default:
     pw_scf:
       - path: /pb/qm/dft/ksdft/lda?functional=pz
       - path: /pb/qm/dft/ksdft/gga?functional=pbe
+      - path: /pb/qm/dft/ksdft/gga?functional=pbesol
     pw_scf_bands_hse:
       - path: /pb/qm/dft/ksdft/hybrid?functional=hse06
     pw_esm:
       - path: /pb/qm/dft/ksdft/lda?functional=pz
       - path: /pb/qm/dft/ksdft/gga?functional=pbe
+      - path: /pb/qm/dft/ksdft/gga?functional=pbesol
     pw_esm_relax:
       - path: /pb/qm/dft/ksdft/lda?functional=pz
       - path: /pb/qm/dft/ksdft/gga?functional=pbe
+      - path: /pb/qm/dft/ksdft/gga?functional=pbesol
     pw_nscf:
       - path: /pb/qm/dft/ksdft/lda?functional=pz
       - path: /pb/qm/dft/ksdft/gga?functional=pbe
+      - path: /pb/qm/dft/ksdft/gga?functional=pbesol
     pw_relax:
       - path: /pb/qm/dft/ksdft/lda?functional=pz
       - path: /pb/qm/dft/ksdft/gga?functional=pbe
+      - path: /pb/qm/dft/ksdft/gga?functional=pbesol
     pw_vc-relax:
       - path: /pb/qm/dft/ksdft/lda?functional=pz
       - path: /pb/qm/dft/ksdft/gga?functional=pbe
+      - path: /pb/qm/dft/ksdft/gga?functional=pbesol