Clarify split for cross-compiled applications (#104)

* lammps: add task and submodule to cross-compile lammps in the sysroot

* lammps: track right submodule branch

* lulesh: add task to cross-compile

* lulesh: finish tasks

* gh: bump code version so that lammps and lulesh are available in the container image

* docker: build libfaasmp and libfaasmpi before lulesh and lammps

* kernels: update submodule to remove hardcoded paths from makefile

* python: format code

* kernels: fixes for running tests in faasm

* cleanup repo after refactor to faasm/examples

* tasks: remove dangling mention of lammps task

* tasks: remove tf and ffmpeg from func.local

Author: csegarragonz

.env

@@ -1,3 +1,3 @@
-SYSROOT_VERSION=0.1.11
-SYSROOT_CLI_IMAGE=faasm/cpp-sysroot:0.1.11
+SYSROOT_VERSION=0.1.12
+SYSROOT_CLI_IMAGE=faasm/cpp-sysroot:0.1.12
 COMPOSE_PROJECT_NAME=cpp-dev

.github/workflows/tests.yml

@@ -19,7 +19,7 @@ jobs:
     if: github.event.pull_request.draft == false
     runs-on: ubuntu-20.04
     container:
-      image: faasm/cpp-sysroot:0.1.11
+      image: faasm/cpp-sysroot:0.1.12
     steps:
       # --- Update code ---
       - name: "Checkout code"
@@ -44,16 +44,8 @@ jobs:
         run: ./bin/inv_wrapper.sh libfake
       - name: "Build libemscripten"
         run: ./bin/inv_wrapper.sh libemscripten
-      - name: "Build FFmpeg"
-        run: ./bin/inv_wrapper.sh ffmpeg
       - name: "Build zlib"
         run: ./bin/inv_wrapper.sh zlib
-      - name: "Build libpng"
-        run: ./bin/inv_wrapper.sh libpng
-      - name: "Build ImageMagick"
-        run: ./bin/inv_wrapper.sh imagemagick
-      - name: "Build Tensorflow lite"
-        run: ./bin/inv_wrapper.sh tensorflow
       # --- Build functions to wasm ---
       - name: "Build the functions"
         run: ./bin/inv_wrapper.sh func.local --clean

.gitmodules

@@ -16,23 +16,7 @@
 [submodule "third-party/faabric"]
     path = third-party/faabric
     url = https://github.com/faasm/faabric.git
-[submodule "third-party/FFmpeg"]
-    path = third-party/FFmpeg
-    url = https://github.com/faasm/FFmpeg.git
-    branch = faasm
-[submodule "third-party/ImageMagick"]
-	path = third-party/ImageMagick
-	url = https://github.com/faasm/ImageMagick.git
-	branch = faasm
-[submodule "third-party/libpng"]
-	path = third-party/libpng
-	url = https://github.com/faasm/libpng.git
-	branch = faasm
 [submodule "third-party/zlib"]
 	path = third-party/zlib
 	url = https://github.com/faasm/zlib.git
 	branch = faasm
-[submodule "third-party/tensorflow"]
-	path = third-party/tensorflow
-	url = https://github.com/faasm/tensorflow.git
-	branch = faasm

Makefile.envs

@@ -16,6 +16,8 @@ export WASM_RANLIB=${FAASM_WASM_RANLIB}
 export WASM_LD=${FAASM_WASM_CC}
 export WASM_LDSHARED=${FAASM_WASM_CC}
 export WASM_LDFLAGS="${FAASM_WASM_STATIC_LINKER_FLAGS}"
+export WASM_EXE_LDFLAGS="${FAASM_WASM_EXE_LINKER_FLAGS}"
+export WASM_EXE_LDFLAGS_NO_QUOTES=${FAASM_WASM_EXE_LINKER_FLAGS}
 
 export WASM_BUILD=wasm32
 export WASM_HOST=${FAASM_WASM_HOST_SHARED}

VERSION

@@ -1 +1 @@
-0.1.11
+0.1.12

docker/cpp-sysroot.dockerfile

@@ -10,7 +10,6 @@ COPY --from=llvm /usr/local/faasm /usr/local/faasm
 
 # Update APT dependencies
 RUN apt update && apt install -y autotools-dev
-
 # Get the code and submodules
 ARG SYSROOT_VERSION
 RUN mkdir -p /code \
@@ -23,11 +22,7 @@ RUN mkdir -p /code \
     && git submodule update --init -f third-party/faasm-clapack \
     && git submodule update --init -f third-party/libffi \
     && git submodule update --init -f third-party/wasi-libc \
-    && git submodule update --init -f third-party/FFmpeg \
-    && git submodule update --init -f third-party/zlib \
-    && git submodule update --init -f third-party/libpng \
-    && git submodule update --init -f third-party/ImageMagick \
-    && git submodule update --init -f third-party/tensorflow
+    && git submodule update --init -f third-party/zlib
 
 # Install the faasmtools Python lib
 RUN cd /code/cpp \
@@ -49,25 +44,19 @@ RUN cd /code/cpp \
         libfaasmpi --native --shared \
     # Install toolchain files
     && inv install \
-    # Build ported third-pary WASM libraries (libc first as it is needed in the
-    # others)
-    && inv \
-        libc \
-        clapack \
-        clapack --clean --shared \
-        ffmpeg \
-        libffi \
-        # To build imagemagick, we need to build zlib and libpng
-        zlib \
-        libpng \
-        imagemagick \
-        tensorflow \
     # Build Faasm WASM libraries
     && inv \
         libemscripten \
         libfaasm \
         libfaasmp \
-        libfaasmpi
+        libfaasmpi \
+    # Lastly, build the libraries that populate the sysroot
+    && inv \
+        libc \
+        clapack \
+        clapack --clean --shared \
+        libffi \
+        zlib
 
 # CLI setup
 WORKDIR /code/cpp

faasmtools/build.py

@@ -23,6 +23,7 @@
 
 # Toolchain files
 CMAKE_TOOLCHAIN_FILE = join(WASM_TOOLCHAIN_TOOLS, "WasiToolchain.cmake")
+MAKE_TOOLCHAIN_FILE = join(WASM_TOOLCHAIN_TOOLS, "Makefile.envs")
 
 # Executables
 WASM_CC = join(WASM_TOOLCHAIN_BIN, "clang")
@@ -161,6 +162,7 @@
 FAASM_BUILD_ENV_DICT = {
     "CMAKE_ROOT": FAASM_CMAKE_ROOT,
     "FAASM_NATIVE_INSTALL_DIR": FAASM_NATIVE_DIR,
+    "FAASM_WASM_MAKE_TOOLCHAIN_FILE": MAKE_TOOLCHAIN_FILE,
     "FAASM_WASM_CC": WASM_CC,
     "FAASM_WASM_CXX": WASM_CXX,
     "FAASM_WASM_AR": WASM_AR,

func/CMakeLists.txt

@@ -73,7 +73,5 @@ endif ()
 add_subdirectory(errors)
 add_subdirectory(demo)
 add_subdirectory(dynlink)
-add_subdirectory(ffmpeg)
 add_subdirectory(mpi)
 add_subdirectory(omp)
-add_subdirectory(tf)