Remove boost from the driver

.gitlab-ci.yml

@@ -16,19 +16,19 @@ workflow:
 
 .load-modules:
   before_script:
-    - ml vis/Graphviz/8.1.0-GCCcore-12.3.0 fpga xilinx/xrt/2.16 devel/Doxygen/1.9.7-GCCcore-12.3.0 compiler/GCC/12.3.0 devel/CMake/3.26.3-GCCcore-12.3.0 devel/Boost/1.82.0-GCC-12.3.0
+    - ml vis/Graphviz/8.1.0-GCCcore-12.3.0 fpga xilinx/xrt/2.16 devel/Doxygen/1.9.8-GCCcore-13.2.0 compiler/GCC/13.3.0 devel/CMake/3.29.3-GCCcore-13.3.0
 
-build-dependencies:
+init-repo:
   id_tokens:
     CI_JOB_JWT:
       aud: https://git.uni-paderborn.de
   stage: prepare
   variables:
     #SCHEDULER_PARAMETERS: "-A hpc-prf-ekiapp -p normal -t 2:00:00 -N 1 -n 1 --cpus-per-task=128"
-    SCHEDULER_PARAMETERS: "-A hpc-prf-ekiapp -p hacc -t 2:00:00"
+    SCHEDULER_PARAMETERS: "-A hpc-prf-ekiapp -p hacc -t 0:05:00"
   extends: .load-modules
   script:
-    - ./buildDependencies.sh
+    - git submodule update --init --recursive
   artifacts:
     paths:
       - "deps/"
@@ -40,7 +40,7 @@ build-unittests:
       aud: https://git.uni-paderborn.de
   stage: build
   needs:
-    - build-dependencies
+    - init-repo
   variables:
     #SCHEDULER_PARAMETERS: "-A hpc-prf-ekiapp -p normal -t 2:00:00 -N 1 -n 1 --cpus-per-task=128"
     SCHEDULER_PARAMETERS: "-A hpc-prf-ekiapp -p hacc -t 2:00:00"
@@ -60,7 +60,7 @@ build-integrationtests:
       aud: https://git.uni-paderborn.de
   stage: build
   needs:
-    - build-dependencies
+    - init-repo
   variables:
     #SCHEDULER_PARAMETERS: "-A hpc-prf-ekiapp -p normal -t 2:00:00 -N 1 -n 1 --cpus-per-task=128"
     SCHEDULER_PARAMETERS: "-A hpc-prf-ekiapp -p hacc -t 2:00:00"
@@ -85,7 +85,7 @@ build-regressiontests:
       aud: https://git.uni-paderborn.de
   stage: build
   needs:
-    - build-dependencies
+    - init-repo
   variables:
     #SCHEDULER_PARAMETERS: "-A hpc-prf-ekiapp -p normal -t 2:00:00 -N 1 -n 1 --cpus-per-task=128"
     SCHEDULER_PARAMETERS: "-A hpc-prf-ekiapp -p hacc -t 2:00:00"
@@ -122,13 +122,13 @@ run-unittests:
   stage: test
   needs:
     - build-unittests
-    - build-dependencies
+    - init-repo
   variables:
     #SCHEDULER_PARAMETERS: "-A hpc-prf-ekiapp -p normal -t 0:30:00 -N 1 -n 1 --cpus-per-task=2 --mem-per-cpu=2G"
     SCHEDULER_PARAMETERS: "-A hpc-prf-ekiapp -p hacc -t 2:00:00"
   extends: .load-modules
   script:
-    - export LD_LIBRARY_PATH="$(pwd)/deps/finn_boost/stage/lib/boost/:$LD_LIBRARY_PATH"
+    - export LD_LIBRARY_PATH="$(pwd)/build/libs:$LD_LIBRARY_PATH"
     - cd build
     - ctest --output-on-failure --output-junit ctest-results.xml
   artifacts:
@@ -146,12 +146,12 @@ run-integrationtests:
   stage: test
   needs:
     - build-integrationtests
