diff --git a/CMakeLists.txt b/CMakeLists.txt index f3bd7dc..90d7720 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.14 FATAL_ERROR) project(fletcher_opae - VERSION 0.1.1 + VERSION 0.2.0 DESCRIPTION "Fletcher platform support for Open Programmable Acceleration Engine" HOMEPAGE_URL "https://github.com/teratide/fletcher-opae" LANGUAGES C @@ -21,7 +21,7 @@ FetchContent_MakeAvailable(cmake-modules) FetchContent_Declare(fletcher GIT_REPOSITORY https://github.com/abs-tudelft/fletcher.git - GIT_TAG 0.0.16 + GIT_TAG 0.0.19 ) if(NOT fletcher_POPULATED) FetchContent_Populate(fletcher) @@ -30,12 +30,13 @@ endif() FetchContent_Declare(opae-c GIT_REPOSITORY https://github.com/opae/opae-libs.git - GIT_TAG release/2.0.0 + GIT_TAG release/2.0.1-2 ) if(NOT opae-c_POPULATED) FetchContent_Populate(opae-c) set(OPAE_BUILD_LIBOPAE_CXX OFF CACHE BOOL "") set(OPAE_BUILD_LIBOPAE_PY OFF CACHE BOOL "") + set(OPAE_BUILD_SIM ON CACHE BOOL "") add_subdirectory(${opae-c_SOURCE_DIR} ${opae-c_BINARY_DIR} EXCLUDE_FROM_ALL) endif() @@ -109,16 +110,16 @@ set(CPACK_PACKAGE_RELOCATABLE ON) set(CPACK_DEB_COMPONENT_INSTALL ON) set(CPACK_DEBIAN_LIBRARY_PACKAGE_NAME "${CMAKE_PROJECT_NAME}") set(CPACK_DEBIAN_FILE_NAME "DEB-DEFAULT") -set(CPACK_DEBIAN_LIBRARY_PACKAGE_DEPENDS "fletcher (= 0.0.16), opae-libs (= 2.0.0)") -set(CPACK_DEBIAN_ASE_PACKAGE_DEPENDS "fletcher (= 0.0.16), opae-ase (= 2.0.0)") +set(CPACK_DEBIAN_LIBRARY_PACKAGE_DEPENDS "fletcher (= 0.0.19), opae-libs (= 2.0.1)") +set(CPACK_DEBIAN_ASE_PACKAGE_DEPENDS "fletcher (= 0.0.19), opae-ase (= 2.0.1)") set(CPACK_DEBIAN_PACKAGE_MAINTAINER "${CPACK_PACKAGE_VENDOR}") set(CPACK_RPM_COMPONENT_INSTALL ON) set(CPACK_RPM_FILE_NAME "RPM-DEFAULT") set(CPACK_RPM_PACKAGE_DESCRIPTION "${CPACK_PACKAGE_DESCRIPTION}") set(CPACK_RPM_PACKAGE_LICENSE "ASL 2.0") -set(CPACK_RPM_LIBRARY_PACKAGE_REQUIRES "fletcher = 0.0.16, opae-libs = 2.0.0") -set(CPACK_RPM_ASE_PACKAGE_REQUIRES "fletcher = 0.0.16, opae-ase = 2.0.0") +set(CPACK_RPM_LIBRARY_PACKAGE_REQUIRES "fletcher = 0.0.19, opae-libs = 2.0.1") +set(CPACK_RPM_ASE_PACKAGE_REQUIRES "fletcher = 0.0.19, opae-ase = 2.0.1") set(CPACK_ARCHIVE_COMPONENT_INSTALL ON) set(CPACK_ARCHIVE_LIBRARY_FILE_NAME "${CMAKE_PROJECT_NAME}-${fletcher_opae_VERSION}-${CMAKE_SYSTEM_NAME}") diff --git a/Dockerfile b/Dockerfile index d4ff540..ac434cb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -36,21 +36,22 @@ RUN mkdir -p /ofs-platform-afu-bbb && \ ./plat_if_release/update_release.sh $OPAE_PLATFORM_ROOT # Open Programmable Acceleration Engine -ARG OPAE_REF=release/2.0.0 +ARG OPAE_REF=release/2.0.1-2 ARG OPAE_SIM_REF=a51f807bd336bd53da23f383f5732c7fc311f5a9 RUN mkdir -p /opae-sdk/build && \ yum install -y git cmake3 make gcc gcc-c++ json-c-devel libuuid-devel hwloc-devel python-devel glibc-devel && \ curl -L https://github.com/OPAE/opae-sdk/archive/${OPAE_REF}.tar.gz | tar xz -C /opae-sdk --strip-components=1 && \ cd /opae-sdk/build && \ - cmake3 -DCMAKE_BUILD_TYPE=Release \ - -DBUILD_ASE=On -DOPAE_BUILD_SIM=On -DOPAE_SIM_TAG=${OPAE_SIM_REF} \ + cmake3 \ + -DCMAKE_BUILD_TYPE=Release \ + -DOPAE_BUILD_SIM=On \ -DCMAKE_INSTALL_PREFIX=/usr .. && \ make -j && \ make install && \ rm -rf /opae-sdk/build # Intel FPGA Basic Building Blocks -ARG BBB_REF=3d7d2017a98f740bd73a9a2ad020efe16f25500f +ARG BBB_REF=1909c504503f0602c86089cca1aa3aad3f7929d0 RUN mkdir -p /intel-fpga-bbb/build && \ curl -L https://github.com/OPAE/intel-fpga-bbb/archive/${BBB_REF}.tar.gz | tar xz -C /intel-fpga-bbb --strip-components=1 && \ cd /intel-fpga-bbb/build && \ @@ -65,8 +66,8 @@ ENV FPGA_BBB_CCI_SRC /intel-fpga-bbb RUN curl -L https://github.com/oneapi-src/oneTBB/releases/download/v2020.3/tbb-2020.3-lin.tgz | tar xz -C /usr --strip-components=1 # Fletcher runtime -ARG FLETCHER_VERSION=0.0.16 -ARG ARROW_VERSION=1.0.1 +ARG FLETCHER_VERSION=0.0.19 +ARG ARROW_VERSION=3.0.0 RUN mkdir -p /fletcher && \ yum install -y https://apache.bintray.com/arrow/centos/$(cut -d: -f5 /etc/system-release-cpe)/apache-arrow-release-latest.rpm && \ yum install -y arrow-devel-${ARROW_VERSION}-1.el7 && \ @@ -82,7 +83,7 @@ RUN git clone --recursive --single-branch -b ${FLETCHER_VERSION} https://github. ENV FLETCHER_HARDWARE_DIR=/fletcher/hardware # Fletcher plaform support for OPAE -ARG FLETCHER_OPAE_VERSION=0.1.1 +ARG FLETCHER_OPAE_VERSION=0.2.0 RUN mkdir -p /fletcher-opae && \ curl -L https://github.com/teratide/fletcher-opae/archive/${FLETCHER_OPAE_VERSION}.tar.gz | tar xz -C /fletcher-opae --strip-components=1 && \ cd /fletcher-opae && \