biod.pnpi.spb.ru / alexxy / gromacs.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 63e96b8)
Update regular CI images to OneAPI 2021.3.0
authorAndrey Alekseenko <al42and@gmail.com>
Fri, 13 Aug 2021 17:59:44 +0000 (20:59 +0300)
committerArtem Zhmurov <zhmurov@gmail.com>
Mon, 16 Aug 2021 09:44:07 +0000 (09:44 +0000)
admin/containers/buildall.sh patch | blob | history
admin/gitlab-ci/gromacs.matrix.gitlab-ci.yml patch | blob | history
admin/gitlab-ci/gromacs.matrix/gromacs.oneapi-2021.3.0-opencl-release.gitlab-ci.yml [moved from admin/gitlab-ci/gromacs.matrix/gromacs.oneapi-2021.1.1-opencl-release.gitlab-ci.yml with 80% similarity] patch | blob | history
admin/gitlab-ci/gromacs.matrix/gromacs.oneapi-2021.3.0-opencl.gitlab-ci.yml [moved from admin/gitlab-ci/gromacs.matrix/gromacs.oneapi-2021.1.1-opencl.gitlab-ci.yml with 79% similarity] patch | blob | history
admin/gitlab-ci/gromacs.matrix/gromacs.oneapi-2021.3.0-sycl.gitlab-ci.yml [moved from admin/gitlab-ci/gromacs.matrix/gromacs.oneapi-2021.1.1-sycl.gitlab-ci.yml with 80% similarity] patch | blob | history

