Mirrors/VILLASnode
1
0
Fork 0
mirror of https://git.rwth-aachen.de/acs/public/villas/node/ synced 2025-03-09 00:00:00 +01:00
Code Issues Releases Wiki Activity

gpu: fix include paths and some linker settings

Browse source
This commit is contained in:
Steffen Vogel 2018-08-21 13:28:07 +02:00
parent 76b1695586
commit 4158ddb792
4 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
fpga/Dockerfile
View file

@ -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

2
fpga/lib/gpu/CMakeLists.txt
View file

@ -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

2
fpga/lib/gpu/gpu.cpp
View file

@ -31,7 +31,7 @@
#include <villas/gpu.hpp>
#include <villas/log.hpp>
#include <villas/kernel/pci.h>
#include <memory_manager.hpp>
#include <villas/memory_manager.hpp>
#include <cuda.h>
#include <cuda_runtime.h>

7
fpga/lib/gpu/include/villas/gpu.hpp
View file

@ -25,12 +25,11 @@
#include <sstream>
#include <plugin.hpp>
#include <memory_manager.hpp>
#include <memory.hpp>
#include <villas/plugin.hpp>
#include <villas/memory_manager.hpp>
#include <villas/memory.hpp>
#include <villas/log.hpp>
namespace villas {
namespace gpu {