From 3e0f996e01cacc70fff57ec5e2e1fa5099ad3ad3 Mon Sep 17 00:00:00 2001
From: Soeren Peters <peters@irmb.tu-bs.de>
Date: Mon, 18 Jan 2021 15:37:11 +0100
Subject: [PATCH] Clone test_data for the numerical tests and artifact the
output.
---
.gitlab-ci.yml | 15 ++++++++++-----
CMake/3rd/cuda.cmake | 3 ++-
2 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a6c371a3a..2ace9d12e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -260,9 +260,9 @@ gpu_numerical_tests:
- linux
before_script:
- - mkdir /testdata && cd /testdata
- - git clone https://gitlab-ci-token:${CI_JOB_TOKEN}@git.rz.tu-bs.de/iRMB/VirtualFluids_dev.git
- - ls -la VirtualFluids_dev/
+ - mkdir /tmp && cd /tmp
+ - git clone https://gitlab-ci-token:${CI_JOB_TOKEN}@git.rz.tu-bs.de/irmb/test_data.git
+ - ls -la test_data/
- export CCACHE_BASEDIR=$CI_PROJECT_DIR
- export CCACHE_DIR=$CI_PROJECT_DIR/cache
- ccache -s
@@ -273,22 +273,27 @@ gpu_numerical_tests:
-DBUILD_VF_CPU=OFF
-DBUILD_VF_GPU=ON
-DBUILD_NUMERIC_TESTS=ON
+ -DPATH_NUMERICAL_TESTS=/tmp/test_data/numerical_tests_gpu/
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache
-DCMAKE_CUDA_COMPILER_LAUNCHER=ccache
-DCMAKE_C_COMPILER_LAUNCHER=ccache
- - make -j4 2>&1 | tee gcc_warnings.txt
+ - make -j4
- ccache -s
script:
- cd $CI_PROJECT_DIR
- ls -la ./build/bin
- - ./build/bin/NumericalTests $CI_PROJECT_DIR/apps/gpu/tests/NumericalTests/configK15_nu10tm2.txt
+ - ./build/bin/NumericalTests $CI_PROJECT_DIR/apps/gpu/tests/NumericalTests/configK15_nu10tm2.txt 2>&1 | tee -a numerical_tests_gpu_results.txt
cache:
key: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG"
paths:
- $CI_PROJECT_DIR/cache
+ artifacts:
+ paths:
+ - $CI_PROJECT_DIR/numerical_tests_gpu_results.txt
+
###############################################################################
## Code analysis ##
diff --git a/CMake/3rd/cuda.cmake b/CMake/3rd/cuda.cmake
index 021dc65ab..e91060bdc 100644
--- a/CMake/3rd/cuda.cmake
+++ b/CMake/3rd/cuda.cmake
@@ -11,8 +11,9 @@ function(linkCUDA)
vf_get_library_name(library_name)
target_include_directories(${library_name} PRIVATE ${CUDA_CUT_INCLUDE_DIR})
+ target_include_directories(${library_name} PRIVATE ${CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES})
# set the following properties only for specific targets
# set_property(TARGET ${targetName} PROPERTY CUDA_SEPARABLE_COMPILATION ON)
# set_property(TARGET ${targetName} PROPERTY CUDA_64_BIT_DEVICE_CODE ON)
-endfunction()
\ No newline at end of file
+endfunction()
--
GitLab