Skip to content

Commit cd18ef4

Browse files
committed
Merging conflict changes.
2 parents d99f803 + cc46145 commit cd18ef4

98 files changed

Lines changed: 1269 additions & 1664 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

docs/advanced-analytics/common-issues-external-script-execution.md

Lines changed: 36 additions & 31 deletions
Large diffs are not rendered by default.

docs/advanced-analytics/getting-started-with-machine-learning-services.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
2-
title: "Getting Started | Microsoft Docs"
2+
title: "Getting started with machine learning in SQL Server| Microsoft Docs"
33
ms.custom: ""
4-
ms.date: "07/31/2017"
4+
ms.date: "08/20/2017"
55
ms.prod: "sql-server-2016"
66
ms.reviewer: ""
77
ms.suite: ""
@@ -67,7 +67,7 @@ You can also install R Server through platform-specific installers available fro
6767

6868
+ [Data Science Virtual Machine](../advanced-analytics/r/provision-the-r-server-only-sql-server-2016-enterprise-vm-on-azure.md)
6969

70-
Jump-start your entry into machine learning by getting this complete machine learning solution from the Azure Marketplace. The data science virtual machine (frequently shortened to "DSVM") includes SQL Server, Microsoft Machine Learnign Server, and all development tools.
70+
Jump-start your entry into machine learning by getting this complete machine learning solution from the Azure Marketplace. The data science virtual machine (frequently shortened to "DSVM") includes SQL Server, Microsoft Machine Learning Server, and all development tools.
7171

7272
The latest version of the Data Science Virtual Machine (DSVM) runs on Windows 2016 Preview Edition, to provide the clean customizable look of Windows 10. It comes pre-configured with NVIDIA drivers, CUDA Toolkit 8.0, and the NVIDIA cuDNN library for GPU workloads.
7373

@@ -79,7 +79,7 @@ You can also install R Server through platform-specific installers available fro
7979

8080
### R tutorials
8181

82-
+ [Use R in SQL Server](/tutorials/sql-server-r-tutorials.md)
82+
+ [SQL Server R tutorials](../advanced-analytics/tutorials/sql-server-r-tutorials.md)
8383

8484
Learn how to run R in SQL Server, create and use remote compute contexts, or perform simulations in R using SQL Server.
8585

@@ -91,7 +91,7 @@ You can also install R Server through platform-specific installers available fro
9191

9292
### Python tutorials
9393

94-
+ [Use Python in SQL Server](/tutorials/sql-server-r-tutorials.md)
94+
+ [SQL Server Python tutorials](../advanced-analytics/tutorials/sql-server-r-tutorials.md)
9595

9696
Learn how to run Python in SQL Server. Build a model using Python and use it to score SQL Server data.
9797

docs/advanced-analytics/operationalization-with-mrsdeploy.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: "Deploy and consume analytics using mrsdeploy | Microsoft Docs"
33
ms.custom: ""
4-
ms.date: "07/26/2017"
4+
ms.date: "08/20/2017"
55
ms.prod: "sql-server-2016"
66
ms.reviewer: ""
77
ms.suite: ""
@@ -36,13 +36,13 @@ The word *operationalization* can mean many things:
3636

3737
If you have installed Machine Learning Services with SQL Server, *operationalization* is a matter of wrapping your R or Python code in a stored procedure. Any application can then call the stored procedure to retrain a model, generate scores, or create reports. You can also automate jobs using existing scheduling mechanisms in SQL Server.
3838

39-
However, Microsoft R Server provides a different mechanism for deployment support, using web services that support publishing of R jobs, and an administrative utility for running distributed R jobs. Microsoft R Server uses the functions in the **mrsdeploy** package to establish a session with remote compute nodes and execute R code in a console application.
39+
However, Microsoft R Server provides a different mechanism for deployment support, using web services that support publishing of R jobs, and an administrative utility for running distributed R jobs. Microsoft R Server uses the functions in the **mrsdeploy** package to establish a session with remote compute nodes and execute R code in a console application.
4040

4141
This deployment feature of R Server provides these benefits:
4242

4343
+ Role-based access control to analytical web services
4444

45-
Determine who can publish, update, and delete their own web services, those who can also update and delete the web services published by other users, and who can only list and consume web services. Learn more about [roles](https://msdn.microsoft.com/microsoft-r/operationalize/security-roles.md).
45+
Determine who can publish, update, and delete their own web services, those who can also update and delete the web services published by other users, and who can only list and consume web services.
4646

4747
+ Faster scoring
4848

@@ -68,7 +68,7 @@ This deployment feature of R Server provides these benefits:
6868

6969
SQL Server 2017 CTP 2.0 and later includes this feature, which was previously available only with R Server, and not installed with SQL Server R Services. The **mrsdeploy** package is installed on the SQL Server computer, if you select the option to install **Microsoft Machine Learning Server**, from the **Shared Features** section of SQL Server setup.
7070

71-
Typically, we do not recommend that you install Machine Learning Server on the same computer that is running SQL Server Machine Learning Services. We recommend that you install **Microsoft Machine Learning Server** on a separate computer from SQL Server, and then configure the operationalization features on that computer.
71+
Typically, we do not recommend that you install Machine Learning Server on the same computer that is running SQL Server Machine Learning Services. We recommend that you install **Microsoft Machine Learning Server** on a separate computer from SQL Server, and then configure the operationalization features on that computer.
7272

7373
However, if you need to install them together, follow these additional steps to successfully configure the service.
7474

@@ -83,7 +83,7 @@ However, if you need to install them together, follow these additional steps to
8383
+ Create a new registry key `H_KEY_LOCAL_MACHINE\SOFTWARE\R Server\Path`
8484
+ Set the value of the key to `"C:\Program Files\Microsoft SQL Server\140\R_SERVER"`.
8585

86-
4. When done, open the [Administrator Utility](https://docs.microsoft.com/r-server/operationalize/configure-use-admin-utility).
86+
4. When done, open the [Administrator Utility](https://docs.microsoft.com/r-server/operationalize/configure-use-admin-utility).
8787

8888
5. Continue to configure the **mrsdeploy** service as described here: [Configuration for administrators](https://docs.microsoft.com/r-server/operationalize/configure-start-for-administrators)
8989

docs/advanced-analytics/python/what-is-revoscalepy.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: "Introducing revoscalepy | Microsoft Docs"
33
ms.custom: ""
4-
ms.date: "07/19/2017"
4+
ms.date: "08/20/2017"
55
ms.prod: "sql-server-2017"
66
ms.reviewer: ""
77
ms.suite: ""
@@ -19,12 +19,12 @@ manager: "jhubbard"
1919

2020
It is based on the **RevoScaleR** package for R, which was provided in Microsoft R Server and SQL Server R Services, and aims to provide the same functionality:
2121

22-
+ Supports multiple compute contexts, remote or local
22+
+ Supports multiple compute contexts, both remote and local
2323
+ Provides functions equivalent to those in RevoScaleR for data transformation and visualization
2424
+ Provides Python versions of RevoScaleR machine learning algorithms for distributed or parallel processing
2525
+ Improved performance, including use of the Intel math libraries
2626

27-
MicrosoftML packages are also proided for both R and Python. For more information, see [Using MicrosoftML in SQL Server](../using-the-microsoftml-package.md)
27+
MicrosoftML packages are also provided for both R and Python. For more information, see [Using MicrosoftML in SQL Server](../using-the-microsoftml-package.md)
2828

2929
> [!WARNING]
3030
>
@@ -62,7 +62,7 @@ You create the data source object by using functions listed in the following tab
6262

6363
+ Use [RxSqlServerData](https://docs.microsoft.com/r-server/python-reference/revoscalepy/rxsqlserverdata) to define a data source from a query or table
6464
+ Use [RxInSqlServer](https://docs.microsoft.com/r-server/python-reference/revoscalepy/rxinsqlserver) to create a SQL Server compute context
65-
+ Use [RxOdbcData](https://docs.microsoft.com/r-server/python-reference/revoscalepy/rxodbbcdata) to create a data source from an ODBC connection
65+
+ Use [RxOdbcData](https://docs.microsoft.com/r-server/python-reference/revoscalepy/rxodbcdata) to create a data source from an ODBC connection
6666

6767
**revoscalepy** also supports the [XDF data source](https://docs.microsoft.com/r-server/python-reference/revoscalepy/rxxdfdata), used for moving data between memory and other data sources.
6868

@@ -93,7 +93,7 @@ New machine learning algorithms are also provided by the Python version of [Micr
9393
|`rx_fast_trees` | Create a boosted tree model |
9494
|`rx_logistic_regression` | Create a logistic regression model|
9595
|`rx_neural_network` | Create a customizable neural network model |
96-
|`rx_oneclass_svm` | Creates a SVM model for imabalnced datsets, for use in anomaly detection|
96+
|`rx_oneclass_svm` | Creates a SVM model on an imbalanced dataset, for use in anomaly detection|
9797

9898
> [!TIP]
9999
> Many of these algorithms are already provided as modules in Azure Machine Learning.

docs/advanced-analytics/r/how-to-do-realtime-scoring.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: "How to perform realtime scoring or native scoring in SQL Server | Microsoft Docs"
33
ms.custom: ""
4-
ms.date: "07/14/2017"
4+
ms.date: "08/20/2017"
55
ms.prod: "sql-server-2016"
66
ms.reviewer: ""
77
ms.suite: ""
@@ -13,7 +13,7 @@ author: "jeannt"
1313
ms.author: "jeannt"
1414
manager: "jhubbard"
1515
---
16-
## How to perform realtime scoring or native scoring in SQL Server
16+
# How to perform realtime scoring or native scoring in SQL Server
1717

1818
This topic provides instructions and sample code for how to execute the realtime scoring and native scoring features in SQL Server 2016 and SQL Server 2017. The goal of both realtime scoring and native scoring is to improve the performance of scoring operations in small batches.
1919

@@ -58,7 +58,7 @@ For more information, see [rxSerializeModel](https://docs.microsoft.com/r-server
5858

5959
From SQL code, you can train the model using `sp_execute_external_script`, and directly insert the trained models into a table, in a column of type **varbinary(max)**.
6060

61-
For a simple example, see [this tutorial](/tutorials/rtsql-create-a-predictive-model-r.md)
61+
For a simple example, see [this tutorial](../tutorials/rtsql-create-a-predictive-model-r.md)
6262

6363
**Using R**
6464

docs/advanced-analytics/r/r-package-management-for-sql-server-r-services.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: "R package management for SQL Server | Microsoft Docs"
33
ms.custom: ""
4-
ms.date: "07/31/2017"
4+
ms.date: "08/20/2017"
55
ms.prod: "sql-server-2016"
66
ms.reviewer: ""
77
ms.suite: ""
@@ -19,7 +19,7 @@ manager: "jhubbard"
1919
---
2020
# R package management for SQL Server
2121

22-
This topic describes the package management features that you can use to manage R packages that are running on an instance of SQL Server.
22+
This topic describes the package management features that you can use to manage R packages that are running on an instance of SQL Server.
2323

2424
**Applies to:** SQL Server 2016 R Services, SQL Server 2017 Machine Learning Services
2525

@@ -35,13 +35,13 @@ The database administrator is responsible for setting up roles and adding users
3535

3636
The following new database roles support secure installation and R package management in SQL Server:
3737

38-
- **rpkgs-users** Allows users to use any shared packages that were installed by members of the **rpkgs-shared** role.
38+
- `rpkgs-users`: Allows users to use any shared packages that were installed by members of the `rpkgs-shared` role.
3939

40-
- **rpkgs-private** Provides access to shared packages with the same permissions as the **rpkgs-users** role. Members of this role can also install, remove and use privately scoped packages.
40+
- `rpkgs-private`: Provides access to shared packages with the same permissions as the `rpkgs-users` role. Members of this role can also install, remove and use privately scoped packages.
4141

42-
- **rpkgs-shared** Provides the same permissions as the **rpkgs-private** role. Users who are members of this role can also install or remove shared packages.
42+
- `rpkgs-shared`: Provides the same permissions as the `rpkgs-private` role. Users who are members of this role can also install or remove shared packages.
4343

44-
- **db_owner** - Has the same permissions as the **rpkgs-shared** role. Can also grant users the right to install or remove both shared and private packages.
44+
- `db_owner`: Has the same permissions as the `rpkgs-shared` role. Can also grant users the right to install or remove both shared and private packages.
4545

4646
### Creating an external package library using T-SQL
4747

@@ -61,7 +61,7 @@ The **RevoScaleR** package now includes functions to support easier installation
6161

6262
### R package management functions
6363

64-
The following package management functions are provided in RevoScaleR, for installation and removal of packages in a specified compute context.
64+
The following package management functions are provided in RevoScaleR, for installation and removal of packages in a specified compute context:
6565

6666
+ [rxInstalledPackages](https://docs.microsoft.com/r-server/r-reference/revoscaler/rxinstalledpackages): Find information about packages installed in the specified compute context.
6767

@@ -75,7 +75,7 @@ The following package management functions are provided in RevoScaleR, for insta
7575

7676
+ [rxSqlLibPaths](https://docs.microsoft.com/r-server/r-reference/revoscaler/rxsqllibpaths): Get the search path for the library trees for packages while executing inside the SQL Server.
7777

78-
These packages are also included by default in SQL Server 2017. You can add the packages to an instance of SQL Server 2016 if you upgrade the instance to use at least Microsoft R 9.0.1. For more information, see [Using SqlBindR.exe to Upgrade R](/use-sqlbindr-exe-to-upgrade-an-instance-of-sql-server.md).
78+
These packages are also included by default in SQL Server 2017. You can add the packages to an instance of SQL Server 2016 if you upgrade the instance to use at least Microsoft R 9.0.1. For more information, see [Using SqlBindR.exe to upgrade R](use-sqlbindr-exe-to-upgrade-an-instance-of-sql-server.md).
7979

8080
For information about these functions, see the RevoScaleR function reference pages: (https://docs.microsoft.com/r-server/r-reference/revoscaler/revoscaler)
8181

@@ -97,17 +97,17 @@ The new package management functions provide two scopes for installation and use
9797

9898
- **Shared scope**
9999

100-
*Shared scope* means that users who have been given permission to the shared scope role (**rpkgs-shared**) can install and uninstall packages to a specified database. A package that is installed in a shared scope library can be used by other users of the database on SQL Server, provided those users are allowed to use installed R packages.
100+
*Shared scope* means that users who have been given permission to the shared scope role (`rpkgs-shared`) can install and uninstall packages to a specified database. A package that is installed in a shared scope library can be used by other users of the database on SQL Server, provided those users are allowed to use installed R packages.
101101

102102
- **Private scope**
103103

104-
*Private scope* means that users who have been given membership in the private scope role (**rpkgs-private**) can install or uninstall packages into a private library location defined per user. Therefore, any packages installed in the private scope can be used only by the user who installed them. In other words, a user on SQL Server cannot use private packages that were installed by a different user.
104+
*Private scope* means that users who have been given membership in the private scope role (`rpkgs-private`) can install or uninstall packages into a private library location defined per user. Therefore, any packages installed in the private scope can be used only by the user who installed them. In other words, a user on SQL Server cannot use private packages that were installed by a different user.
105105

106106
These models for *shared* and *private* scope can be combined to develop custom secure systems for deploying and managing packages on SQL Server.
107107

108108
For example, by using shared scope, the lead or manager for a group of data scientists could be granted permission to install packages, and those packages could then be used by all other users or data scientists in the same SQL Server instance.
109109

110-
Another scenario might require greater isolation among users, or use of different versions of packages. In that case, private scope can be used to give individual permissions to data scientists, who would be responsible for installing and using just the packages they need. Because packages are installed on a per-user basis, packages installed by one user would not affect the work of other users who are using the same SQL Server database.
110+
Another scenario might require greater isolation among users, or use of different versions of packages. In that case, private scope can be used to give individual permissions to data scientists, who would be responsible for installing and using just the packages they need. Because packages are installed on a per-user basis, packages installed by one user would not affect the work of other users who are using the same SQL Server database.
111111

112112
### Synchronizing R package libraries
113113

0 commit comments

Comments
 (0)