Merge topic 'add_hdf5_to_ubuntu_1804_base_image'

7c94ebf2e Add HDF5 to Ubuntu 18.04/base image

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2378

.gitlab-ci.yml

@@ -32,6 +32,7 @@
 #     - tbb
 #     - openmp
 #     - mpich2
+#     - hdf5
 #   * .gitlab/ci/docker/ubuntu1804/cuda11.1/
 #     - cuda
 #     - gcc 7
@@ -75,7 +76,7 @@
     - .docker_image
 
 .ubuntu1804: &ubuntu1804
-  image: "kitware/vtkm:ci-ubuntu1804-20201016"
+  image: "kitware/vtkm:ci-ubuntu1804-20210107"
   extends:
     - .docker_image
 

.gitlab/ci/config/initial_config.cmake

@@ -80,6 +80,9 @@ foreach(option IN LISTS options)
   elseif(kokkos STREQUAL option)
     set(VTKm_ENABLE_KOKKOS "ON" CACHE STRING "")
 
+  elseif(hdf5 STREQUAL option)
+    set(VTKm_ENABLE_HDF5_IO "ON" CACHE STRING "")
+
   elseif(maxwell STREQUAL option)
     set(VTKm_CUDA_Architecture "maxwell" CACHE STRING "")
 

.gitlab/ci/docker/ubuntu1804/base/Dockerfile

@@ -12,12 +12,13 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
       libmpich-dev \
       libomp-dev \
       libtbb-dev \
+      libhdf5-dev \
       mpich \
       ninja-build \
       software-properties-common
 
 # extra dependencies for charm machine
-RUN add-apt-repository ppa:jonathonf/gcc-9.2
+RUN add-apt-repository ppa:jonathonf/gcc
 RUN apt-get update && apt-get install -y --no-install-recommends \
       clang-8 \
       g++-9 \

.gitlab/ci/ubuntu1804.yml

@@ -16,7 +16,7 @@ build:ubuntu1804_gcc9:
     CC: "gcc-9"
     CXX: "g++-9"
     CMAKE_BUILD_TYPE: Debug
-    VTKM_SETTINGS: "tbb+openmp+mpi+shared"
+    VTKM_SETTINGS: "tbb+openmp+mpi+shared+hdf5"
 
 test:ubuntu1804_gcc9:
   tags: