Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-10-05 01:49:02 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity

ci: add make and pkg-config to recent imgs

Browse Source
This commit is contained in:
Vicente Adolfo Bolea Sanchez 2023-09-06 18:37:51 -04:00
parent 1cd6be01c2
commit b555b228be
10 changed files with 45 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
.gitlab-ci.yml
View File

@ -30,7 +30,7 @@
- .docker_image
.ubuntu1604: &ubuntu1604
image: "kitware/vtkm:ci-ubuntu1604-20201016"
image: "kitware/vtkm:ci-ubuntu1604-20230906"
extends:
- .docker_image
@ -40,32 +40,32 @@
- .docker_image
.ubuntu1804: &ubuntu1804
image: "kitware/vtkm:ci-ubuntu1804-20210107"
image: "kitware/vtkm:ci-ubuntu1804-20230906"
extends:
- .docker_image
.ubuntu1804_cuda: &ubuntu1804_cuda
image: "kitware/vtkm:ci-ubuntu1804_cuda11-20220919"
image: "kitware/vtkm:ci-ubuntu1804_cuda11-20230906"
extends:
- .docker_image
.ubuntu1804_cuda_kokkos: &ubuntu1804_cuda_kokkos
image: "kitware/vtkm:ci-ubuntu1804_cuda11_kokkos-20230125"
image: "kitware/vtkm:ci-ubuntu1804_cuda11_kokkos-20230906"
extends:
- .docker_image
.ubuntu2004_doxygen: &ubuntu2004_doxygen
image: "kitware/vtkm:ci-doxygen-20201016"
image: "kitware/vtkm:ci-doxygen-20230906"
extends:
- .docker_image
.ubuntu2004: &ubuntu2004
image: "kitware/vtkm:ci-ubuntu2004-20220623"
image: "kitware/vtkm:ci-ubuntu2004-20230906"
extends:
- .docker_image
.ubuntu2004_kokkos: &ubuntu2004_kokkos
image: "kitware/vtkm:ci-ubuntu2004_kokkos-20230829"
image: "kitware/vtkm:ci-ubuntu2004_kokkos-20230906"
extends:
- .docker_image

3
.gitlab/ci/docker/ubuntu1604/base/Dockerfile
View File

@ -11,7 +11,7 @@
##=============================================================================
FROM ubuntu:16.04
LABEL maintainer "Robert Maynard<robert.maynard@kitware.com>"
LABEL maintainer "Vicente Adolfo Bolea Sanchez<vicente.bolea@gmail.com>"
# Base dependencies for building VTK-m projects
RUN apt-get update && apt-get install -y --no-install-recommends \
@ -26,6 +26,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
libtbb-dev \
make \
ninja-build \
pkg-config \
software-properties-common \
ssh

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

@ -11,7 +11,7 @@
##=============================================================================
FROM ubuntu:18.04
LABEL maintainer "Robert Maynard<robert.maynard@kitware.com>"
LABEL maintainer "Vicente Adolfo Bolea Sanchez<vicente.bolea@gmail.com>"
# Base dependencies for building VTK-m projects
RUN apt-get update && apt-get install -y --no-install-recommends \
@ -25,8 +25,10 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
libomp-dev \
libtbb-dev \
libhdf5-dev \
make \
mpich \
ninja-build \
pkg-config \
software-properties-common
# extra dependencies for charm machine

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

@ -11,7 +11,7 @@
##=============================================================================
FROM nvidia/cuda:11.7.1-devel-ubuntu18.04
LABEL maintainer "Vicente Adolfo Bolea Sanchez <vicente.bolea@kitware.com>"
LABEL maintainer "Vicente Adolfo Bolea Sanchez<vicente.bolea@gmail.com>"
# Base dependencies for building VTK-m projects
RUN apt-get update && apt-get install -y --no-install-recommends \
@ -22,8 +22,10 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
libmpich-dev \
libomp-dev \
libtbb-dev \
make \
mpich \
ninja-build \
pkg-config \
python3 \
python3-scipy \
&& \

6
.gitlab/ci/docker/ubuntu1804/kokkos-cuda/Dockerfile
View File

