kernels-omp: move to a separate directory

Author: csegarragonz

README.md

@@ -23,10 +23,11 @@ the results.
 Microbenchmarks:
 * [Polybench](./tasks/polybench/README.md) - experiment to measure the baseline overhead of using WebAssembly to execute the [PolyBench/C](https://web.cse.ohio-state.edu/~pouchet.2/software/polybench/) kernels.
 * [Kernels (MPI)](./tasks/kernels_mpi/README.md) - microbenchmark of Faabric's MPI implementation using a subset of the [ParRes Kernels](https://github.com/ParRes/Kernels)
-* Kernels (OpenMP) - TODO
+* [Kernels (OpenMP)](./tasks/kernels_omp/README.md) - microbenchmark of Faabric's OpenMP implementation using a subset of the [ParRes Kernels](https://github.com/ParRes/Kernels).
 * LULESH - TODO
 * [LAMMPS](./tasks/lammps/README.md) - experiment using Faabric to run a one-off molecule simulation using [LAMMPS](https://www.lammps.org)
 * [Migration](./tasks/migration/README.md) - microbenchmark showcasing the benefits of migrating an MPI application to improve locality.
+* [Elastic] - TODO
 
 Macrobenchmarks:
 * [Makespan](./tasks/makespan/README.md) - experiment using Faabric to run a trace of scientific applications over a shared cluster of VMs. Comes in three flavours:

tasks/__init__.py

@@ -6,11 +6,11 @@
 import logging
 
 from tasks.kernels_mpi import ns as kernels_mpi_ns
+from tasks.kernels_omp import ns as kernels_omp_ns
 from tasks.lammps import ns as lammps_ns
 from tasks.makespan import ns as makespan_ns
 from tasks.migration import ns as migration_ns
 from tasks.motivation import ns as motivation_ns
-from tasks.openmp import ns as openmp_ns
 from tasks.polybench import ns as polybench_ns
 
 
@@ -21,10 +21,10 @@
     format_code,
 )
 
-ns.add_collection(lammps_ns, name="lammps")
 ns.add_collection(kernels_mpi_ns, name="kernels-mpi")
+ns.add_collection(kernels_omp_ns, name="kernels-omp")
+ns.add_collection(lammps_ns, name="lammps")
 ns.add_collection(makespan_ns, name="makespan")
 ns.add_collection(migration_ns, name="migration")
 ns.add_collection(motivation_ns, name="motivation")
-ns.add_collection(openmp_ns, name="openmp")
 ns.add_collection(polybench_ns, name="polybench")

tasks/kernels_mpi/README.md

@@ -1,9 +1,7 @@
-# ParRes Kernels Experiment
+# ParRes Kernels Experiment (MPI)
 
 This experiment runs a set of the [ParRes Kernels](https://github.com/ParRes/Kernels)
-as a microbenchmark for Granny's MPI and OpenMP implementation.
-
-> [WARNING] For the moment this instructions only cover the MPI kernels.
+as a microbenchmark for Granny's MPI implementation.
 
 ## Start AKS cluster
 
@@ -68,7 +66,7 @@ inv kernels-mpi.plot
 the plot will be available in [`./plots/kernels-mpi/mpi_kernels_slowdown.pdf`](
 ./plots/kernels-mpi/mpi_kernels_slowdown.pdf), we also include it below:
 
-![MPI Kernels Slowdown Plot](./plots/kernels-mpi/mpi_kernels_slowdown.pdf)
+![MPI Kernels Slowdown Plot](./plots/kernels-mpi/mpi_kernels_slowdown.png)
 
 ## Clean-up
 

tasks/kernels_omp/README.md

@@ -0,0 +1,77 @@
+# ParRes Kernels Experiment (OpenMP)
+
+This experiment runs a set of the [ParRes Kernels](https://github.com/ParRes/Kernels)
+as a microbenchmark for Granny's OpenMP implementation.
+
+## Start AKS cluster
+
+In the `experiment-base` terminal, run:
+
+```bash
+(faasm-exp-base) inv cluster.provision --vm Standard_D8_v5 --nodes 2 cluster.credentials
+```
+
+## Granny
+
+Deploy the cluster:
+
+```bash
+(faasm-exp-faabric) faasmctl deploy.k8s --workers=4
+```
+
+Upload the WASM file:
+
+```bash
+(faasm-exp-faabric) inv kernels-omp.wasm.upload
+```
+
+and run the experiment with:
+
+```bash
+(faasm-exp-faabric) inv kernels-omp.run.granny
+```
+
+finally, delete the Granny cluster:
+
+```bash
+faasmctl delete
+```
+
+## OpenMPI
+
+Deploy the native cluster:
+
+```bash
+inv kernels-omp.native.deploy
+```
+
+```bash
+inv kernels-omp.run.native
+```
+
+finally, delete the native cluster
+
+```bash
+inv kernels-omp.native.delete
+```
+
+## Plot
+
+To plot the results, just run:
+
+```bash
+inv kernels-omp.plot
+```
+
+the plot will be available in [`./plots/kernels-omp/openmp_kernels_slowdown.pdf`](
+./plots/kernels-omp/openmp_kernels_slowdown.pdf), we also include it below:
+
+![OpenMP Kernels Slowdown Plot](./plots/kernels-omp/openmp_kernels_slowdown.png)
+
+## Clean-up
+
+Finally, delete the AKS cluster:
+
+```bash
+(faasm-exp-base) inv cluster.delete
+```

tasks/openmp/__init__.py tasks/kernels_omp/__init__.pytasks/openmp/__init__.py renamed to tasks/kernels_omp/__init__.py

@@ -7,8 +7,8 @@
 from tasks.util.env import OPENMP_KERNELS, PLOTS_ROOT, PROJ_ROOT
 
 
-RESULTS_DIR = join(PROJ_ROOT, "results", "openmp")
-PLOTS_DIR = join(PLOTS_ROOT, "openmp")
+RESULTS_DIR = join(PROJ_ROOT, "results", "kernels-omp")
+PLOTS_DIR = join(PLOTS_ROOT, "kernels-omp")
 
 
 def _read_results():

tasks/openmp/env.py tasks/kernels_omp/env.pytasks/openmp/env.py renamed to tasks/kernels_omp/env.py

@@ -28,7 +28,7 @@
 
 
 def _init_csv_file(csv_name):
-    result_dir = join(RESULTS_DIR, "openmp")
+    result_dir = join(RESULTS_DIR, "kernels-omp")
     makedirs(result_dir, exist_ok=True)
 
     result_file = join(result_dir, csv_name)
@@ -38,7 +38,7 @@ def _init_csv_file(csv_name):
 
 
 def _write_csv_line(csv_name, num_threads, run, exec_time):
-    result_dir = join(RESULTS_DIR, "openmp")
+    result_dir = join(RESULTS_DIR, "kernels-omp")
     makedirs(result_dir, exist_ok=True)
 
     result_file = join(result_dir, csv_name)