Skip to content

Commit

Permalink
build: bump version
Browse files Browse the repository at this point in the history
  • Loading branch information
@mhamilton723
mhamilton723 committed Aug 19, 2020
1 parent b431a61 commit b12be50
Show file tree
Hide file tree
Showing 4 changed files with 39 additions and 39 deletions.
24 changes: 12 additions & 12 deletions README.md
View file
Expand Up @@ -4,9 +4,9 @@

[![Build Status](https://msazure.visualstudio.com/Cognitive%20Services/_apis/build/status/Azure.mmlspark?branchName=master)](https://msazure.visualstudio.com/Cognitive%20Services/_build/latest?definitionId=83120&branchName=master) [![codecov](https://codecov.io/gh/Azure/mmlspark/branch/master/graph/badge.svg)](https://codecov.io/gh/Azure/mmlspark) [![Gitter](https://badges.gitter.im/Microsoft/MMLSpark.svg)](https://gitter.im/Microsoft/MMLSpark?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)

[![Release Notes](https://img.shields.io/badge/release-notes-blue)](https://github.com/Azure/mmlspark/releases) [![Scala Docs](https://img.shields.io/static/v1?label=api%20docs&message=scala&color=blue&logo=scala)](https://mmlspark.blob.core.windows.net/docs/1.0.0-rc1/scala/index.html#package) [![PySpark Docs](https://img.shields.io/static/v1?label=api%20docs&message=python&color=blue&logo=python)](https://mmlspark.blob.core.windows.net/docs/1.0.0-rc1/pyspark/index.html) [![Academic Paper](https://img.shields.io/badge/academic-paper-7fdcf7)](https://arxiv.org/abs/1810.08744)
[![Release Notes](https://img.shields.io/badge/release-notes-blue)](https://github.com/Azure/mmlspark/releases) [![Scala Docs](https://img.shields.io/static/v1?label=api%20docs&message=scala&color=blue&logo=scala)](https://mmlspark.blob.core.windows.net/docs/1.0.0-rc2/scala/index.html#package) [![PySpark Docs](https://img.shields.io/static/v1?label=api%20docs&message=python&color=blue&logo=python)](https://mmlspark.blob.core.windows.net/docs/1.0.0-rc2/pyspark/index.html) [![Academic Paper](https://img.shields.io/badge/academic-paper-7fdcf7)](https://arxiv.org/abs/1810.08744)

[![Version](https://img.shields.io/badge/version-1.0.0--rc1-blue)](https://github.com/Azure/mmlspark/releases) [![Snapshot Version](https://mmlspark.blob.core.windows.net/icons/badges/master_version3.svg)](#sbt)
[![Version](https://img.shields.io/badge/version-1.0.0--rc2-blue)](https://github.com/Azure/mmlspark/releases) [![Snapshot Version](https://mmlspark.blob.core.windows.net/icons/badges/master_version3.svg)](#sbt)


MMLSpark is an ecosystem of tools aimed towards expanding the distributed computing framework
Expand All @@ -24,8 +24,8 @@ sub-millisecond latency web services, backed by your Spark cluster.

MMLSpark requires Scala 2.11, Spark 2.4+, and Python 3.5+.
See the API documentation [for
Scala](https://mmlspark.blob.core.windows.net/docs/1.0.0-rc1/scala/index.html#package) and [for
PySpark](https://mmlspark.blob.core.windows.net/docs/1.0.0-rc1/pyspark/index.html).
Scala](https://mmlspark.blob.core.windows.net/docs/1.0.0-rc2/scala/index.html#package) and [for
PySpark](https://mmlspark.blob.core.windows.net/docs/1.0.0-rc2/pyspark/index.html).

<details>
<summary><strong><em>Table of Contents</em></strong></summary>
Expand Down Expand Up @@ -130,9 +130,9 @@ MMLSpark can be conveniently installed on existing Spark clusters via the
`--packages` option, examples:

```bash
spark-shell --packages com.microsoft.ml.spark:mmlspark_2.11:1.0.0-rc1
pyspark --packages com.microsoft.ml.spark:mmlspark_2.11:1.0.0-rc1
spark-submit --packages com.microsoft.ml.spark:mmlspark_2.11:1.0.0-rc1 MyApp.jar
spark-shell --packages com.microsoft.ml.spark:mmlspark_2.11:1.0.0-rc2
pyspark --packages com.microsoft.ml.spark:mmlspark_2.11:1.0.0-rc2
spark-submit --packages com.microsoft.ml.spark:mmlspark_2.11:1.0.0-rc2 MyApp.jar
```

This can be used in other Spark contexts too. For example, you can use MMLSpark
Expand All @@ -147,15 +147,15 @@ cloud](http://community.cloud.databricks.com), create a new [library from Maven
coordinates](https://docs.databricks.com/user-guide/libraries.html#libraries-from-maven-pypi-or-spark-packages)
in your workspace.

For the coordinates use: `com.microsoft.ml.spark:mmlspark_2.11:1.0.0-rc1`
For the coordinates use: `com.microsoft.ml.spark:mmlspark_2.11:1.0.0-rc2`
with the resolver: `https://mmlspark.azureedge.net/maven`. Ensure this library is
attached to your target cluster(s).

Finally, ensure that your Spark cluster has at least Spark 2.4 and Scala 2.11.

You can use MMLSpark in both your Scala and PySpark notebooks. To get started with our example notebooks import the following databricks archive:

`https://mmlspark.blob.core.windows.net/dbcs/MMLSpark%20Examples%20v1.0.0-rc1.dbc`
`https://mmlspark.blob.core.windows.net/dbcs/MMLSpark%20Examples%20v1.0.0-rc2.dbc`

### Apache Livy

Expand All @@ -168,7 +168,7 @@ Excluding certain packages from the library may be necessary due to current issu
{
"name": "mmlspark",
"conf": {
"spark.jars.packages": "com.microsoft.ml.spark:mmlspark_2.11:1.0.0-rc1",
"spark.jars.packages": "com.microsoft.ml.spark:mmlspark_2.11:1.0.0-rc2",
"spark.jars.repositories": "https://mmlspark.azureedge.net/maven",
"spark.jars.excludes": "org.scala-lang:scala-reflect,org.apache.spark:spark-tags_2.11,org.scalactic:scalactic_2.11,org.scalatest:scalatest_2.11"
}
Expand Down Expand Up @@ -205,7 +205,7 @@ the above example, or from python:
```python
import pyspark
spark = pyspark.sql.SparkSession.builder.appName("MyApp") \
.config("spark.jars.packages", "com.microsoft.ml.spark:mmlspark_2.11:1.0.0-rc1") \
.config("spark.jars.packages", "com.microsoft.ml.spark:mmlspark_2.11:1.0.0-rc2") \
.config("spark.jars.repositories", "https://mmlspark.azureedge.net/maven") \
.getOrCreate()
import mmlspark
Expand All @@ -218,7 +218,7 @@ your `build.sbt`:

```scala
resolvers += "MMLSpark" at "https://mmlspark.azureedge.net/maven"
libraryDependencies += "com.microsoft.ml.spark" %% "mmlspark" % "1.0.0-rc1"
libraryDependencies += "com.microsoft.ml.spark" %% "mmlspark" % "1.0.0-rc2"

```

Expand Down
6 changes: 3 additions & 3 deletions docs/R-setup.md
View file
Expand Up @@ -10,7 +10,7 @@ To install the current MMLSpark package for R use:

```R
...
devtools::install_url("https://mmlspark.azureedge.net/rrr/mmlspark-1.0.0-rc1.zip")
devtools::install_url("https://mmlspark.azureedge.net/rrr/mmlspark-1.0.0-rc2.zip")
...
```

Expand All @@ -23,7 +23,7 @@ It will take some time to install all dependencies. Then, run:
library(sparklyr)
library(dplyr)
config <- spark_config()
config$sparklyr.defaultPackages <- "com.microsoft.ml.spark:mmlspark_2.11:1.0.0-rc1"
config$sparklyr.defaultPackages <- "com.microsoft.ml.spark:mmlspark_2.11:1.0.0-rc2"
sc <- spark_connect(master = "local", config = config)
...
```
Expand Down Expand Up @@ -83,7 +83,7 @@ and then use spark_connect with method = "databricks":

```R
install.packages("devtools")
devtools::install_url("https://mmlspark.azureedge.net/rrr/mmlspark-1.0.0-rc1.zip")
devtools::install_url("https://mmlspark.azureedge.net/rrr/mmlspark-1.0.0-rc2.zip")
library(sparklyr)
library(dplyr)
sc <- spark_connect(method = "databricks")
Expand Down

0 comments on commit b12be50

Please sign in to comment.