libs: install libraries and headers in the right location

faasm · Feb 13, 2024 · 4c65d67 · 4c65d67
1 parent 53f6567
commit 4c65d67
Show file tree

Hide file tree

Showing 6 changed files with 115 additions and 112 deletions.
diff --git a/faasmtools/build.py b/faasmtools/build.py
@@ -15,7 +15,7 @@
 FAASM_NATIVE_DIR = join(FAASM_LOCAL_DIR, "native")
 FAASM_CMAKE_ROOT = "/usr/share/cmake-3.24"
 WASM_SYSROOT = join(FAASM_LOCAL_DIR, "llvm-sysroot")
-WASM_HEADER_INSTALL = "{}/include".format(WASM_SYSROOT)
+WASM_HEADER_INSTALL = "{}/include/wasm32-wasi".format(WASM_SYSROOT)
 WASM_LIB_INSTALL = "{}/lib/wasm32-wasi".format(WASM_SYSROOT)
 WASM_TOOLCHAIN_ROOT = join(FAASM_LOCAL_DIR, "toolchain")
 WASM_TOOLCHAIN_TOOLS = join(WASM_TOOLCHAIN_ROOT, "tools")
@@ -201,6 +201,8 @@
     "FAASM_WASM_HOST_STATIC": WASM_HOST_STATIC,
     "FAASM_WASM_HOST_UNKNOWN": WASM_HOST_UNKNOWN,
     "FAASM_WASM_INSTALL_DIR": WASM_TOOLCHAIN_BIN,
+    "FAASM_WASM_HEADER_INSTALL_DIR": WASM_HEADER_INSTALL,
+    "FAASM_WASM_LIB_INSTALL_DIR": WASM_LIB_INSTALL,
     "FAASM_WASM_SYSROOT": WASM_SYSROOT,
     "FAASM_WASM_CFLAGS": " ".join(WASM_CFLAGS),
     "FAASM_WASM_CFLAGS_SHARED": " ".join(WASM_CFLAGS_SHARED),

diff --git a/libemscripten/CMakeLists.txt b/libemscripten/CMakeLists.txt
@@ -1,31 +1,32 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.8)
 project(libemscripten)
 
 # ------ Support for certain emscripten functions ------ #
 
 set(CMAKE_CXX_STANDARD 17)
 
 set(PUBLIC_HEADERS
-        faasm/emscripten.h
-        )
+    faasm/emscripten.h
+)
 
 set(LIB_FILES
-        emscripten.c
-        )
+    emscripten.c
+)
 
 add_library(emscripten STATIC ${LIB_FILES})
 set_target_properties(emscripten PROPERTIES PUBLIC_HEADER "${PUBLIC_HEADERS}")
 
-install(TARGETS emscripten
-        ARCHIVE DESTINATION ${CMAKE_SYSROOT}/lib/wasm32-wasi
-        LIBRARY DESTINATION ${CMAKE_SYSROOT}/lib/wasm32-wasi
-        PUBLIC_HEADER DESTINATION ${CMAKE_SYSROOT}/include/faasm
-        )
+install(
+    TARGETS emscripten
+    ARCHIVE DESTINATION $ENV{FAASM_WASM_LIB_INSTALL_DIR}
+    LIBRARY DESTINATION $ENV{FAASM_WASM_LIB_INSTALL_DIR}
+    PUBLIC_HEADER DESTINATION $ENV{FAASM_WASM_HEADER_INSTALL_DIR}/faasm
+)
 
 install(
-        FILES emscripten.imports
-        DESTINATION ${CMAKE_SYSROOT}/lib/wasm32-wasi
-        RENAME libemscripten.imports
+    FILES libemscripten.imports
+    DESTINATION $ENV{FAASM_WASM_LIB_INSTALL_DIR}
+    RENAME libemscripten.imports
 )
 
 target_include_directories(emscripten PUBLIC ${CMAKE_CURRENT_LIST_DIR})
diff --git a/libfaasm/CMakeLists.txt b/libfaasm/CMakeLists.txt
@@ -1,59 +1,60 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.8)
 project(libfaasm)
 
 # ------ Faasm C/C++ library ------ #
 
 set(CMAKE_CXX_STANDARD 17)
 
 set(PUBLIC_HEADERS
-        faasm/core.h
-        faasm/host_interface.h
-        faasm/host_interface_test.h
-        faasm/array.h
-        faasm/compare.h
-        faasm/faasm.h
-        faasm/files.h
-        faasm/input.h
-        faasm/memory.h
-        faasm/migrate.h
-        faasm/print.h
-        faasm/random.h
-        faasm/shared_mem.h
-        faasm/state.h
-        faasm/time.h
-        )
+    faasm/core.h
+    faasm/host_interface.h
+    faasm/host_interface_test.h
+    faasm/array.h
+    faasm/compare.h
+    faasm/faasm.h
+    faasm/files.h
+    faasm/input.h
+    faasm/memory.h
+    faasm/migrate.h
+    faasm/print.h
+    faasm/random.h
+    faasm/shared_mem.h
+    faasm/state.h
+    faasm/time.h
+)
 
 set(LIB_FILES
-        compare.cpp
-        core.cpp
-        files.cpp
-        input.cpp
-        print.cpp
-        random.cpp
-        state.cpp
-        time.cpp
-        zygote.cpp
-        )
+    compare.cpp
+    core.cpp
+    files.cpp
+    input.cpp
+    print.cpp
+    random.cpp
+    state.cpp
+    time.cpp
+    zygote.cpp
+)
 
 
-if (CMAKE_SYSTEM_NAME STREQUAL "Wasm")
+if (CMAKE_SYSTEM_NAME STREQUAL "WASI")
     message(STATUS "Libfaasm WebAssembly build")
 
     add_library(faasm STATIC ${LIB_FILES})
     set_target_properties(faasm PROPERTIES PUBLIC_HEADER "${PUBLIC_HEADERS}")
 
     # Install in WASM sysroot
-    install(TARGETS faasm
-            ARCHIVE DESTINATION ${CMAKE_SYSROOT}/lib/wasm32-wasi
-            LIBRARY DESTINATION ${CMAKE_SYSROOT}/lib/wasm32-wasi
-            PUBLIC_HEADER DESTINATION ${CMAKE_SYSROOT}/include/faasm
-            )
+    install(
+        TARGETS faasm
+        ARCHIVE DESTINATION $ENV{FAASM_WASM_LIB_INSTALL_DIR}
+        LIBRARY DESTINATION $ENV{FAASM_WASM_LIB_INSTALL_DIR}
+        PUBLIC_HEADER DESTINATION $ENV{FAASM_WASM_HEADER_INSTALL_DIR}/faasm
+    )
 
     # Add allowed import files
     install(
-            FILES faasm.imports
-            DESTINATION ${CMAKE_SYSROOT}/lib/wasm32-wasi
-            RENAME libfaasm.imports
+        FILES libfaasm.imports
+        DESTINATION $ENV{FAASM_WASM_LIB_INSTALL_DIR}
+        RENAME libfaasm.imports
     )
 else ()
     message(STATUS "Libfaasm native build")
@@ -66,11 +67,12 @@ else ()
 
     set_target_properties(faasm PROPERTIES PUBLIC_HEADER "${PUBLIC_HEADERS}")
 
-    install(TARGETS faasm
-            ARCHIVE DESTINATION lib
-            LIBRARY DESTINATION lib
-            PUBLIC_HEADER DESTINATION include/faasm
-            )
+    install(
+        TARGETS faasm
+        ARCHIVE DESTINATION lib
+        LIBRARY DESTINATION lib
+        PUBLIC_HEADER DESTINATION include/faasm
+    )
 endif ()
 
 target_include_directories(faasm PUBLIC ${CMAKE_CURRENT_LIST_DIR})
