diff --git a/.env b/.env index 0ea91c30b..cfb0127e6 100644 --- a/.env +++ b/.env @@ -1,3 +1,3 @@ -FAABRIC_VERSION=0.1.2 -FAABRIC_CLI_IMAGE=faasm/faabric:0.1.2 +FAABRIC_VERSION=0.2.0 +FAABRIC_CLI_IMAGE=faasm/faabric:0.2.0 COMPOSE_PROJECT_NAME=faabric-dev diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 6b40a0e25..99476dd42 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -16,7 +16,7 @@ jobs: REDIS_QUEUE_HOST: redis REDIS_STATE_HOST: redis container: - image: faasm/faabric:0.1.2 + image: faasm/faabric:0.2.0 defaults: run: working-directory: /code/faabric @@ -45,7 +45,7 @@ jobs: REDIS_QUEUE_HOST: redis REDIS_STATE_HOST: redis container: - image: faasm/faabric:0.1.2 + image: faasm/faabric:0.2.0 defaults: run: working-directory: /code/faabric @@ -92,7 +92,7 @@ jobs: REDIS_QUEUE_HOST: redis REDIS_STATE_HOST: redis container: - image: faasm/faabric:0.1.2 + image: faasm/faabric:0.2.0 defaults: run: working-directory: /code/faabric diff --git a/VERSION b/VERSION index d917d3e26..0ea3a944b 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.1.2 +0.2.0 diff --git a/bin/workon.sh b/bin/workon.sh index 4cbb1dc89..685913531 100755 --- a/bin/workon.sh +++ b/bin/workon.sh @@ -32,7 +32,14 @@ pushd ${PROJ_ROOT}>>/dev/null # ---------------------------- if [ ! -d "venv" ]; then - python3 -m venv venv + python3 -m venv venv + ( + source venv/bin/activate + pip install -U pip + pip install -U setuptools + pip install -U wheel + pip install -r requirements.txt + ) fi export VIRTUAL_ENV_DISABLE_PROMPT=1 diff --git a/cmake/ExternalProjects.cmake b/cmake/ExternalProjects.cmake index 486164d02..f27fe9301 100644 --- a/cmake/ExternalProjects.cmake +++ b/cmake/ExternalProjects.cmake @@ -107,7 +107,7 @@ set(ZSTD_LZ4_SUPPORT OFF CACHE INTERNAL "") FetchContent_Declare(zstd_ext GIT_REPOSITORY "https://github.com/facebook/zstd" - GIT_TAG "v1.4.9" + GIT_TAG "v1.5.0" SOURCE_SUBDIR "build/cmake" ) diff --git a/docker/faabric-base.dockerfile b/docker/faabric-base.dockerfile index 1a084fe45..0ba38c528 100644 --- a/docker/faabric-base.dockerfile +++ b/docker/faabric-base.dockerfile @@ -1,37 +1,55 @@ FROM ubuntu:20.04 RUN apt-get update -RUN apt-get install -y software-properties-common +RUN apt-get install -y software-properties-common gpg wget curl +RUN wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key|apt-key add - +RUN wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc | apt-key add - +RUN add-apt-repository -y -n "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-10 main" +RUN add-apt-repository -y -n "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-13 main" +RUN add-apt-repository -y -n "deb https://apt.kitware.com/ubuntu/ focal main" +RUN add-apt-repository -y -n ppa:ubuntu-toolchain-r/test +RUN apt-get update RUN apt install -y \ autoconf \ + automake \ build-essential \ clang-10 \ + clang-13 \ clang-format-10 \ + clang-format-13 \ clang-tidy-10 \ + clang-tidy-13 \ + clang-tools-13 \ + cmake \ + g++-11 \ git \ - libhiredis-dev \ - libtool \ + kitware-archive-keyring \ libboost-filesystem-dev \ + libc++-13-dev \ + libc++abi-13-dev \ + libcurl4-openssl-dev \ + libhiredis-dev \ libpython3-dev \ + libssl-dev \ + libstdc++-11-dev \ + libtool \ + libunwind-13-dev \ + libz-dev \ + lld-13 \ + lldb-13 \ + make \ ninja-build \ pkg-config \ python3-dev \ python3-pip \ python3-venv \ redis-tools \ - wget + sudo \ + unzip -# CMake -RUN apt remove --purge --auto-remove cmake -WORKDIR /setup -RUN wget -q -O \ - cmake-linux.sh \ - https://github.com/Kitware/CMake/releases/download/v3.18.2/cmake-3.18.2-Linux-x86_64.sh -RUN sh cmake-linux.sh -- --skip-license --prefix=/usr/local +RUN curl -s -L -o /tmp/conan-latest.deb https://github.com/conan-io/conan/releases/latest/download/conan-ubuntu-64.deb && sudo dpkg -i /tmp/conan-latest.deb && rm -f /tmp/conan-latest.deb # Tidy up -WORKDIR / -RUN rm -r /setup RUN apt-get clean autoclean RUN apt-get autoremove diff --git a/docker/faabric.dockerfile b/docker/faabric.dockerfile index bef670525..7e552573d 100644 --- a/docker/faabric.dockerfile +++ b/docker/faabric.dockerfile @@ -6,8 +6,6 @@ ARG FAABRIC_VERSION # Flag to say we're in a container ENV FAABRIC_DOCKER="on" -RUN apt-get update - # Put the code in place WORKDIR /code RUN git clone -b v${FAABRIC_VERSION} https://github.com/faasm/faabric diff --git a/docs/development.md b/docs/development.md index afbb04540..4b1d18a80 100644 --- a/docs/development.md +++ b/docs/development.md @@ -121,8 +121,12 @@ docker-compose stop ## Releasing Create a new branch, then find and replace the current version with the relevant -bumped version. Currently it's held in `VERSION`, `.env`, -`mpi-native/mpi-native.env` and the Github Actions configuration. +bumped version. It should appear in: + +- `VERSION` +- `.env` +- `.github/workflows/tests.yml`. +- `mpi-native/mpi-native.env` Once done, commit and push, then run: diff --git a/include/faabric/state/StateKeyValue.h b/include/faabric/state/StateKeyValue.h index ecb7fd25f..2edf3d218 100644 --- a/include/faabric/state/StateKeyValue.h +++ b/include/faabric/state/StateKeyValue.h @@ -6,6 +6,7 @@ #include #include +#include #include #include #include diff --git a/include/faabric/util/random.h b/include/faabric/util/random.h index ef0d85259..31c14be2b 100644 --- a/include/faabric/util/random.h +++ b/include/faabric/util/random.h @@ -1,5 +1,6 @@ #pragma once +#include #include namespace faabric::util { diff --git a/mpi-native/mpi-native.env b/mpi-native/mpi-native.env index fb1985cbe..18912f1d0 100644 --- a/mpi-native/mpi-native.env +++ b/mpi-native/mpi-native.env @@ -1,4 +1,4 @@ -FAABRIC_VERSION=0.0.18 +FAABRIC_VERSION=0.2.0 FAABRIC_MPI_NATIVE_IMAGE=faasm/faabric-mpi-native:0.0.18 COMPOSE_PROJECT_NAME=faabric-mpi diff --git a/src/util/environment.cpp b/src/util/environment.cpp index 29fe182cf..c877d611b 100644 --- a/src/util/environment.cpp +++ b/src/util/environment.cpp @@ -1,6 +1,7 @@ #include #include +#include #include namespace faabric::util {