From 04abda3bfddc08d8bdb3a7552f9302007871f4bb Mon Sep 17 00:00:00 2001 From: Greg Lin Date: Thu, 13 Jun 2019 16:06:33 -0500 Subject: [PATCH 1/3] Use shared BLAS on CentOS and openSUSE Note: --enable-BLAS-shlib is already used by default --- builder/Dockerfile.centos-6 | 4 ---- builder/Dockerfile.centos-7 | 4 ---- builder/Dockerfile.opensuse-15 | 5 ----- builder/Dockerfile.opensuse-42 | 5 ----- 4 files changed, 18 deletions(-) diff --git a/builder/Dockerfile.centos-6 b/builder/Dockerfile.centos-6 index c59d9ab..e49d4c1 100644 --- a/builder/Dockerfile.centos-6 +++ b/builder/Dockerfile.centos-6 @@ -4,8 +4,6 @@ ENV OS_IDENTIFIER centos-6 RUN yum -y update \ && yum -y install \ - atlas-devel \ - blas-devel \ bzip2-devel \ cairo-devel \ gcc-c++ \ @@ -16,7 +14,6 @@ RUN yum -y update \ java-1.8.0-openjdk-devel \ krb5-devel \ krb5-libs \ - lapack-devel \ libICE-devel \ libSM-devel \ libX11-devel \ @@ -184,7 +181,6 @@ ENV CONFIGURE_OPTIONS="\ --with-system-valgrind-headers \ --with-tcl-config=/usr/lib64/tclConfig.sh \ --with-tk-config=/usr/lib64/tkConfig.sh \ - --enable-BLAS-shlib \ --enable-prebuilt-html" # RHEL 6 doesn't have texi2any, so use makeinfo. diff --git a/builder/Dockerfile.centos-7 b/builder/Dockerfile.centos-7 index 3644d9c..8bae7a8 100644 --- a/builder/Dockerfile.centos-7 +++ b/builder/Dockerfile.centos-7 @@ -4,10 +4,8 @@ ENV OS_IDENTIFIER centos-7 RUN yum -y update \ && yum -y install \ - atlas-devel \ autoconf \ automake \ - blas-devel \ bzip2-devel \ cairo-devel \ gcc-c++ \ @@ -15,7 +13,6 @@ RUN yum -y update \ gcc-objc \ java-1.8.0-openjdk-devel \ java-1.8.0-openjdk-headless \ - lapack-devel \ libICE-devel \ libSM-devel \ libX11-devel \ @@ -64,7 +61,6 @@ ENV CONFIGURE_OPTIONS="\ --with-system-valgrind-headers \ --with-tcl-config=/usr/lib64/tclConfig.sh \ --with-tk-config=/usr/lib64/tkConfig.sh \ - --enable-BLAS-shlib \ --enable-prebuilt-html" # RHEL 7 doesn't have the inconsolata font, so override the defaults. diff --git a/builder/Dockerfile.opensuse-15 b/builder/Dockerfile.opensuse-15 index ed96447..b9ee03b 100644 --- a/builder/Dockerfile.opensuse-15 +++ b/builder/Dockerfile.opensuse-15 @@ -8,8 +8,6 @@ ENV OS_IDENTIFIER opensuse-15 RUN zypper --non-interactive update RUN zypper --non-interactive --gpg-auto-import-keys -n install \ - atlascpp-devel \ - blas-devel \ bzip2 \ cairo-devel \ fdupes \ @@ -20,7 +18,6 @@ RUN zypper --non-interactive --gpg-auto-import-keys -n install \ glibc-locale \ help2man \ java-1_8_0-openjdk-devel \ - lapack-devel \ libX11-devel \ libXScrnSaver-devel \ libXmu-devel \ @@ -70,8 +67,6 @@ RUN chmod 0777 /opt # Configure flags for SUSE that don't use the defaults in build.sh ENV CONFIGURE_OPTIONS="\ --enable-R-shlib \ - --with-blas \ - --with-lapack \ --with-tcltk \ --with-x \ --enable-memory-profiling \ diff --git a/builder/Dockerfile.opensuse-42 b/builder/Dockerfile.opensuse-42 index fdcf86a..9ca95c3 100644 --- a/builder/Dockerfile.opensuse-42 +++ b/builder/Dockerfile.opensuse-42 @@ -8,8 +8,6 @@ ENV OS_IDENTIFIER opensuse-42 RUN zypper --non-interactive update RUN zypper --non-interactive --gpg-auto-import-keys -n install \ - atlascpp-devel \ - blas-devel \ bzip2 \ cairo-devel \ fdupes \ @@ -20,7 +18,6 @@ RUN zypper --non-interactive --gpg-auto-import-keys -n install \ glibc-locale \ help2man \ java-1_8_0-openjdk-devel \ - lapack-devel \ libX11-devel \ libXScrnSaver-devel \ libXmu-devel \ @@ -73,8 +70,6 @@ ENV MAKEINFO=makeinfo # Configure flags for SUSE that don't use the defaults in build.sh ENV CONFIGURE_OPTIONS="\ --enable-R-shlib \ - --with-blas \ - --with-lapack \ --with-tcltk \ --with-x \ --enable-memory-profiling \ From a695a93014270d0f2650ef55c71167935cef3d9a Mon Sep 17 00:00:00 2001 From: Greg Lin Date: Mon, 24 Jun 2019 17:57:21 -0500 Subject: [PATCH 2/3] Remove ATLAS from Ubuntu/Debian --- builder/Dockerfile.debian-9 | 2 +- builder/Dockerfile.ubuntu-1604 | 2 +- builder/Dockerfile.ubuntu-1804 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/builder/Dockerfile.debian-9 b/builder/Dockerfile.debian-9 index 57ce5a7..4e0074a 100644 --- a/builder/Dockerfile.debian-9 +++ b/builder/Dockerfile.debian-9 @@ -6,7 +6,7 @@ RUN set -x \ && export DEBIAN_FRONTEND=noninteractive \ && echo 'deb-src http://deb.debian.org/debian stretch main' >> /etc/apt/sources.list \ && apt-get update \ - && apt-get install -y libatlas3-base libcurl4-openssl-dev libicu-dev wget python-pip \ + && apt-get install -y libcurl4-openssl-dev libicu-dev wget python-pip \ && apt-get build-dep -y r-base RUN pip install awscli diff --git a/builder/Dockerfile.ubuntu-1604 b/builder/Dockerfile.ubuntu-1604 index 3c88ba1..622e51e 100644 --- a/builder/Dockerfile.ubuntu-1604 +++ b/builder/Dockerfile.ubuntu-1604 @@ -6,7 +6,7 @@ RUN set -x \ && sed -i "s|# deb-src|deb-src|g" /etc/apt/sources.list \ && export DEBIAN_FRONTEND=noninteractive \ && apt-get update \ - && apt-get install -y libatlas3-base libcurl4-openssl-dev libicu-dev wget python-pip \ + && apt-get install -y libcurl4-openssl-dev libicu-dev wget python-pip \ && apt-get build-dep -y r-base RUN pip install awscli diff --git a/builder/Dockerfile.ubuntu-1804 b/builder/Dockerfile.ubuntu-1804 index 2bb5ca9..718a86b 100644 --- a/builder/Dockerfile.ubuntu-1804 +++ b/builder/Dockerfile.ubuntu-1804 @@ -6,7 +6,7 @@ RUN set -x \ && sed -i "s|# deb-src|deb-src|g" /etc/apt/sources.list \ && export DEBIAN_FRONTEND=noninteractive \ && apt-get update \ - && apt-get install -y libatlas3-base libcurl4-openssl-dev libicu-dev wget python-pip \ + && apt-get install -y libcurl4-openssl-dev libicu-dev wget python-pip \ && apt-get build-dep -y r-base RUN pip install awscli From 799d8b829e590561478988d00e23ccd49d45d0a0 Mon Sep 17 00:00:00 2001 From: Greg Lin Date: Thu, 27 Jun 2019 13:26:45 -0500 Subject: [PATCH 3/3] Add libopenblas to Ubuntu/Debian Not necessary to add, but safer since R checks for BLAS compatibility at configure time. --- builder/Dockerfile.debian-9 | 2 +- builder/Dockerfile.ubuntu-1604 | 2 +- builder/Dockerfile.ubuntu-1804 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/builder/Dockerfile.debian-9 b/builder/Dockerfile.debian-9 index 4e0074a..826678b 100644 --- a/builder/Dockerfile.debian-9 +++ b/builder/Dockerfile.debian-9 @@ -6,7 +6,7 @@ RUN set -x \ && export DEBIAN_FRONTEND=noninteractive \ && echo 'deb-src http://deb.debian.org/debian stretch main' >> /etc/apt/sources.list \ && apt-get update \ - && apt-get install -y libcurl4-openssl-dev libicu-dev wget python-pip \ + && apt-get install -y libcurl4-openssl-dev libicu-dev libopenblas-base wget python-pip \ && apt-get build-dep -y r-base RUN pip install awscli diff --git a/builder/Dockerfile.ubuntu-1604 b/builder/Dockerfile.ubuntu-1604 index 622e51e..7e3135b 100644 --- a/builder/Dockerfile.ubuntu-1604 +++ b/builder/Dockerfile.ubuntu-1604 @@ -6,7 +6,7 @@ RUN set -x \ && sed -i "s|# deb-src|deb-src|g" /etc/apt/sources.list \ && export DEBIAN_FRONTEND=noninteractive \ && apt-get update \ - && apt-get install -y libcurl4-openssl-dev libicu-dev wget python-pip \ + && apt-get install -y libcurl4-openssl-dev libicu-dev libopenblas-base wget python-pip \ && apt-get build-dep -y r-base RUN pip install awscli diff --git a/builder/Dockerfile.ubuntu-1804 b/builder/Dockerfile.ubuntu-1804 index 718a86b..67a271b 100644 --- a/builder/Dockerfile.ubuntu-1804 +++ b/builder/Dockerfile.ubuntu-1804 @@ -6,7 +6,7 @@ RUN set -x \ && sed -i "s|# deb-src|deb-src|g" /etc/apt/sources.list \ && export DEBIAN_FRONTEND=noninteractive \ && apt-get update \ - && apt-get install -y libcurl4-openssl-dev libicu-dev wget python-pip \ + && apt-get install -y libcurl4-openssl-dev libicu-dev libopenblas-base wget python-pip \ && apt-get build-dep -y r-base RUN pip install awscli