Merge pull request #16 from Hong-Revo/master

start fixing so R CMD build will work
This commit is contained in:
Zhang Le 2017-09-22 14:36:16 +08:00 коммит произвёл GitHub
Родитель 7d6c858ba8 a20cef1011
Коммит 948ef86d5d
12 изменённых файлов: 97 добавлений и 20 удалений

Просмотреть файл

@ -1,5 +1,6 @@
\.git
\.gitignore
\.gitattributes
Makefile
^.*\.Rproj$
^\.Rproj\.user$

63
.gitattributes поставляемый Normal file
Просмотреть файл

@ -0,0 +1,63 @@
###############################################################################
# Set default behavior to automatically normalize line endings.
###############################################################################
* text=auto
###############################################################################
# Set default behavior for command prompt diff.
#
# This is need for earlier builds of msysgit that does not have it on by
# default for csharp files.
# Note: This is only used by command line
###############################################################################
#*.cs diff=csharp
###############################################################################
# Set the merge driver for project and solution files
#
# Merging from the command prompt will add diff markers to the files if there
# are conflicts (Merging from VS is not affected by the settings below, in VS
# the diff markers are never inserted). Diff markers may cause the following
# file extensions to fail to load in VS. An alternative would be to treat
# these files as binary and thus will always conflict and require user
# intervention with every merge. To do so, just uncomment the entries below
###############################################################################
#*.sln merge=binary
#*.csproj merge=binary
#*.vbproj merge=binary
#*.vcxproj merge=binary
#*.vcproj merge=binary
#*.dbproj merge=binary
#*.fsproj merge=binary
#*.lsproj merge=binary
#*.wixproj merge=binary
#*.modelproj merge=binary
#*.sqlproj merge=binary
#*.wwaproj merge=binary
###############################################################################
# behavior for image files
#
# image files are treated as binary by default.
###############################################################################
#*.jpg binary
#*.png binary
#*.gif binary
###############################################################################
# diff behavior for common document formats
#
# Convert binary document formats to text before diffing them. This feature
# is only available from the command line. Turn it on by uncommenting the
# entries below.
###############################################################################
#*.doc diff=astextplain
#*.DOC diff=astextplain
#*.docx diff=astextplain
#*.DOCX diff=astextplain
#*.dot diff=astextplain
#*.DOT diff=astextplain
#*.pdf diff=astextplain
#*.PDF diff=astextplain
#*.rtf diff=astextplain
#*.RTF diff=astextplain

8
.gitignore поставляемый
Просмотреть файл

@ -27,3 +27,11 @@ inst/doc
.Rproj.user
*_credentials.R
*~
# VS files
.vs
*.tss
*.suo
*.sln
*.rxproj

Просмотреть файл

@ -35,3 +35,4 @@ Suggests:
testthat
VignetteBuilder: knitr
RoxygenNote: 5.0.1
Remotes: Microsoft/AzureSMR

Просмотреть файл