diff --git a/libfaasmp/CMakeLists.txt b/libfaasmp/CMakeLists.txt
@@ -1,19 +1,19 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.8)
 project(libfaasmp)
 
 # ------ Faasm OpenMP library ------ #
 
 set(CMAKE_CXX_STANDARD 17)
 
 set(PUBLIC_HEADERS
-        faasmp/faasmp.h
-        )
+    faasmp/faasmp.h
+)
 
 set(LIB_FILES
-        faasmp.cpp
-        )
+    faasmp.cpp
+)
 
-if (CMAKE_SYSTEM_NAME STREQUAL "Wasm")
+if (CMAKE_SYSTEM_NAME STREQUAL "WASI")
     message(STATUS "Libfaasmp WebAssembly build")
 
     set(LIBOMP_ASMFILES "z_Linux_asm.S")
@@ -24,21 +24,19 @@ if (CMAKE_SYSTEM_NAME STREQUAL "Wasm")
     set_target_properties(faasmp PROPERTIES PUBLIC_HEADER "${PUBLIC_HEADERS}")
 
     # Install in WASM sysroot
-    install(TARGETS faasmp
-            ARCHIVE DESTINATION ${CMAKE_SYSROOT}/lib/wasm32-wasi
-            LIBRARY DESTINATION ${CMAKE_SYSROOT}/lib/wasm32-wasi
-            PUBLIC_HEADER DESTINATION ${CMAKE_SYSROOT}/include/faasmp
-            )
+    install(
+        TARGETS faasmp
+        ARCHIVE DESTINATION $ENV{FAASM_WASM_LIB_INSTALL_DIR}
+        LIBRARY DESTINATION $ENV{FAASM_WASM_LIB_INSTALL_DIR}
+        PUBLIC_HEADER DESTINATION $ENV{FAASM_WASM_HEADER_INSTALL_DIR}/faasmmp
+    )
 
     # Add imports
-    install(FILES faasmp.imports
-            DESTINATION ${CMAKE_SYSROOT}/lib/wasm32-wasi
-            RENAME libfaasmp.imports)
-
-    # Add omp header
-    install(FILES omp.h
-            DESTINATION ${CMAKE_SYSROOT}/include)
-
+    install(
+        FILES libfaasmp.imports
+        DESTINATION $ENV{FAASM_WASM_LIB_INSTALL_DIR}
+        RENAME libfaasmp.imports
+    )
 else ()
     message(STATUS "Libfaasmp native build")
 
@@ -50,9 +48,10 @@ else ()
 
     set_target_properties(faasmp PROPERTIES PUBLIC_HEADER "${PUBLIC_HEADERS}")
 
-    install(TARGETS faasmp
-            ARCHIVE DESTINATION lib
-            LIBRARY DESTINATION lib
-            PUBLIC_HEADER DESTINATION include/faasmp
-            )
+    install(
+        TARGETS faasmp
+        ARCHIVE DESTINATION lib
+        LIBRARY DESTINATION lib
+        PUBLIC_HEADER DESTINATION include/faasmp
+    )
 endif ()
diff --git a/libfaasmpi/CMakeLists.txt b/libfaasmpi/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.8)
 project(faasmpi)
 
 # ------------------------------------------
@@ -31,48 +31,55 @@ set(FAABRIC_BINARY_DIR ${FAABRIC_SOURCE_DIR}/build)
 add_subdirectory(${FAABRIC_SOURCE_DIR} ${FAABRIC_BINARY_DIR})
 add_dependencies(faasmpi faabricmpi)
 
-if (CMAKE_SYSTEM_NAME STREQUAL "Wasm")
+if (CMAKE_SYSTEM_NAME STREQUAL "WASI")
     message(STATUS "Libfaasmpi WebAssembly build")
 
