Moving to faasmtools

Author: Shillaker

VERSION

@@ -0,0 +1 @@
+0.0.1

bin/crossenv_setup.sh

@@ -11,9 +11,6 @@ BUILD_PYTHON_BIN=/usr/local/faasm/python3.8/bin
 BUILD_PYTHON=${BUILD_PYTHON_BIN}/python3.8
 BUILD_PIP=${BUILD_PYTHON_BIN}/pip3.8
 
-FAASM_DIR=/usr/local/code/faasm
-FAASMCLI=${FAASM_DIR}/faasmcli
-
 # Install the build machine python dependencies
 CROSSENV_SRC_DIR=${PROJ_ROOT}/third-party/crossenv
 echo "Installing crossenv from ${CROSSENV_SRC_DIR}"
@@ -27,11 +24,6 @@ ${BUILD_PIP} install cython
 echo "Installing invoke"
 ${BUILD_PIP} install invoke
 
-echo "Installing Faasmcli"
-pushd ${FAASMCLI} >> /dev/null
-${BUILD_PIP} install .
-popd >> /dev/null
-
 # Run the set-up script
 pushd ${PROJ_ROOT} >> /dev/null
 ${BUILD_PYTHON} bin/crossenv_setup.py

docker/cpython.dockerfile

@@ -0,0 +1,27 @@
+FROM faasm/sysroot:0.0.7
+
+RUN apt install -y \
+    libssl-dev
+
+WORKDIR cpython
+COPY requirements.txt .
+RUN pip3 install -r requirements.txt
+
+
+COPY . .
+
+# Install build Python
+RUN ./bin/install_build_python.sh
+
+# Install crossenv
+RUN ./bin/crossenv_setup.sh
+
+# Build mxnet
+RUN inv mxnet
+
+# Build cpython
+RUN inv cpython
+
+# Cross-compile packages
+RUN . ./cross_venv/bin/activate && inv libs.install
+RUN . ./cross_venv/bin/activate && inv libs.install --experimental

requirements.txt

@@ -0,0 +1,3 @@
+black
+invoke
+pyyaml

tasks/__init__.py

@@ -1,13 +1,15 @@
 from invoke import Collection
 
 from . import (
+    container,
     cpython,
     libs,
     mxnet,
     ffi,
 )
 
 ns = Collection(
+    container,
     cpython,
     libs,
     mxnet,

tasks/container.py

@@ -0,0 +1,36 @@
+from invoke import task
+from os.path import join
+
+from faasmtools.docker import (
+    build_container,
+    push_container,
+)
+
+from tasks.env import (
+    PROJ_ROOT,
+    get_version,
+)
+
+CONTAINER_IMAGE = "faasm/cpython"
+DOCKERFILE = join(PROJ_ROOT, "docker", "cpython.dockerfile")
+
+
+@task(default=True)
+def build(ctx, nocache=False, push=False):
+    """
+    Build current version of the cpython container
+    """
+    tag_name = "{}:{}".format(CONTAINER_IMAGE, get_version())
+
+    build_container(
+        tag_name, DOCKERFILE, PROJ_ROOT, nocache=nocache, push=push
+    )
+
+
+@task
+def push(ctx):
+    """
+    Push the current version of the cpython container
+    """
+    tag_name = "{}:{}".format(CONTAINER_IMAGE, get_version())
+    push_container(tag_name)

tasks/cpython.py

@@ -5,16 +5,7 @@
 from os.path import join, exists
 from subprocess import run
 
-from faasmcli.util.toolchain import (
-    WASM_CC,
-    WASM_BUILD,
-    WASM_HOST,
-    BASE_CONFIG_CMD,
-    BASE_CONFIG_FLAGS,
-    WASM_CFLAGS_SHARED,
-    WASM_LDFLAGS_SHARED,
-    build_config_cmd,
-)
+from faasmtools.build import build_config_cmd
 
 from invoke import task
 

tasks/env.py

@@ -7,3 +7,12 @@
 CROSSENV_DIR = join(PROJ_ROOT, "cross_venv", "cross")
 
 USABLE_CPUS = str(int(cpu_count()) - 1)
+VERSION_FILE = join(PROJ_ROOT, "VERSION")
+
+
+def get_version():
+    with open(VERSION_FILE) as fh:
+        version = fh.read().strip()
+
+    return version
+

tasks/ffi.py

@@ -1,7 +1,7 @@
 from os.path import join, exists
 from subprocess import run
 
-from faasmcli.util.toolchain import (
+from faasmtools.build import (
     build_config_cmd,
     run_autotools,
     WASM_SYSROOT,

tasks/libs.py

@@ -1,8 +1,7 @@
 import os
 
 from copy import copy
-from faasmcli.util.toolchain import WASM_LIB_INSTALL
-from faasmcli.util.env import FAASM_TOOLCHAIN_FILE
+from faasmtools.build import WASM_LIB_INSTALL, CMAKE_TOOLCHAIN_FILE
 from os.path import join
 from subprocess import run
 from tasks.env import USABLE_CPUS, THIRD_PARTY_DIR, CROSSENV_DIR
@@ -22,7 +21,7 @@
     "horovod": {
         "env": {
             "MAKEFLAGS": "-j{}".format(USABLE_CPUS),
-            "HOROVOD_TOOLCHAIN_FILE": FAASM_TOOLCHAIN_FILE,
+            "HOROVOD_TOOLCHAIN_FILE": CMAKE_TOOLCHAIN_FILE,
             "HOROVOD_WITH_MXNET": "1",
             "HOROVOD_WITH_MPI": "1",
             "HOROVOD_WITH_TENSORFLOW": "0",