Skip to content

Commit a4f7cbe

Browse files
authored
Docker recipe for installation & fix docker (#422)
* Docker recipe to install ior with various backends. #421 * Test recipe for ubuntu22.04
1 parent 6f55591 commit a4f7cbe

File tree

4 files changed

+23
-12
lines changed

4 files changed

+23
-12
lines changed

testing/docker/ubuntu14.04/Dockerfile

-7
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
FROM ubuntu:22.04
2+
3+
WORKDIR /data
4+
RUN apt-get update
5+
RUN apt-get install -y libopenmpi-dev openmpi-bin libhdf5-openmpi-dev git pkg-config gcc libaio-dev libpnetcdf-dev
6+
RUN apt-get install -y sudo make
7+
RUN git clone https://github.com/hpc/ior.git
8+
RUN cd ior ; ./bootstrap
9+
RUN cd ior ; ./configure --with-aio --with-hdf5 --with-ncmpi LDFLAGS=-L/usr/lib/x86_64-linux-gnu/hdf5/openmpi CFLAGS=-I/usr/include/hdf5/openmpi && make -j
10+
11+
# librados-dev

testing/docker/ubuntu22.04/Dockerfile

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
FROM ubuntu:22.04
2+
3+
WORKDIR /data
4+
RUN apt-get update
5+
RUN apt-get install -y libopenmpi-dev openmpi-bin libhdf5-openmpi-dev git pkg-config gcc libaio-dev libpnetcdf-dev
6+
RUN apt-get install -y sudo

testing/docker/ubuntu14.04/run-test.sh testing/docker/ubuntu22.04/run-test.sh

+6-5
Original file line numberDiff line numberDiff line change
@@ -3,31 +3,32 @@
33
BUILD="$1"
44
groupadd -g $3 testuser
55
useradd -r -u $2 -g testuser testuser
6-
76
ERROR=0
87

98
function runTest(){
109
FLAVOR="$1"
1110
MPI_DIR="$2"
11+
export IOR_MPIRUN="$3"
1212
echo $FLAVOR in $BUILD/$FLAVOR
1313
update-alternatives --set mpi $MPI_DIR
1414
sudo -u testuser mkdir -p $BUILD/$FLAVOR
1515

1616
pushd $BUILD/$FLAVOR > /dev/null
17-
sudo -u testuser /data/configure --with-hdf5 CFLAGS=-I/usr/lib/x86_64-linux-gnu/hdf5/openmpi/include LDFLAGS=-L/usr/lib/x86_64-linux-gnu/hdf5/openmpi/lib|| exit 1
18-
sudo -u testuser make V=1 || exit 1
17+
sudo -u testuser /data/configure || exit 1
18+
sudo -u testuser make || exit 1
1919

2020
#define the alias
2121
ln -sf $(which mpiexec.$FLAVOR) /usr/bin/mpiexec
2222

2323
cd /data/
24+
2425
sudo -u testuser IOR_BIN_DIR=$BUILD/$FLAVOR/src IOR_OUT=$BUILD/$FLAVOR/test ./testing/basic-tests.sh
2526

2627
ERROR=$(($ERROR + $?))
2728
popd > /dev/null
2829
}
2930

30-
runTest openmpi /usr/lib/openmpi/include
31-
runTest mpich /usr/include/mpich
31+
export MPI_ARGS=""
32+
runTest openmpi /usr/lib/openmpi/include "mpiexec -n"
3233

3334
exit $ERROR

0 commit comments

Comments
 (0)