Removed GMX_CLANG_CUDA build using old versions

Clarified that a release job was targetting clang as host-only
compiler, ie. not GMX_CLANG_CUDA.

Refs #3708

diff --git a/admin/gitlab-ci/gromacs.matrix.gitlab-ci.yml b/admin/gitlab-ci/gromacs.matrix.gitlab-ci.yml
index f498dd1a50cd5b73f70ef9d31ef26cd6fdb606bb..a7d92f10d7b985c7892e95c331711c8a444cd33a 100644 (file)
--- a/admin/gitlab-ci/gromacs.matrix.gitlab-ci.yml
+++ b/admin/gitlab-ci/gromacs.matrix.gitlab-ci.yml
@@ -258,7 +258,6 @@
     expire_in: 1 week
 
 include:
-  - local: '/admin/gitlab-ci/gromacs.matrix/gromacs.clang-8-cuda-10.0.gitlab-ci.yml'
   - local: '/admin/gitlab-ci/gromacs.matrix/gromacs.clang-8-cuda-10.1-release.gitlab-ci.yml'
   - local: '/admin/gitlab-ci/gromacs.matrix/gromacs.clang-8.gitlab-ci.yml'
   - local: '/admin/gitlab-ci/gromacs.matrix/gromacs.clang-9-mpi.gitlab-ci.yml'

diff --git a/admin/gitlab-ci/gromacs.matrix/gromacs.clang-8-cuda-10.0.gitlab-ci.yml b/admin/gitlab-ci/gromacs.matrix/gromacs.clang-8-cuda-10.0.gitlab-ci.yml
deleted file mode 100644 (file)
index 5c1f044..0000000
--- a/admin/gitlab-ci/gromacs.matrix/gromacs.clang-8-cuda-10.0.gitlab-ci.yml
+++ /dev/null
@@ -1,75 +0,0 @@
-# Test goal: Clang-CUDA build
-# Test intents (should change rarely and conservatively):
-#   OS: Ubuntu oldest supported
-#   GPU: Clang CUDA
-#   HW: NVIDIA GPU
-#   Scope: configure, build, unit tests, regression tests
-# Test implementation choices (free to change as needed):
-#   OS: Ubuntu 18.04
-#   Build type: RelWithDebInfo
-#   Compiler: Clang 8
-#   MPI: thread_MPI
-#   GPU: Clang CUDA 10.0, CUDA 10.0
-#   SIMD: AVX2_256, no kernels
-#   FFT: FFTW3
-#   Parallelism nt/ntomp: 4/2 (unit tests)
-#   Parallelism nt/ntomp: 2/1 (regression tests)
-
-gromacs:clang-8-cuda-10.0:configure:
-  extends:
-    - .gromacs:base:configure
-    - .use-clang:base
-    - .use-cuda
-    - .rules:merge-and-post-merge-acceptance
-  image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-llvm-8-cuda-10.0
-  variables:
-    CMAKE: /usr/local/cmake-3.18.4/bin/cmake
-    CMAKE_SIMD_OPTIONS: "-DGMX_USE_SIMD_KERNELS=off"
-    CMAKE_EXTRA_OPTIONS: "-DGMX_CLANG_CUDA=ON"
-    CMAKE_BUILD_TYPE_OPTIONS: "-DCMAKE_BUILD_TYPE=RelWithDebInfo"
-    COMPILER_MAJOR_VERSION: 8
-
-gromacs:clang-8-cuda-10.0:build:
-  extends:
-    - .variables:default
-    - .gromacs:base:build
-    - .use-clang:base
-    - .use-ccache
-    - .rules:merge-and-post-merge-acceptance
-  image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-llvm-8-cuda-10.0
-  variables:
-    CMAKE: /usr/local/cmake-3.18.4/bin/cmake
-  needs:
-    - job: gromacs:clang-8-cuda-10.0:configure
-
-gromacs:clang-8-cuda-10.0:test:
-  extends:
-    - .gromacs:base:test
-    - .rules:post-merge-acceptance
-  image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-llvm-8-cuda-10.0
-  variables:
-    CMAKE: /usr/local/cmake-3.18.4/bin/cmake
-    KUBERNETES_EXTENDED_RESOURCE_NAME: "nvidia.com/gpu"
-    KUBERNETES_EXTENDED_RESOURCE_LIMIT: 1
-  tags:
-    - k8s-scilifelab
-  needs:
-    - job: gromacs:clang-8-cuda-10.0:build
-
-gromacs:clang-8-cuda-10.0:regressiontest:
-  extends:
-    - .gromacs:base:regressiontest
-    - .rules:post-merge-acceptance
-  image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-18.04-llvm-8-cuda-10.0
-  variables:
-    CMAKE: /usr/local/cmake-3.18.4/bin/cmake
-    KUBERNETES_EXTENDED_RESOURCE_NAME: "nvidia.com/gpu"
-    KUBERNETES_EXTENDED_RESOURCE_LIMIT: 1
-    REGRESSIONTEST_PME_RANK_NUMBER: 0
-    REGRESSIONTEST_TOTAL_RANK_NUMBER: 2
-    REGRESSIONTEST_OMP_RANK_NUMBER: 1
-  tags:
-    - k8s-scilifelab
-  needs:
-    - job: gromacs:clang-8-cuda-10.0:build
-    - job: regressiontests:prepare

diff --git a/admin/gitlab-ci/gromacs.matrix/gromacs.clang-8-cuda-10.1-release.gitlab-ci.yml b/admin/gitlab-ci/gromacs.matrix/gromacs.clang-8-cuda-10.1-release.gitlab-ci.yml
index e6ea8183bf77c66db0394ad8dfd880fc56ff05cd..32254a3d686a907d1cea90eb241175b9651a08a7 100644 (file)
--- a/admin/gitlab-ci/gromacs.matrix/gromacs.clang-8-cuda-10.1-release.gitlab-ci.yml
+++ b/admin/gitlab-ci/gromacs.matrix/gromacs.clang-8-cuda-10.1-release.gitlab-ci.yml
@@ -1,4 +1,4 @@
-# Test goal: old Clang with old CUDA
+# Test goal: old Clang as host compiler with old CUDA
 # Test intents (should change rarely and conservatively):
 #   OS: Ubuntu oldest supported
 #   GPU: CUDA oldest supported