Skip to content

Commit 52051f3

Browse files
committed
Ubuntu 18.04 EOL
Remove references to Ubuntu 18.04. Make edits to MPI def file examples, bumping to newer versions that compile without issue on Ubuntu 22.04 (gfortran 10).
1 parent b21e586 commit 52051f3

File tree

5 files changed

+13
-18
lines changed

5 files changed

+13
-18
lines changed

cloud_library.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ Here's a typical remote build command:
286286

287287
.. code::
288288
289-
$ singularity build --remote file-out.sif docker://ubuntu:18.04
289+
$ singularity build --remote file-out.sif docker://ubuntu:22.04
290290
291291
Building from a definition file:
292292
================================
@@ -296,7 +296,7 @@ This is our definition file. Let's call it ``ubuntu.def``:
296296
.. code:: singularity
297297
298298
bootstrap: library
299-
from: ubuntu:18.04
299+
from: ubuntu:22.04
300300
301301
%runscript
302302
echo "hello world from ubuntu container!"

encryption.rst

+3-4
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,9 @@ at runtime completely within kernel space.
2222

2323
.. note::
2424

25-
This feature utilizes the Linux ``dm-crypt`` library and
26-
``cryptsetup`` utility and requires cryptsetup version of >= 2.0.0.
27-
This version should be standard with recent Linux versions such as
28-
Ubuntu 18.04, Debian 10 and CentOS/RHEL 7, but users of older Linux
25+
This feature utilizes the Linux ``dm-crypt`` library and ``cryptsetup``
26+
utility and requires cryptsetup version of >= 2.0.0. This version should be
27+
standard with recent Linux versions such as, but users of older Linux
2928
versions may have to update.
3029

3130
**********************

gpu.rst

-4
Original file line numberDiff line numberDiff line change
@@ -433,10 +433,6 @@ you must ensure that:
433433
These requirements can be satisfied by following the requirements on the
434434
`ROCm web site <https://rocm.github.io/ROCmInstall.html>`__
435435

436-
At time of release, {Singularity} was tested successfully on Debian 10
437-
with ROCm 2.8/2.9 and the upstream kernel driver, and Ubuntu 18.04 with
438-
ROCm 2.9 and the DKMS driver.
439-
440436
Example - tensorflow-rocm
441437
=========================
442438

mpi.rst

+7-7
Original file line numberDiff line numberDiff line change
@@ -144,14 +144,14 @@ example can be used:
144144
.. code::
145145
146146
Bootstrap: docker
147-
From: ubuntu:18.04
147+
From: ubuntu:22.04
148148
149149
%files
150150
mpitest.c /opt
151151
152152
%environment
153153
# Point to MPICH binaries, libraries man pages
154-
export MPICH_DIR=/opt/mpich-3.3.2
154+
export MPICH_DIR=/opt/mpich-4.1.1
155155
export PATH="$MPICH_DIR/bin:$PATH"
156156
export LD_LIBRARY_PATH="$MPICH_DIR/lib:$LD_LIBRARY_PATH"
157157
export MANPATH=$MPICH_DIR/share/man:$MANPATH
@@ -162,7 +162,7 @@ example can be used:
162162
apt-get update && apt-get install -y wget git bash gcc gfortran g++ make
163163
164164
# Information about the version of MPICH to use
165-
export MPICH_VERSION=3.3.2
165+
export MPICH_VERSION=4.1.1
166166
export MPICH_URL="http://www.mpich.org/static/downloads/$MPICH_VERSION/mpich-$MPICH_VERSION.tar.gz"
167167
export MPICH_DIR=/opt/mpich
168168
@@ -200,7 +200,7 @@ If the host MPI is Open MPI, the definition file looks like:
200200
.. code::
201201
202202
Bootstrap: docker
203-
From: ubuntu:18.04
203+
From: ubuntu:22.04
204204
205205
%files
206206
mpitest.c /opt
@@ -214,11 +214,11 @@ If the host MPI is Open MPI, the definition file looks like:
214214
215215
%post
216216
echo "Installing required packages..."
217-
apt-get update && apt-get install -y wget git bash gcc gfortran g++ make file
217+
apt-get update && apt-get install -y wget git bash gcc gfortran g++ make file bzip2
218218
219219
echo "Installing Open MPI"
220220
export OMPI_DIR=/opt/ompi
221-
export OMPI_VERSION=4.0.5
221+
export OMPI_VERSION=4.1.5
222222
export OMPI_URL="https://download.open-mpi.org/release/open-mpi/v4.0/openmpi-$OMPI_VERSION.tar.bz2"
223223
mkdir -p /tmp/ompi
224224
mkdir -p /opt
@@ -342,7 +342,7 @@ program, which in this case has been compiled on the host to
342342
.. code::
343343
344344
Bootstrap: docker
345-
From: ubuntu:18.04
345+
From: ubuntu:22.04
346346
347347
%files
348348
/tmp/mpitest /opt/mpitest

networking.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ hostname within the container.
5151
.. code::
5252
5353
$ hostname
54-
ubuntu-bionic
54+
ubuntu
5555
5656
$ sudo singularity exec --hostname hal-9000 my_container.sif hostname
5757
hal-9000

0 commit comments

Comments
 (0)