diff --git a/admin/containers/buildall.sh b/admin/containers/buildall.sh
index 7e2829ff6f8e462a74bce2da9b9224be326cfbbb..9fb753345069e1082c10e87bda0615c298b4b677 100755 (executable)
--- a/admin/containers/buildall.sh
+++ b/admin/containers/buildall.sh
@@ -15,7 +15,7 @@ args[${#args[@]}]="--gcc 7 --cuda 11.0 --clfft --mpi openmpi"
 args[${#args[@]}]="--llvm 11 --tsan"
 args[${#args[@]}]="--llvm 8 --cuda 11.0 --clfft --mpi openmpi"
 args[${#args[@]}]="--llvm 12 --clfft --mpi openmpi --rocm"
-args[${#args[@]}]="--oneapi 2021.1.1"
+args[${#args[@]}]="--oneapi 2021.3.0"
 args[${#args[@]}]="--oneapi 2021.2.0 --intel-compute-runtime 21.21.19914"
 args[${#args[@]}]="--llvm --doxygen --mpi openmpi --venvs 3.7.7"
 args[${#args[@]}]="--llvm 11 --cuda 11.4.0 --hipsycl 0bf6420aab18 --rocm 4.2"
diff --git a/admin/gitlab-ci/gromacs.matrix.gitlab-ci.yml b/admin/gitlab-ci/gromacs.matrix.gitlab-ci.yml
index 3342760db0fce14ec057266a0b4e395981ac7260..e62aa4e200db1ae94e8da8e2a96bf410085b0329 100644 (file)
--- a/admin/gitlab-ci/gromacs.matrix.gitlab-ci.yml
+++ b/admin/gitlab-ci/gromacs.matrix.gitlab-ci.yml
@@ -274,8 +274,8 @@ include:
   - local: '/admin/gitlab-ci/gromacs.matrix/gromacs.gcc-10-cuda-11.4-release.gitlab-ci.yml'
   - local: '/admin/gitlab-ci/gromacs.matrix/gromacs.gcc-11-release.gitlab-ci.yml'
   - local: '/admin/gitlab-ci/gromacs.matrix/gromacs.hipsycl-dev.gitlab-ci.yml'
-  - local: '/admin/gitlab-ci/gromacs.matrix/gromacs.oneapi-2021.1.1-opencl.gitlab-ci.yml'
-  - local: '/admin/gitlab-ci/gromacs.matrix/gromacs.oneapi-2021.1.1-opencl-release.gitlab-ci.yml'
-  - local: '/admin/gitlab-ci/gromacs.matrix/gromacs.oneapi-2021.1.1-sycl.gitlab-ci.yml'
+  - local: '/admin/gitlab-ci/gromacs.matrix/gromacs.oneapi-2021.3.0-opencl.gitlab-ci.yml'
+  - local: '/admin/gitlab-ci/gromacs.matrix/gromacs.oneapi-2021.3.0-opencl-release.gitlab-ci.yml'
+  - local: '/admin/gitlab-ci/gromacs.matrix/gromacs.oneapi-2021.3.0-sycl.gitlab-ci.yml'
   - local: '/admin/gitlab-ci/gromacs.matrix/gromacs.oneapi-2021.2.0-sycl-nightly.gitlab-ci.yml'
 
diff --git a/admin/gitlab-ci/gromacs.matrix/gromacs.oneapi-2021.1.1-opencl-release.gitlab-ci.yml b/admin/gitlab-ci/gromacs.matrix/gromacs.oneapi-2021.3.0-opencl-release.gitlab-ci.yml
similarity index 80%
rename from admin/gitlab-ci/gromacs.matrix/gromacs.oneapi-2021.1.1-opencl-release.gitlab-ci.yml
rename to admin/gitlab-ci/gromacs.matrix/gromacs.oneapi-2021.3.0-opencl-release.gitlab-ci.yml
index 16021232307032de6631df46ec3276772a53b1b9..0f88c06caf264ada6450018bcc99ef67c5c5aa1a 100644 (file)
--- a/admin/gitlab-ci/gromacs.matrix/gromacs.oneapi-2021.1.1-opencl-release.gitlab-ci.yml
+++ b/admin/gitlab-ci/gromacs.matrix/gromacs.oneapi-2021.3.0-opencl-release.gitlab-ci.yml
@@ -14,19 +14,19 @@
 #   Parallelism nt/ntomp: 4/2 (unit tests)
 #   Parallelism nt/ntomp: 2/1 (regression tests)
 
-gromacs:oneapi-2021.1.1-opencl:release:configure:
+gromacs:oneapi-2021.3.0-opencl:release:configure:
   extends:
    - .gromacs:base:release:configure
    - .use-oneapi:base
    - .use-opencl
    - .rules:nightly-only-for-release
-  image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-20.04-gcc-7-oneapi-2021.1.1
+  image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-20.04-gcc-7-oneapi-2021.3.0
   variables:
     CMAKE: /usr/local/cmake-3.17.2/bin/cmake
     COMPILER_MAJOR_VERSION: 2021
     RELEASE_BUILD_DIR: release-builds-oneapi
 
-gromacs:oneapi-2021.1.1-opencl:release:build:
+gromacs:oneapi-2021.3.0-opencl:release:build:
   extends:
     - .variables:default
     - .gromacs:base:build
@@ -39,31 +39,31 @@ gromacs:oneapi-2021.1.1-opencl:release:build:
     CMAKE: /usr/local/cmake-3.17.2/bin/cmake
     BUILD_DIR: release-builds-oneapi
     COMPILER_MAJOR_VERSION: 2021
-  image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-20.04-gcc-7-oneapi-2021.1.1
+  image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-20.04-gcc-7-oneapi-2021.3.0
   needs:
-    - job: gromacs:oneapi-2021.1.1-opencl:release:configure
+    - job: gromacs:oneapi-2021.3.0-opencl:release:configure
 
-gromacs:oneapi-2021.1.1-opencl:release:test:
+gromacs:oneapi-2021.3.0-opencl:release:test:
   extends:
     - .gromacs:base:test
     - .use-oneapi:base
     - .rules:nightly-only-for-release
   stage: release-tests
-  image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-20.04-gcc-7-oneapi-2021.1.1
+  image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-20.04-gcc-7-oneapi-2021.3.0
   variables:
     CMAKE: /usr/local/cmake-3.17.2/bin/cmake
     BUILD_DIR: release-builds-oneapi
   needs:
-    - job: gromacs:oneapi-2021.1.1-opencl:release:configure
-    - job: gromacs:oneapi-2021.1.1-opencl:release:build
+    - job: gromacs:oneapi-2021.3.0-opencl:release:configure
+    - job: gromacs:oneapi-2021.3.0-opencl:release:build
 
-gromacs:oneapi-2021.1.1-opencl:release:regressiontest:
+gromacs:oneapi-2021.3.0-opencl:release:regressiontest:
   extends:
     - .gromacs:base:regressiontest
     - .use-oneapi:base
     - .rules:nightly-only-for-release
   stage: release-tests
-  image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-20.04-gcc-7-oneapi-2021.1.1
+  image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-20.04-gcc-7-oneapi-2021.3.0
   variables:
     CMAKE: /usr/local/cmake-3.17.2/bin/cmake
     BUILD_DIR: release-builds-oneapi
@@ -71,5 +71,5 @@ gromacs:oneapi-2021.1.1-opencl:release:regressiontest:
     REGRESSIONTEST_TOTAL_RANK_NUMBER: 2
     REGRESSIONTEST_OMP_RANK_NUMBER: 1
   needs:
-    - job: gromacs:oneapi-2021.1.1-opencl:release:build
+    - job: gromacs:oneapi-2021.3.0-opencl:release:build
     - job: regressiontests:package
diff --git a/admin/gitlab-ci/gromacs.matrix/gromacs.oneapi-2021.1.1-opencl.gitlab-ci.yml b/admin/gitlab-ci/gromacs.matrix/gromacs.oneapi-2021.3.0-opencl.gitlab-ci.yml
similarity index 79%
rename from admin/gitlab-ci/gromacs.matrix/gromacs.oneapi-2021.1.1-opencl.gitlab-ci.yml
rename to admin/gitlab-ci/gromacs.matrix/gromacs.oneapi-2021.3.0-opencl.gitlab-ci.yml
index 78d5bd2b248641c740dac251c074fe30553ed936..3549af80253f4150804381aabaa2cd8e4f4a3206 100644 (file)
--- a/admin/gitlab-ci/gromacs.matrix/gromacs.oneapi-2021.1.1-opencl.gitlab-ci.yml
+++ b/admin/gitlab-ci/gromacs.matrix/gromacs.oneapi-2021.3.0-opencl.gitlab-ci.yml
@@ -13,50 +13,50 @@
 #   SIMD: AVX2_256
 #   Parallelism nt/ntomp: 4/2
 
-gromacs:oneapi-2021.1.1-opencl:configure:
+gromacs:oneapi-2021.3.0-opencl:configure:
   extends:
    - .gromacs:base:configure
    - .use-oneapi:base
    - .use-opencl
    - .rules:merge-requests
-  image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-20.04-gcc-7-oneapi-2021.1.1
+  image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-20.04-gcc-7-oneapi-2021.3.0
   variables:
     CMAKE: /usr/local/cmake-3.17.2/bin/cmake
     COMPILER_MAJOR_VERSION: 2021
 
-gromacs:oneapi-2021.1.1-opencl:build:
+gromacs:oneapi-2021.3.0-opencl:build:
   extends:
     - .variables:default
     - .gromacs:base:build
     - .use-ccache
     - .use-oneapi:base
     - .rules:merge-requests
-  image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-20.04-gcc-7-oneapi-2021.1.1
+  image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-20.04-gcc-7-oneapi-2021.3.0
   variables:
     CMAKE: /usr/local/cmake-3.17.2/bin/cmake
   needs:
-    - job: gromacs:oneapi-2021.1.1-opencl:configure
+    - job: gromacs:oneapi-2021.3.0-opencl:configure
 
-gromacs:oneapi-2021.1.1-opencl:test:
+gromacs:oneapi-2021.3.0-opencl:test:
   extends:
     - .gromacs:base:test
     - .use-oneapi:base
     - .rules:merge-requests
-  image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-20.04-gcc-7-oneapi-2021.1.1
+  image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-20.04-gcc-7-oneapi-2021.3.0
   variables:
     CMAKE: /usr/local/cmake-3.17.2/bin/cmake
   needs:
-    - job: gromacs:oneapi-2021.1.1-opencl:build
+    - job: gromacs:oneapi-2021.3.0-opencl:build
 
-gromacs:oneapi-2021.1.1-opencl:regressiontest:
+gromacs:oneapi-2021.3.0-opencl:regressiontest:
   extends:
     - .gromacs:base:regressiontest
     - .use-oneapi:base
     - .rules:merge-requests
-  image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-20.04-gcc-7-oneapi-2021.1.1
+  image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-20.04-gcc-7-oneapi-2021.3.0
   variables:
     CMAKE: /usr/local/cmake-3.17.2/bin/cmake
   needs:
-    - job: gromacs:oneapi-2021.1.1-opencl:build
+    - job: gromacs:oneapi-2021.3.0-opencl:build
     - job: regressiontests:prepare
 
diff --git a/admin/gitlab-ci/gromacs.matrix/gromacs.oneapi-2021.1.1-sycl.gitlab-ci.yml b/admin/gitlab-ci/gromacs.matrix/gromacs.oneapi-2021.3.0-sycl.gitlab-ci.yml
similarity index 80%
rename from admin/gitlab-ci/gromacs.matrix/gromacs.oneapi-2021.1.1-sycl.gitlab-ci.yml
rename to admin/gitlab-ci/gromacs.matrix/gromacs.oneapi-2021.3.0-sycl.gitlab-ci.yml
index b2f4024ff74e77f62399bcbfae3f229606102e9f..1cc18947432b1132a89359b41d95cc694c46c7e2 100644 (file)
--- a/admin/gitlab-ci/gromacs.matrix/gromacs.oneapi-2021.1.1-sycl.gitlab-ci.yml
+++ b/admin/gitlab-ci/gromacs.matrix/gromacs.oneapi-2021.3.0-sycl.gitlab-ci.yml
@@ -13,50 +13,50 @@
 #   SIMD: AVX2_256
 #   Parallelism nt/ntomp: 4/2
 
-gromacs:oneapi-2021.1.1-sycl:configure:
+gromacs:oneapi-2021.3.0-sycl:configure:
   extends:
    - .gromacs:base:configure
    - .use-oneapi:base
    - .use-sycl
    - .rules:merge-and-post-merge-acceptance
-  image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-20.04-gcc-7-oneapi-2021.1.1
+  image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-20.04-gcc-7-oneapi-2021.3.0
   variables:
     CMAKE: /usr/local/cmake-3.17.2/bin/cmake
     COMPILER_MAJOR_VERSION: 2021
 
-gromacs:oneapi-2021.1.1-sycl:build:
+gromacs:oneapi-2021.3.0-sycl:build:
   extends:
     - .variables:default
     - .gromacs:base:build
     - .use-ccache
     - .use-oneapi:base
     - .rules:merge-and-post-merge-acceptance
-  image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-20.04-gcc-7-oneapi-2021.1.1
+  image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-20.04-gcc-7-oneapi-2021.3.0
   variables:
     CMAKE: /usr/local/cmake-3.17.2/bin/cmake
   needs:
-    - job: gromacs:oneapi-2021.1.1-sycl:configure
+    - job: gromacs:oneapi-2021.3.0-sycl:configure
 
-gromacs:oneapi-2021.1.1-sycl:test:
+gromacs:oneapi-2021.3.0-sycl:test:
   extends:
     - .gromacs:base:test
     - .use-oneapi:base
     - .rules:post-merge-acceptance
-  image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-20.04-gcc-7-oneapi-2021.1.1
+  image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-20.04-gcc-7-oneapi-2021.3.0
   variables:
     CMAKE: /usr/local/cmake-3.17.2/bin/cmake
   needs:
-    - job: gromacs:oneapi-2021.1.1-sycl:build
+    - job: gromacs:oneapi-2021.3.0-sycl:build
 
-gromacs:oneapi-2021.1.1-sycl:regressiontest:
+gromacs:oneapi-2021.3.0-sycl:regressiontest:
   extends:
     - .gromacs:base:regressiontest
     - .use-oneapi:base
     - .rules:post-merge-acceptance
-  image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-20.04-gcc-7-oneapi-2021.1.1
+  image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-20.04-gcc-7-oneapi-2021.3.0
   variables:
     CMAKE: /usr/local/cmake-3.17.2/bin/cmake
   needs:
-    - job: gromacs:oneapi-2021.1.1-sycl:build
+    - job: gromacs:oneapi-2021.3.0-sycl:build
     - job: regressiontests:prepare
 
Local GROMACS mirror with custom stuff