Merge branch 'mguth-pytorch' into 'master'

Adding pytorch image in master build

See merge request atlas-flavor-tagging-tools/algorithms/umami!146

.gitlab-ci.yml

@@ -2,6 +2,7 @@
 # https://pypi.org/project/tensorflow/#history
 variables:
   TFTAG: 2.5.0
+  TORCHTAG: 1.9.0-cuda11.1-cudnn8-runtime
 
 stages:
   - linting
@@ -34,7 +35,7 @@ test_coverage:
   stage: coverage_test_stage
   image: python:3.7-slim
   script:
-    - pip install --upgrade pip
+    - pip install --upgrade pip setuptools wheel
     - pip install -r requirements.txt
     - cd ./coverage_files/
     - coverage combine
@@ -49,6 +50,7 @@ test_coverage:
       - coverage_files/
     reports:
       cobertura: coverage_files/coverage.xml
+  retry: 2
 
 include:
   - 'pipelines/.unit_test-gitlab-ci.yaml'

pipelines/.docker-gitlab-ci.yaml

 # ----------------------------------------------------------------------------
-# Umami base + Umami images: only get built on master
-#                            (see below for tags)
+# Umami base + Umami images: only get built on master and tags
 # ----------------------------------------------------------------------------
 
 .image_build_template: &image_build_template
@@ -9,6 +8,7 @@
     - ignore
   tags:
     - docker-image-build
+  retry: 2
 
 
 build_umamibase_cpu:
@@ -37,6 +37,17 @@ build_umamibase_gpu:
       variables:
         TO: '${CI_REGISTRY}/${CI_PROJECT_NAMESPACE}/umami/umamibase:$CI_COMMIT_REF_SLUG-gpu'
 
+build_umamibase_gpu_pytorch:
+  <<: *image_build_template
+  stage: builds
+  variables:
+    DOCKER_FILE: docker/umamibase/Dockerfile
+    FROM: pytorch/pytorch:$TORCHTAG
+    TO: '${CI_REGISTRY}/${CI_PROJECT_NAMESPACE}/umami/umamibase:latest-pytorch-gpu'
+  rules:
+    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
+
+
 # Umami images: use base image as a foundation to speed up build process
 build_umami_cpu:
   <<: *image_build_template

pipelines/.integration_test-gitlab-ci.yaml

@@ -9,6 +9,7 @@
         IMAGE_TYPE: "umamibase:latest"
     - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $CI_PROJECT_PATH=="atlas-flavor-tagging-tools/algorithms/umami"
   image: '${CI_REGISTRY}/${CI_PROJECT_NAMESPACE}/umami/$IMAGE_TYPE'
+  retry: 2
 
 .artifact_template: &artifact_template
   name: "$CI_JOB_NAME"

pipelines/.unit_test-gitlab-ci.yaml

@@ -33,6 +33,7 @@ unittest:
       - coverage_files/
     reports:
       junit: report.xml
+  retry: 2
 
 unittest_preprocessing:
   <<: *unittest_template