@ -1,6 +1,6 @@
---
title = "Using Azure Data Science Virtual Machine: Deployment of a single DSVM"
author = "Graham Williams and Le Zhang"
title: "Using Azure Data Science Virtual Machine: Deployment of a single DSVM"
author: "Graham Williams and Le Zhang"
output: rmarkdown::html_vignette
vignette: >
%\VignetteIndexEntry{Vignette Title}
@ -68,7 +68,7 @@ account creation on a Windows DSVM.
We can simply source the credentials file in R.
```{r setup}
```{r, setup}
# Load the required subscription resources: TID, CID, and KEY.
# Also includes the ssh PUBKEY for the user.
@ -143,7 +143,7 @@ HOST
cat("\n")
```
```{r connect}
```{r, connect}
# Connect to the Azure subscription and use this as the context for
# our activities.
@ -165,7 +165,7 @@ cat("Resource group", RG, "at", LOC,
Create the resource group within which all resources we create will be
grouped.
```{r create resource group}
```{r, create resource group}
# Create a new resource group into which we create the VMs and related
# resources. Resource group name is RG. Note that to create a new
# resource group one needs to add access control of Active Directory
@ -219,7 +219,7 @@ formals(deployDSVM)$os
The following code deploys a Linux DSVM which will take a few minutes.
```{r deploy}
```{r, deploy}
# Create the required Linux DSVM - generally 4 minutes.
ldsvm <- deployDSVM(context,
@ -238,7 +238,7 @@ azureListVM(context, RG)
Prove that the deployed DSVM exists.
```{r prove exists}
```{r, prove exists}
# Send a simple system() command across to the new server to test its
# existence. Expect a single line with an indication of how long the
@ -273,7 +273,7 @@ server through the secure shell and manually run that command. We
then reboot the server so that, for example, kernel updates, take
effect.
```{r useful tools}
```{r, useful tools}
system(paste(ssh, "sudo locale-gen 'en_AU.UTF-8'"))
system(paste(ssh, "sudo apt-get -y install wajig"))
system(paste(ssh, "wajig install -y lsb htop"))

Просмотреть файл

@ -3,6 +3,10 @@ title: "Using Azure Data Science Virtual Machine: Extension of DSVM"
author: "Graham Williams and Le Zhang"
date: "July 10, 2017"
output: html_document
vignette: >
%\VignetteIndexEntry{Vignette Title}
%\VignetteEngine{knitr::rmarkdown}
\usepackage[utf8]{inputenc}
---
# Use case

Просмотреть файл

@ -1,6 +1,6 @@
---
title = "Using Azure Data Science Virtual Machine: Multi-deployment of DSVMs Quick Start"
author= "Graham Williams"
title: "Using Azure Data Science Virtual Machine: Multi-deployment of DSVMs Quick Start"
author: "Graham Williams"
output: rmarkdown::html_vignette
vignette: >
%\VignetteIndexEntry{Vignette Title}

Просмотреть файл

@ -1,6 +1,6 @@
---
title = "Using Azure Data Science Virtual Machine: Compute on Linux DSVM Quick Start"
author= "Graham Williams"
title: "Using Azure Data Science Virtual Machine: Compute on Linux DSVM Quick Start"
author: "Graham Williams"
output: rmarkdown::html_vignette
vignette: >
%\VignetteIndexEntry{Vignette Title}

Просмотреть файл

@ -1,6 +1,6 @@
---
title = "Using Azure Data Science Virtual Machine: Data consumption and cost calculation"
author= "Graham Williams"
title: "Using Azure Data Science Virtual Machine: Data consumption and cost calculation"
author: "Graham Williams"
output: rmarkdown::html_vignette
vignette: >
%\VignetteIndexEntry{Vignette Title}

Просмотреть файл

@ -1,6 +1,6 @@
---
title = "Using Azure Data Science Virtual Machine: a use case - kmeans clustering"
author= "Le Zhang and Graham Williams"
title: "Using Azure Data Science Virtual Machine: a use case - kmeans clustering"
author: "Le Zhang and Graham Williams"
output: rmarkdown::html_vignette
vignette: >
%\VignetteIndexEntry{Vignette Title}

Просмотреть файл

@ -1,6 +1,6 @@
---
title = "Using Azure Data Science Virtual Machine: a use case - hotspot"
author= "Le Zhang and Graham Williams"
title: "Using Azure Data Science Virtual Machine: a use case - hotspot"
author: "Le Zhang and Graham Williams"
output: rmarkdown::html_vignette
vignette: >
%\VignetteIndexEntry{Vignette Title}

Просмотреть файл

@ -1,6 +1,6 @@
---
title = "Using Azure Data Science Virtual Machine: a use case - binary classification"
author= "Graham Williams"
title: "Using Azure Data Science Virtual Machine: a use case - binary classification"
author: "Graham Williams"
output: rmarkdown::html_vignette
vignette: >
%\VignetteIndexEntry{Vignette Title}