-    - build-dependencies
+    - init-repo
   variables:
     SCHEDULER_PARAMETERS: "-A hpc-prf-ekiapp -p hacc  -t 0:30:00"
   extends: .load-modules
   script:
-    - export LD_LIBRARY_PATH="$(pwd)/deps/finn_boost/stage/lib/boost/:$LD_LIBRARY_PATH"
+    - export LD_LIBRARY_PATH="$(pwd)/build/libs:$LD_LIBRARY_PATH"
     # Reset FPGAs and setup Host Memory Access
     - ml xilinx/u55c/u55c_gen3x16_xdma_3_202210_1
     - xbutil reset -d 0000:c1:00.1
@@ -184,13 +184,13 @@ run-regressiontests:
   stage: test
   needs:
     - build-regressiontests
-    - build-dependencies
+    - init-repo
   variables:
     #SCHEDULER_PARAMETERS: "-A hpc-prf-ekiapp -p normal -t 0:30:00 -N 1 -n 1 --cpus-per-task=2 --mem-per-cpu=2G"
     SCHEDULER_PARAMETERS: "-A hpc-prf-ekiapp -p hacc -t 0:30:00"
   extends: .load-modules
   script:
-    - export LD_LIBRARY_PATH="$(pwd)/deps/finn_boost/stage/lib/boost/:$LD_LIBRARY_PATH"
+    - export LD_LIBRARY_PATH="$(pwd)/build/libs:$LD_LIBRARY_PATH"
     # Reset FPGAs and setup Host Memory Access
     - ml xilinx/u55c/u55c_gen3x16_xdma_3_202210_1
     - xbutil reset -d 0000:c1:00.1

.gitmodules

@@ -10,3 +10,9 @@
 [submodule "external/xsimd"]
 	path = external/xsimd
 	url = https://github.com/xtensor-stack/xsimd.git
+[submodule "external/popl"]
+	path = external/popl
+	url = https://github.com/badaix/popl.git
+[submodule "external/plog"]
+	path = external/plog
+	url = https://github.com/SergiusTheBest/plog.git

CMakeLists.txt

@@ -72,14 +72,6 @@ endif()
 
 #INCLUDES
 
-#Set Boost policies for compatibility
-if(POLICY CMP0167)
-  cmake_policy(SET CMP0167 OLD)
-endif()
-if(POLICY CMP0144)
-  cmake_policy(SET CMP0144 NEW)
-endif()
-
 #Threads
 set(THREADS_PREFER_PTHREAD_FLAG ON)
 find_package(Threads REQUIRED)
@@ -92,8 +84,11 @@ find_package(XRT REQUIRED)
 #OpenMP
 find_package(OpenMP REQUIRED)
 
-#Boost
-find_package(Boost 1.79.0 COMPONENTS system log log_setup program_options filesystem ${BOOST_THREAD} REQUIRED)
+#popl
+include_directories(SYSTEM external/popl/include)
+
+#plog
+include_directories(SYSTEM external/plog/include)
 
 #xsimd
 add_subdirectory(external/xsimd)

README.md

@@ -72,7 +72,7 @@ It is assumed, that you used FINN and now want to build the generated driver. Co
 Building the driver is as easy as running:
 
 ```bash
-./buildDependencies.sh
+git submodule update --init --recursive
 mkdir build && cd build
 cmake -DCMAKE_BUILD_TYPE=Release -DFINN_ENABLE_SANITIZERS=OFF -DFINN_HEADER_LOCATION=../AcceleratorDatatypes.h -DFINN_USE_HOST_MEM=OFF ..
 make -j $(nprocs)

benchmarks/CMakeLists.txt

@@ -5,4 +5,5 @@ set(FINN_BENCHMARK_DIR ${CMAKE_CURRENT_BINARY_DIR})
 
 add_benchmark(DataPackingBenchmark.cpp)
 add_benchmark(DynamicMdSpanBenchmark.cpp)
-add_benchmark(SynchronousInferenceBenchmark.cpp)
+add_benchmark(SynchronousInferenceBenchmark.cpp)
+add_benchmark(SPSCQueueBenchmark.cpp)