Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-09-16 17:22:55 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity

experimental changes to dockerfile and gitlab ci configurations

Browse Source
This commit is contained in:
Li-Ta Lo 2021-01-05 09:47:27 -07:00
parent fac489644f
commit f00aececb0
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitlab/ci/config/initial_config.cmake
View File

@ -76,6 +76,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 "")

4
.gitlab/ci/docker/ubuntu1804/base/Dockerfile
View File

@ -12,12 +12,14 @@ 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-9.2
RUN add-apt-repository ppa:jonathonf/gcc
RUN apt-get update && apt-get install -y --no-install-recommends \
clang-8 \
g++-9 \

2
.gitlab/ci/ubuntu1804.yml
View File

@ -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: