faasm: refactor from WASM_VM to FAASM_WASM_VM (#24)

* faasm: refactor from WASM_VM to FAASM_WASM_VM * gh: bump tracked version deps
faasm · Dec 13, 2023 · cabd194 · cabd194
1 parent 7fc0073
commit cabd194
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -124,15 +124,15 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        wasm_vm: [wavm, wamr]
+        faasm_wasm_vm: [wavm, wamr]
     defaults:
       run:
         shell: bash
     env:
       CONAN_CACHE_MOUNT_SOURCE: ~/.conan
       FAASM_INI_FILE: ./faasm.ini
-      FAASM_VERSION: 0.15.0
-      WASM_VM: ${{ matrix.wasm_vm }}
+      FAASM_VERSION: 0.17.0
+      FAASM_WASM_VM: ${{ matrix.faasm_wasm_vm }}
     steps:
       - uses: csegarragonz/set-compose-version-action@main
         with:
@@ -184,7 +184,7 @@ jobs:
       - name: "Run MPI kernels"
         # TODO: MPI kernels still not run in WAMR because there's a seg. fault
         # with the `exit` syscall
-        if: "contains(env.WASM_VM, 'wavm')"
+        if: "contains(env.FAASM_WASM_VM, 'wavm')"
         timeout-minutes: 2
         run: |
           # The global MPI kernel stopped working when enabling SIMD
@@ -202,7 +202,7 @@ jobs:
           # implementations for MPI_Alltoallv
           # faasmctl invoke kernels-mpi random --cmdline '32 20' --mpi-world-size 4
       - name: "Run OpenMP kernels"
-        if: "contains(env.WASM_VM, 'wavm')"
+        if: "contains(env.FAASM_WASM_VM, 'wavm')"
         timeout-minutes: 2
         run: |
           faasmctl invoke kernels-omp global --cmdline '2 10 1024'
@@ -252,7 +252,7 @@ jobs:
           faasmctl invoke polybench poly_jacobi-2d
           faasmctl invoke polybench poly_seidel-2d
       - name: "Run ImageMagick"
-        if: "contains(env.WASM_VM, 'wavm')"
+        if: "contains(env.FAASM_WASM_VM, 'wavm')"
         timeout-minutes: 1
         run: faasmctl invoke imagemagick main --cmdline 'faasm://im/sample_image.png -flip faasm://im/image_out.png'
       - name: "Run LAMMPS"
@@ -265,11 +265,11 @@ jobs:
           # 08/12/2023 - LULESH is broken with a memory leak
           #       - name: "Run LULESH"
           #         timeout-minutes: 1
-          #         if: "contains(env.WASM_VM, 'wavm')"
+          #         if: "contains(env.FAASM_WASM_VM, 'wavm')"
           #         run: faasmctl invoke lulesh main --cmdline '-i 5 -s 20 -r 11 -c 1 -b 1' --input-data '4'
       - name: "Run TFlite check"
         timeout-minutes: 1
-        if: "contains(env.WASM_VM, 'wavm')"
+        if: "contains(env.FAASM_WASM_VM, 'wavm')"
         run: faasmctl invoke tf check
       - name: "Run FFmpeg check"
         timeout-minutes: 1

diff --git a/FAASM_VERSION b/FAASM_VERSION
@@ -1 +1 @@
-0.15.0
+0.17.0
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -5,7 +5,7 @@ services:
     image: faasm.azurecr.io/redis:${EXAMPLES_RUN_VERSION}
 
   planner:
-    image: faasm.azurecr.io/planner:0.10.0
+    image: faasm.azurecr.io/planner:0.11.0
     environment:
       - LOG_LEVEL=info
       - PLANNER_PORT=8081
@@ -40,7 +40,7 @@ services:
       - LD_LIBRARY_PATH=/build/faasm/third-party/lib:/usr/local/lib
       - REDIS_QUEUE_HOST=redis
       - REDIS_STATE_HOST=redis
-      - WASM_VM=${WASM_VM:-wavm}
+      - FAASM_WASM_VM=${FAASM_WASM_VM:-wavm}
 
   build:
     image: faasm.azurecr.io/examples-build:${EXAMPLES_BUILD_VERSION}

diff --git a/requirements.txt b/requirements.txt
@@ -1,4 +1,4 @@
 black>=22.3.0
-faasmctl>=0.20.0
+faasmctl>=0.23.0
 flake8>=4.0.1
 invoke>=1.7.1