You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mxnet.apache.org by lx...@apache.org on 2017/07/07 15:58:50 UTC

[37/50] [abbrv] incubator-mxnet-test git commit: [R] To use the latest R in the installation script for ubuntu. (#6897)

[R] To use the latest R in the installation script for ubuntu. (#6897)



Project: http://git-wip-us.apache.org/repos/asf/incubator-mxnet-test/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mxnet-test/commit/e9cc791e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mxnet-test/tree/e9cc791e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mxnet-test/diff/e9cc791e

Branch: refs/heads/master
Commit: e9cc791e8dd41089de2353aeda775d0a14da4759
Parents: 5fb0832
Author: Qiang Kou (KK) <qk...@qkou.info>
Authored: Tue Jul 4 10:55:35 2017 -0700
Committer: GitHub <no...@github.com>
Committed: Tue Jul 4 10:55:35 2017 -0700

----------------------------------------------------------------------
 docs/get_started/windows_setup.md     | 6 +++---
 setup-utils/install-mxnet-ubuntu-r.sh | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-mxnet-test/blob/e9cc791e/docs/get_started/windows_setup.md
----------------------------------------------------------------------
diff --git a/docs/get_started/windows_setup.md b/docs/get_started/windows_setup.md
index 47e0c08..86104c6 100755
--- a/docs/get_started/windows_setup.md
+++ b/docs/get_started/windows_setup.md
@@ -92,7 +92,7 @@ To install MXNet on a computer with a CPU processor, choose from two options:
 * Use the prebuilt binary package
 * Build the library from source code
 
-#### Building MXNet with the Prebuilt Binary Package
+#### Installing MXNet with the Prebuilt Binary Package
 For Windows users, MXNet provides prebuilt binary packages.
 You can install the package directly in the R console.
 
@@ -119,12 +119,12 @@ For GPU-enabled package:
 Run the following commands to install the MXNet dependencies and build the MXNet R package.
 
 ```r
-  Rscript -e "install.packages('devtools', repo = 'https://cran.rstudio.com')"
+  Rscript -e "install.packages('devtools', repo = 'https://cloud.r-project.org/')"
 ```
 
 ```bash
   cd R-package
-  Rscript -e "library(devtools); library(methods); options(repos=c(CRAN='https://cran.rstudio.com')); install_deps(dependencies = TRUE)"
+  Rscript -e "library(devtools); library(methods); options(repos=c(CRAN='https://cloud.r-project.org/')); install_deps(dependencies = TRUE)"
   cd ..
   make rpkg
 ```

http://git-wip-us.apache.org/repos/asf/incubator-mxnet-test/blob/e9cc791e/setup-utils/install-mxnet-ubuntu-r.sh
----------------------------------------------------------------------
diff --git a/setup-utils/install-mxnet-ubuntu-r.sh b/setup-utils/install-mxnet-ubuntu-r.sh
index 5f1b04d..8f4c07d 100644
--- a/setup-utils/install-mxnet-ubuntu-r.sh
+++ b/setup-utils/install-mxnet-ubuntu-r.sh
@@ -1,9 +1,6 @@
 #!/usr/bin/env bash
 ######################################################################
 # This script installs MXNet for R along with all required dependencies on a Ubuntu Machine.
-# We recommend to install Microsoft RServer together with Intel MKL library for optimal performance
-# More information can be found here:
-# https://blogs.technet.microsoft.com/machinelearning/2016/09/15/building-deep-neural-networks-in-the-cloud-with-azure-gpu-vms-mxnet-and-microsoft-r-server/
 # Tested on Ubuntu 14.04+ distro.
 ######################################################################
 set -e
@@ -22,6 +19,9 @@ is_rscript_installed=$(which Rscript | wc -l)
 if [ "$is_rscript_installed" = "0" ]; then
 	read -p "Seems like Rscript is not installed. Install Rscript? [Y/n]"
 	if [ x"$REPLY" = x"" -o x"$REPLY" = x"y" -o x"$REPLY" = x"Y" ]; then
+		sudo add-apt-repository -y "deb http://cran.rstudio.com/bin/linux/ubuntu `lsb_release -cs`/"
+		sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys E084DAB9
+		sudo apt-get -qq update
 		sudo apt-get install -y r-base-core
 	fi
 fi