Skip to content

Commit

Permalink
Remove direct installation of MUMPS
Browse files Browse the repository at this point in the history
  • Loading branch information
cpmech committed Dec 4, 2020
1 parent 3b860cb commit 36769be
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 221 deletions.
29 changes: 8 additions & 21 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM debian:sid
FROM ubuntu:20.04

# disable tzdata questions
ENV DEBIAN_FRONTEND=noninteractive
Expand All @@ -24,38 +24,27 @@ RUN apt-get update -y && apt-get install -y --no-install-recommends \

# required compilers and libraries for gosl
RUN apt-get update -y && apt-get install -y --no-install-recommends \
build-essential \
gcc \
gfortran \
libopenmpi-dev \
liblapacke-dev \
libopenblas-dev \
libmetis-dev \
libparmetis-dev \
libscotch-dev \
libptscotch-dev \
libatlas-base-dev \
libscalapack-mpi-dev \
libsuitesparse-dev \
libmumps-dev \
libfftw3-dev \
libfftw3-mpi-dev \
intel-mkl-full \
&& apt-get clean && rm -rf /var/lib/apt/lists/*

# copy scripts and patches
COPY zscripts /tmp/zscripts

# download the source code of MUMPS and compile it
RUN bash /tmp/zscripts/mumps/install-mumps.bash

# configure basic system
ARG INSTALL_ZSH="true"
ARG USERNAME="vscode"
ARG USER_UID="1000"
ARG USER_GID=$USER_UID
ARG UPGRADE_PACKAGES="true"
RUN bash /tmp/zscripts/microsoft/common-debian.sh "${INSTALL_ZSH}" "${USERNAME}" "${USER_UID}" "${USER_GID}" "${UPGRADE_PACKAGES}" \
&& apt-get clean -y && rm -rf /var/lib/apt/lists/*
COPY zscripts/microsoft/common-debian.sh /tmp/
RUN bash /tmp/common-debian.sh "${INSTALL_ZSH}" "${USERNAME}" "${USER_UID}" "${USER_GID}" "${UPGRADE_PACKAGES}" \
&& apt-get clean -y && rm -rf /var/lib/apt/lists/* && rm /tmp/common-debian.sh

# install Go tools
ARG GO_VERSION="latest"
Expand All @@ -64,8 +53,6 @@ ARG GOPATH="/go"
ARG UPDATE_RC="true"
ARG INSTALL_GO_TOOLS="true"
ENV GO111MODULE=auto
RUN bash /tmp/zscripts/microsoft/go-debian.sh "${GO_VERSION}" "${GOROOT}" "${GOPATH}" "${USERNAME}" "${UPDATE_RC}" "${INSTALL_GO_TOOLS}" \
&& apt-get clean -y

# clean up
RUN rm -rf /tmp/zscripts
COPY zscripts/microsoft/go-debian.sh /tmp/
RUN bash /tmp/go-debian.sh "${GO_VERSION}" "${GOROOT}" "${GOPATH}" "${USERNAME}" "${UPDATE_RC}" "${INSTALL_GO_TOOLS}" \
&& apt-get clean -y && rm /tmp/go-debian.sh
7 changes: 2 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,10 @@ sudo apt-get install -y --no-install-recommends \
liblapacke-dev \
libopenblas-dev \
libmetis-dev \
libparmetis-dev \
libscotch-dev \
libptscotch-dev \
libsuitesparse-dev \
libmumps-ptscotch-dev \
libmumps-dev \
libfftw3-dev \
libfftw3-mpi-dev
libfftw3-mpi-dev
```

**Download Gosl**
Expand Down
34 changes: 0 additions & 34 deletions zscripts/install-mumps-local.bash

This file was deleted.

33 changes: 0 additions & 33 deletions zscripts/mumps/install-mumps.bash

This file was deleted.

68 changes: 0 additions & 68 deletions zscripts/mumps/patch/Makefile.inc

This file was deleted.

27 changes: 0 additions & 27 deletions zscripts/mumps/patch/PORD/lib/Makefile.diff

This file was deleted.

33 changes: 0 additions & 33 deletions zscripts/mumps/patch/src/Makefile.diff

This file was deleted.

0 comments on commit 36769be

Please sign in to comment.