diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 195193aec28..a5e95315867 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -77,7 +77,7 @@ default: CC: 'gcc-9' CXX: 'g++-9' script: - - export with_cuda=false myconfig=default with_coverage=true + - export with_cuda=false myconfig=default with_coverage=true with_scafacos=true - bash maintainer/CI/build_cmake.sh tags: - docker @@ -90,7 +90,7 @@ maxset: CC: 'gcc-9' CXX: 'g++-9' script: - - export with_cuda=false myconfig=maxset with_coverage=true + - export with_cuda=false myconfig=maxset with_coverage=true with_scafacos=true - bash maintainer/CI/build_cmake.sh tags: - docker @@ -103,7 +103,7 @@ no_rotation: CC: 'gcc-9' CXX: 'g++-9' script: - - export with_cuda=false myconfig=no_rotation with_coverage=true + - export with_cuda=false myconfig=no_rotation with_coverage=true with_scafacos=true - bash maintainer/CI/build_cmake.sh tags: - docker @@ -187,7 +187,7 @@ clang-sanitizer: CC: 'clang-9' CXX: 'clang++-9' script: - - export myconfig=maxset with_cuda=true with_cuda_compiler=clang with_coverage=false + - export myconfig=maxset with_cuda=true with_cuda_compiler=clang with_coverage=false with_scafacos=true - export with_static_analysis=true test_timeout=900 with_asan=true with_ubsan=true - bash maintainer/CI/build_cmake.sh timeout: 2h @@ -203,7 +203,7 @@ cuda10-maxset: CC: 'gcc-8' CXX: 'g++-8' script: - - export myconfig=maxset with_cuda=true with_coverage=false test_timeout=900 srcdir=${CI_PROJECT_DIR} + - export myconfig=maxset with_cuda=true with_coverage=false with_scafacos=true test_timeout=900 srcdir=${CI_PROJECT_DIR} - bash maintainer/CI/build_cmake.sh artifacts: paths: @@ -223,7 +223,7 @@ cuda9-maxset: CXX: 'g++-6' GCOV: 'gcov-6' script: - - export myconfig=maxset with_cuda=true with_coverage=true test_timeout=900 srcdir=${CI_PROJECT_DIR} + - export myconfig=maxset with_cuda=true with_coverage=true with_scafacos=true test_timeout=900 srcdir=${CI_PROJECT_DIR} - bash maintainer/CI/build_cmake.sh artifacts: paths: @@ -242,7 +242,7 @@ tutorials-samples-maxset: CC: 'gcc-8' CXX: 'g++-8' script: - - export myconfig=maxset with_cuda=true with_coverage=false make_check_unit_tests=false make_check_python=false + - export myconfig=maxset with_cuda=true with_coverage=false with_scafacos=true make_check_unit_tests=false make_check_python=false - export make_check_tutorials=true make_check_samples=true make_check_benchmarks=false test_timeout=1200 - bash maintainer/CI/build_cmake.sh tags: @@ -257,7 +257,7 @@ tutorials-samples-default: CC: 'gcc-8' CXX: 'g++-8' script: - - export myconfig=default with_cuda=true with_coverage=false make_check_unit_tests=false make_check_python=false + - export myconfig=default with_cuda=true with_coverage=false with_scafacos=true make_check_unit_tests=false make_check_python=false - export make_check_tutorials=true make_check_samples=true make_check_benchmarks=false test_timeout=1200 - bash maintainer/CI/build_cmake.sh tags: @@ -274,7 +274,7 @@ tutorials-samples-empty: CC: 'gcc-8' CXX: 'g++-8' script: - - export myconfig=empty with_cuda=true with_coverage=false make_check_unit_tests=false make_check_python=false + - export myconfig=empty with_cuda=true with_coverage=false with_scafacos=true make_check_unit_tests=false make_check_python=false - export make_check_tutorials=true make_check_samples=true make_check_benchmarks=false test_timeout=1200 with_scafacos=false - bash maintainer/CI/build_cmake.sh tags: @@ -291,7 +291,7 @@ tutorials-samples-no-gpu: CC: 'gcc-8' CXX: 'g++-8' script: - - export myconfig=maxset with_cuda=true with_coverage=false make_check_unit_tests=false make_check_python=false + - export myconfig=maxset with_cuda=true with_coverage=false with_scafacos=true make_check_unit_tests=false make_check_python=false - export make_check_tutorials=true make_check_samples=true make_check_benchmarks=false test_timeout=1200 hide_gpu=true - bash maintainer/CI/build_cmake.sh tags: @@ -307,7 +307,7 @@ installation: CC: 'gcc-8' CXX: 'g++-8' script: - - export myconfig=maxset with_cuda=true with_coverage=false make_check_unit_tests=false make_check_python=false + - export myconfig=maxset with_cuda=true with_coverage=false with_scafacos=true make_check_unit_tests=false make_check_python=false - export srcdir=${CI_PROJECT_DIR} build_type=Release - bash maintainer/CI/build_cmake.sh - cd build diff --git a/maintainer/CI/build_cmake.sh b/maintainer/CI/build_cmake.sh index 023e10e8296..341d87f63ae 100755 --- a/maintainer/CI/build_cmake.sh +++ b/maintainer/CI/build_cmake.sh @@ -96,7 +96,7 @@ set_default_value with_cuda false set_default_value with_cuda_compiler "nvcc" set_default_value build_type "RelWithAssert" set_default_value with_ccache false -set_default_value with_scafacos true +set_default_value with_scafacos false set_default_value test_timeout 300 set_default_value hide_gpu false diff --git a/maintainer/CI/build_docker.sh b/maintainer/CI/build_docker.sh index dfafe5989de..30fc1bec729 100755 --- a/maintainer/CI/build_docker.sh +++ b/maintainer/CI/build_docker.sh @@ -23,6 +23,7 @@ cmake_params=${cmake_params} with_fftw=${with_fftw} with_coverage=false with_cuda=true +with_scafacos=true CC=gcc-8 CXX=g++-8 check_procs=${check_procs}