Tidying up

Author: Shillaker

tasks/env.py

@@ -6,9 +6,4 @@
 THIRD_PARTY_DIR = join(PROJ_ROOT, "third-party")
 CROSSENV_DIR = join(PROJ_ROOT, "cross_venv", "cross")
 
-FAASM_SYSROOT = "/usr/local/faasm/llvm-sysroot"
-FAASM_TOOLCHAIN_FILE = (
-    "/usr/local/code/faasm/third-party/faasm-toolchain/WasiToolchain.cmake"
-)
-
 USABLE_CPUS = str(int(cpu_count()) - 1)

tasks/libs.py

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

tasks/mxnet.py

@@ -7,7 +7,9 @@
 import os
 
 from invoke import task
-from tasks.env import THIRD_PARTY_DIR, FAASM_SYSROOT, FAASM_TOOLCHAIN_FILE
+from faasmcli.util.env import FAASM_TOOLCHAIN_FILE
+from faasmcli.util.toolchain import WASM_SYSROOT
+from tasks.env import THIRD_PARTY_DIR
 
 MXNET_DIR = join(THIRD_PARTY_DIR, "mxnet")
 
@@ -20,11 +22,11 @@
 ]
 
 INSTALLED_HEADER_DIRS = [
-    join(FAASM_SYSROOT, "include", "mxnet"),
-    join(FAASM_SYSROOT, "include", "dmlc"),
+    join(WASM_SYSROOT, "include", "mxnet"),
+    join(WASM_SYSROOT, "include", "dmlc"),
 ]
 
-INSTALLED_LIBS_DIR = join(FAASM_SYSROOT, "lib", "wasm32-wasi")
+INSTALLED_LIBS_DIR = join(WASM_SYSROOT, "lib", "wasm32-wasi")
 
 
 @task
@@ -74,7 +76,7 @@ def install(ctx, clean=False, shared=True):
         "-DFAASM_BUILD_SHARED={}".format(shared_flag),
         "-DCMAKE_TOOLCHAIN_FILE={}".format(FAASM_TOOLCHAIN_FILE),
         "-DCMAKE_BUILD_TYPE=Release",
-        "-DCMAKE_INSTALL_PREFIX={}".format(FAASM_SYSROOT),
+        "-DCMAKE_INSTALL_PREFIX={}".format(WASM_SYSROOT),
         "-DCMAKE_INSTALL_LIBDIR=lib/wasm32-wasi",
         "-DCMAKE_DL_LIBS=",
         "-DUSE_CUDA=OFF",