@ -10,8 +10,8 @@
##
##=============================================================================
FROM nvidia/cuda:11.6.1-devel-ubuntu18.04
LABEL maintainer "Vicente Adolfo Bolea Sanchez<vicente.bolea@kitware.com>"
FROM nvidia/cuda:11.6.2-devel-ubuntu18.04
LABEL maintainer "Vicente Adolfo Bolea Sanchez<vicente.bolea@gmail.com>"
# Base dependencies for building VTK-m projects
RUN apt-get update && apt-get install -y --no-install-recommends \
@ -19,7 +19,9 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
g++ \
git \
git-lfs \
make \
ninja-build \
pkg-config \
&& \
rm -rf /var/lib/apt/lists/*

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

@ -11,7 +11,7 @@
##=============================================================================
FROM ubuntu:20.04
LABEL maintainer "Vicente Adolfo Bolea Sanchez<vicente.bolea@kitware.com>"
LABEL maintainer "Vicente Adolfo Bolea Sanchez<vicente.bolea@gmail.com>"
ENV TZ=America/New_York
@ -26,8 +26,10 @@ RUN apt update && DEBIAN_FRONTEND="noninteractive" apt install -y --no-install-r
libomp-dev \
libtbb-dev \
libhdf5-dev \
make \
mpich \
ninja-build \
pkg-config \
python \
python3-scipy \
software-properties-common && \

2
.gitlab/ci/docker/ubuntu2004/doxygen/Dockerfile
View File

@ -11,7 +11,7 @@
##=============================================================================
FROM ubuntu:20.04
LABEL maintainer "Robert Maynard<robert.maynard@kitware.com>"
LABEL maintainer "Vicente Adolfo Bolea Sanchez<vicente.bolea@gmail.com>"
# Base dependencies for building VTK-m projects
RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \

4
.gitlab/ci/docker/ubuntu2004/kokkos-hip/Dockerfile
View File

@ -11,7 +11,7 @@
##=============================================================================
FROM rocm/dev-ubuntu-20.04
LABEL maintainer "Vicente Adolfo Bolea Sanchez<vicente.bolea@kitware.com>"
LABEL maintainer "Vicente Adolfo Bolea Sanchez<vicente.bolea@gmail.com>"
# Base dependencies for building VTK-m projects
RUN apt update && \
@ -22,8 +22,10 @@ RUN apt update && \
git-lfs \
libmpich-dev \
libomp-dev \
make \
mpich \
ninja-build \
pkg-config \
rsync \
ssh \
rocthrust-dev \

4
.gitlab/ci/docker/ubuntu2004/kokkos/Dockerfile
View File

@ -11,7 +11,7 @@
##=============================================================================
FROM ubuntu:20.04
LABEL maintainer "Sujin Philip<sujin.philip@kitware.com>"
LABEL maintainer "Vicente Adolfo Bolea Sanchez<vicente.bolea@gmail.com>"
# Base dependencies for building VTK-m projects
RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
@ -22,8 +22,10 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-ins
git-lfs \
libmpich-dev \
libomp-dev \
make \
mpich \
ninja-build \
pkg-config \
rsync \
ssh \
software-properties-common

20
.gitlab/ci/docker/update_all.sh
View File

@ -16,7 +16,7 @@ set -e
set -x
# data is expected to be a string of the form YYYYMMDD
readonly date="$1"
readonly date="$(date +%Y%m%d)"
cd centos7/cuda10.2
sudo docker build -t kitware/vtkm:ci-centos7_cuda10.2-$date .
@ -30,6 +30,10 @@ cd rhel8/cuda10.2
sudo docker build -t kitware/vtkm:ci-rhel8_cuda10.2-$date .
cd ../..
cd opensuse
sudo docker build -t kitware/vtkm:ci-opensuse-$date .
cd ..
cd ubuntu1604/base
sudo docker build -t kitware/vtkm:ci-ubuntu1604-$date .
cd ../..
@ -42,7 +46,7 @@ cd ubuntu1804/base
sudo docker build -t kitware/vtkm:ci-ubuntu1804-$date .
cd ../..
cd ubuntu1804/cuda11.1
cd ubuntu1804/cuda
sudo docker build -t kitware/vtkm:ci-ubuntu1804_cuda11.1-$date .
cd ../..
@ -50,6 +54,10 @@ cd ubuntu1804/kokkos-cuda
sudo docker build -t kitware/vtkm:ci-ubuntu1804_cuda11_kokkos-$date .
cd ../..
cd ubuntu2004/base/
sudo docker build -t kitware/vtkm:ci-ubuntu2004-$date .
cd ../..
cd ubuntu2004/doxygen/
sudo docker build -t kitware/vtkm:ci-doxygen-$date .
cd ../..
@ -58,6 +66,10 @@ cd ubuntu2004/kokkos
sudo docker build -t kitware/vtkm:ci-ubuntu2004_kokkos-$date .
cd ../..
cd ubuntu2004/kokkos-hip
sudo docker build -t kitware/vtkm:ci-ubuntu2004_hip_kokkos-$date .
cd ../..
# sudo docker login --username=<docker_hub_name>
sudo docker push kitware/vtkm
sudo docker system prune
# sudo docker push kitware/vtkm
# sudo docker system prune