From 8cf8ae9b788e9d684a9d49948d37dcc00ad3a4af Mon Sep 17 00:00:00 2001
From: Paul Bauer <paul.bauer.q@gmail.com>
Date: Thu, 16 Apr 2020 07:31:21 +0000
Subject: [PATCH] Use GPU resources for build types again

Change-Id: Ibc2629b2ae29ba5099c4565f94adeccc6cb5c270
---
 admin/gitlab-ci/gromacs.gitlab-ci.yml | 23 ++++++-----------------
 admin/gitlab-ci/lint.gitlab-ci.yml    |  2 --
 2 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/admin/gitlab-ci/gromacs.gitlab-ci.yml b/admin/gitlab-ci/gromacs.gitlab-ci.yml
index 93dedc8154..afffc9cfb4 100644
--- a/admin/gitlab-ci/gromacs.gitlab-ci.yml
+++ b/admin/gitlab-ci/gromacs.gitlab-ci.yml
@@ -221,26 +221,24 @@ gromacs:gcc-7:configure:
   extends:
     - .gromacs:base:configure
     - .use-gcc:base
+    - .use-opencl
     - .rules:merge-requests
   image: gromacs/cmake-3.13.0-gcc-7-amdopencl-clfft-openmpi:master
   variables:
     CMAKE_SIMD_OPTIONS: "-DGMX_SIMD=AVX2_256"
-    CMAKE_GPU_OPTIONS: "-DGMX_GPU=ON -DGMX_USE_OPENCL=ON"
+    CMAKE_EXTRA_OPTIONS: "-DGMX_EXTERNAL_CLFFT=ON"
     COMPILER_MAJOR_VERSION: 7
-  dependencies: []
 
 gromacs:gcc-8:configure:
   extends:
     - .gromacs:base:configure
     - .use-gcc:base
-    - .use-opencl
+    - .use-cuda
     - .rules:merge-requests
   image: gromacs/cmake-3.15.7-gcc-8-cuda-10.1-nvidiaopencl-clfft-openmpi:master
-  dependencies: []
   variables:
     CMAKE_SIMD_OPTIONS: "-DGMX_SIMD=SSE4.1"
     COMPILER_MAJOR_VERSION: 8
-    CMAKE_EXTRA_OPTIONS: "-DGMX_EXTERNAL_CLFFT=ON"
 
 gromacs:clang-TSAN:configure:
   extends:
@@ -248,7 +246,6 @@ gromacs:clang-TSAN:configure:
     - .use-clang:base
     - .rules:merge-requests
   image: gromacs/cmake-3.13.0-llvm-8-tsan:master
-  dependencies: []
   variables:
     COMPILER_MAJOR_VERSION: 8
     CMAKE_BUILD_TYPE_OPTIONS: "-DCMAKE_BUILD_TYPE=TSAN"
@@ -259,7 +256,6 @@ gromacs:clang-8:configure:
     - .use-clang:base
     - .rules:merge-requests
   image: gromacs/cmake-3.15.7-llvm-8-intelopencl-openmpi:2020
-  dependencies: []
   variables:
     COMPILER_MAJOR_VERSION: 8
 
@@ -272,7 +268,6 @@ gromacs:clang-9:configure:
   variables:
     COMPILER_MAJOR_VERSION: 9
     CMAKE_PRECISION_OPTIONS: -DGMX_DOUBLE=ON
-  dependencies: []
 
 gromacs:clang-static-analyzer:configure:
   extends:
@@ -280,7 +275,6 @@ gromacs:clang-static-analyzer:configure:
     - .use-clang:base
     - .rules:merge-requests
   image: gromacs/cmake-3.13.0-llvm-8-tsan:master
-  dependencies: []
   variables:
      CMAKE_COMPILER_SCRIPT: "-DCMAKE_CXX_COMPILER=/usr/local/libexec/c++-analyzer -DCMAKE_C_COMPILER=gcc"
      CMAKE_EXTRA_OPTIONS: "-DGMX_CLANG_ANALYZER=ON -DGMX_OPENMP=OFF -DGMX_USE_RDTSCP=OFF -DGMX_FFT_LIBRARY=fftpack -DGMX_DEVELOPER_BUILD=ON"
@@ -292,7 +286,6 @@ gromacs:clang-ASAN:configure:
     - .use-clang:base
     - .rules:merge-requests
   image: gromacs/cmake-3.13.0-llvm-8-tsan:master
-  dependencies: []
   variables:
     COMPILER_MAJOR_VERSION: 8
     CMAKE_BUILD_TYPE_OPTIONS: "-DCMAKE_BUILD_TYPE=ASAN"
@@ -548,11 +541,7 @@ gromacs:clang-8:release:build:
     - ctest -D $CTEST_RUN_MODE --output-on-failure | tee ctestLog.log || true
     - awk '/The following tests FAILED/,/^Errors while running CTest|^$/'
       ctestLog.log | tee ctestErrors.log
-    - if [ $CTEST_RUN_MODE == "ExperimentalTest" ] ; then
-      xsltproc scripts/CTest2JUnit.xsl Testing/`head -n 1 < Testing/TAG`/Test.xml > JUnitTestResults.xml;
-      else
-      touch JUnitTestResults.xml;
-      fi
+    - xsltproc scripts/CTest2JUnit.xsl Testing/`head -n 1 < Testing/TAG`/*.xml > JUnitTestResults.xml
     - if [ -s ctestErrors.log ] ; then
       echo "Error during running ctest";
       exit 1;
@@ -592,8 +581,8 @@ gromacs:clang-8:release:build:
     - cd regressiontests
     - perl gmxtest.pl $REGRESSIONTEST_PARALLEL $REGRESSIONTEST_TOTAL_RANK_NUMBER -ntomp $REGRESSIONTEST_OMP_RANK_NUMBER -npme $REGRESSIONTEST_PME_RANK_NUMBER $REGRESSIONTEST_DOUBLE $REGRESSIONTEST_MPI_RUN_COMMAND -xml all
   artifacts:
-    reports:
-      junit: regressiontests/gmxtest.xml
+    paths:
+      - regressiontests/gmxtest.xml
     when: always
     expire_in: 1 week
 
diff --git a/admin/gitlab-ci/lint.gitlab-ci.yml b/admin/gitlab-ci/lint.gitlab-ci.yml
index 07403be39d..03343bbcee 100644
--- a/admin/gitlab-ci/lint.gitlab-ci.yml
+++ b/admin/gitlab-ci/lint.gitlab-ci.yml
@@ -6,7 +6,6 @@ clang-tidy:configure-push:
     - .use-clang:base
     - .rules:basic-push
   image: gromacs/cmake-3.15.7-llvm-9-openmpi:master
-  dependencies: []
   tags: []
   variables:
     COMPILER_MAJOR_VERSION: 9
@@ -19,7 +18,6 @@ clang-tidy:configure-schedule:
     - .use-clang:base
     - .rules:nightly-not-for-release
   image: gromacs/cmake-3.15.7-llvm-9-openmpi:master
-  dependencies: []
   tags: []
   variables:
     COMPILER_MAJOR_VERSION: 9
-- 
2.22.0