diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a6c371a3a4ccef5d7df7840aa55399e76bf12c50..2ace9d12e861971d592fc13f8407515a5317d1a9 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 021dc65ab285a6803d4b6a47b2b78a3e0365ffe9..e91060bdcca1e552bac4dec1abda769abcb185e2 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()