-    install(FILES ${FAABRIC_BINARY_DIR}/libfaabricmpi.a
-        DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/wasm32-wasi
+    install(
+        FILES ${FAABRIC_BINARY_DIR}/libfaabricmpi.a
+        DESTINATION $ENV{FAASM_WASM_LIB_INSTALL_DIR}
     )
 
-    install(TARGETS faasmpi
-            ARCHIVE DESTINATION ${CMAKE_SYSROOT}/lib/wasm32-wasi
-            LIBRARY DESTINATION ${CMAKE_SYSROOT}/lib/wasm32-wasi
-            PUBLIC_HEADER DESTINATION ${CMAKE_SYSROOT}/include/faasmpi
+    install(
+        TARGETS faasmpi
+        ARCHIVE DESTINATION $ENV{FAASM_WASM_LIB_INSTALL_DIR}
+        LIBRARY DESTINATION $ENV{FAASM_WASM_LIB_INSTALL_DIR}
+        PUBLIC_HEADER DESTINATION $ENV{FAASM_WASM_HEADER_INSTALL_DIR}/faasmmpi
     )
 
     # Add imports file
-    install(FILES faasmpi.imports
-            DESTINATION ${CMAKE_SYSROOT}/lib/wasm32-wasi
-            RENAME libfaasmpi.imports
+    install(
+        FILES libfaasmpi.imports
+        DESTINATION $ENV{FAASM_WASM_LIB_INSTALL_DIR}
+        RENAME libfaasmpi.imports
     )
 
     # Symlink library as libmpi
-    install(CODE "execute_process( \
-        COMMAND ${CMAKE_COMMAND} -E create_symlink \
-        ${CMAKE_SYSROOT}/lib/wasm32-wasi/libfaabricmpi.a \
-        ${CMAKE_SYSROOT}/lib/wasm32-wasi/libmpi.a \
+    install(
+        CODE "execute_process( \
+        COMMAND
+            ${CMAKE_COMMAND} -E create_symlink \
+            ${CMAKE_SYSROOT}/lib/wasm32-wasi/libfaabricmpi.a \
+            ${CMAKE_SYSROOT}/lib/wasm32-wasi/libmpi.a \
         )"
     )
 else()
     message(STATUS "Libfaasmpi native build")
 
-    install(TARGETS faasmpi
-            ARCHIVE DESTINATION lib
-            LIBRARY DESTINATION lib
-            PUBLIC_HEADER DESTINATION include/faasmpi
-            )
+    install(
+        TARGETS faasmpi
+        ARCHIVE DESTINATION lib
+        LIBRARY DESTINATION lib
+        PUBLIC_HEADER DESTINATION include/faasmpi
+    )
 endif()
 
 # Symlink header (common to wasm and native builds)
-# WARNING - if you use the default CMAKE_INSTALL_PREFIX, this may overwrite the 
-# existing mpi.h on the system 
-install(CODE "execute_process( \
+# WARNING - if you use the default CMAKE_INSTALL_PREFIX, this may overwrite the
+# existing mpi.h on the system
+install(
+    CODE "execute_process( \
     COMMAND ${CMAKE_COMMAND} -E create_symlink \
-    ${CMAKE_INSTALL_PREFIX}/include/faabric/mpi/mpi.h \
-    ${CMAKE_INSTALL_PREFIX}/include/mpi.h   \
+        ${CMAKE_INSTALL_PREFIX}/include/faabric/mpi/mpi.h \
+        ${CMAKE_INSTALL_PREFIX}/include/mpi.h   \
     )"
 )
diff --git a/tasks/lib.py b/tasks/lib.py
@@ -67,11 +67,3 @@ def build_faasm_lib(subdir, clean=False, native=False, shared=False):
 
     run("ninja", shell=True, cwd=build_dir, check=True)
     run("ninja install", shell=True, cwd=build_dir, check=True)
-
-    # Copy imports into place for WASM libraries
-    if not native:
-        imports_file = "{}.imports".format(subdir)
-        src_imports = join(work_dir, imports_file)
-        dst_imports = join(install_dir, imports_file)
-        print("Copying {} to {}".format(src_imports, dst_imports))
-        run("cp {} {}".format(src_imports, dst_imports), check=True, shell=True)