From 4158ddb792682edc858b0216d710288af7ced7e6 Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Tue, 21 Aug 2018 13:28:07 +0200 Subject: [PATCH] gpu: fix include paths and some linker settings --- fpga/Dockerfile | 6 +++--- fpga/lib/gpu/CMakeLists.txt | 2 +- fpga/lib/gpu/gpu.cpp | 2 +- fpga/lib/gpu/include/villas/gpu.hpp | 7 +++---- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/fpga/Dockerfile b/fpga/Dockerfile index 4b8dfbc06..57d5969ef 100644 --- a/fpga/Dockerfile +++ b/fpga/Dockerfile @@ -50,7 +50,7 @@ RUN yum -y install epel-release centos-release-scl # Toolchain RUN yum -y install \ - gcc gcc-c++ \ + devtoolset-7-toolchain \ pkgconfig make cmake3 \ autoconf automake autogen libtool \ texinfo git curl tar @@ -67,9 +67,9 @@ RUN yum -y install \ # Build & Install Criterion COPY thirdparty/criterion /tmp/criterion -RUN mkdir -p /tmp/criterion/build && cd /tmp/criterion/build && cmake .. && make install && rm -rf /tmp/* +RUN mkdir -p /tmp/criterion/build && cd /tmp/criterion/build && cmake3 .. && make install && rm -rf /tmp/* ENV LD_LIBRARY_PATH /usr/local/lib:/usr/local/lib64 WORKDIR /fpga -ENTRYPOINT bash +ENTRYPOINT scl enable devtoolset-7 bash diff --git a/fpga/lib/gpu/CMakeLists.txt b/fpga/lib/gpu/CMakeLists.txt index c1bca7594..1c17ad0a2 100644 --- a/fpga/lib/gpu/CMakeLists.txt +++ b/fpga/lib/gpu/CMakeLists.txt @@ -39,7 +39,7 @@ set_source_files_properties(gpu.cpp PROPERTIES target_include_directories(villas-gpu PRIVATE /opt/cuda/include) target_link_libraries(villas-gpu - PRIVATE villas-common gdrapi cuda) + PUBLIC villas-common gdrapi cuda) target_include_directories(villas-gpu PUBLIC diff --git a/fpga/lib/gpu/gpu.cpp b/fpga/lib/gpu/gpu.cpp index 99f269c20..fbefd5e36 100644 --- a/fpga/lib/gpu/gpu.cpp +++ b/fpga/lib/gpu/gpu.cpp @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include diff --git a/fpga/lib/gpu/include/villas/gpu.hpp b/fpga/lib/gpu/include/villas/gpu.hpp index 4ce1240aa..6e8dc0a6d 100644 --- a/fpga/lib/gpu/include/villas/gpu.hpp +++ b/fpga/lib/gpu/include/villas/gpu.hpp @@ -25,12 +25,11 @@ #include -#include -#include -#include +#include +#include +#include #include - namespace villas { namespace gpu {