From 3f119896e976e1f6b301954707f045b4f22caa55 Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Tue, 21 Aug 2018 14:56:15 +0200 Subject: [PATCH] ci: some tweaks to fix unit-tests --- fpga/.gitlab-ci.yml | 1 + fpga/CMakeLists.txt | 4 ++++ fpga/lib/CMakeLists.txt | 4 ---- fpga/tests/CMakeLists.txt | 7 ++++--- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/fpga/.gitlab-ci.yml b/fpga/.gitlab-ci.yml index 5bd6f8b2e..66deb89c8 100644 --- a/fpga/.gitlab-ci.yml +++ b/fpga/.gitlab-ci.yml @@ -63,6 +63,7 @@ test:unit: stage: test tags: - villas-fpga + - cuda allow_failure: true script: | rm -r build && mkdir build && cd build && cmake3 .. && make unit-tests -j8 diff --git a/fpga/CMakeLists.txt b/fpga/CMakeLists.txt index 9a7b0bf6b..3d506afea 100644 --- a/fpga/CMakeLists.txt +++ b/fpga/CMakeLists.txt @@ -29,6 +29,10 @@ set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/cmake) set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Werror") +# GPU library is optional, check for CUDA presence +include(CheckLanguage) +check_language(CUDA) + include_directories(thirdparty/CLI11) include_directories(thirdparty/rang) diff --git a/fpga/lib/CMakeLists.txt b/fpga/lib/CMakeLists.txt index b4d3f34b4..f3fe630f8 100644 --- a/fpga/lib/CMakeLists.txt +++ b/fpga/lib/CMakeLists.txt @@ -55,10 +55,6 @@ add_library(villas-fpga SHARED ${SOURCES}) target_link_libraries(villas-fpga PUBLIC villas-common) -# GPU library is optional, check for CUDA presence -include(CheckLanguage) -check_language(CUDA) - if(CMAKE_CUDA_COMPILER) add_subdirectory(gpu) target_link_libraries(villas-fpga PUBLIC villas-gpu) diff --git a/fpga/tests/CMakeLists.txt b/fpga/tests/CMakeLists.txt index 1135d90db..93e6f8d14 100644 --- a/fpga/tests/CMakeLists.txt +++ b/fpga/tests/CMakeLists.txt @@ -31,13 +31,14 @@ set(SOURCES timer.cpp ) +add_executable(unit-tests ${SOURCES}) + if(CMAKE_CUDA_COMPILER) enable_language(CUDA) - list(APPEND SOURCES gpu.cpp gpu_kernels.cu) + target_sources(unit-tests PRIVATE + gpu.cpp gpu_kernels.cu) endif() -add_executable(unit-tests ${SOURCES}) - find_package(Criterion REQUIRED) target_include_directories(unit-tests PUBLIC