Merge pull request #11 from rstudio/openblas

Update BLAS libraries
This commit is contained in:
Greg Lin 2019-07-15 12:48:44 -05:00 committed by GitHub
commit 6047fb7b63
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 3 additions and 21 deletions

View file

@ -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.

View file

@ -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.

View file

@ -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 libopenblas-base wget python-pip \
&& apt-get build-dep -y r-base
RUN pip install awscli

View file

@ -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 \

View file

@ -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 \

View file

@ -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 libopenblas-base wget python-pip \
&& apt-get build-dep -y r-base
RUN pip install awscli

View file

@ -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 libopenblas-base wget python-pip \
&& apt-get build-dep -y r-base
RUN pip install awscli