Skip to content

Commit

Permalink
Merge pull request #330 from Sharon-iguazio/3.x
Browse files Browse the repository at this point in the history 
MERGE `development` to `3.x` (PRs 326-328)
  • Loading branch information
@Sharon-iguazio
Sharon-iguazio authored Jan 25, 2021
2 parents 8a224a9 + 7d02636 commit 0d1df93
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 17 deletions.
16 changes: 8 additions & 8 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,9 @@ The home directory of the platform's running-user directory (**/User/<running

Start out by running the getting-started tutorial to familiarize yourself with the platform and experience firsthand some of its main capabilities.

<a href="demos/getting-started-tutorial/tutorial-1-MLRun-basics.ipynb"><img src="./assets/images/view-tutorial-button.png" alt="View tutorial"/></a>
<a href="demos/getting-started-tutorial/README.ipynb"><img src="./assets/images/view-tutorial-button.png" alt="View tutorial"/></a>

You can also view the tutorial on [GitHub](https://github.com/mlrun/demos/blob/release/v0.6.x-latest/getting-started-tutorial/tutorial-1-MLRun-basics.ipynb).
You can also view the tutorial on [GitHub](https://github.com/mlrun/demos/blob/release/v0.6.x-latest/getting-started-tutorial/README.ipynb).

<a id="demos"></a>

Expand Down Expand Up @@ -195,32 +195,32 @@ For full usage instructions, run the script with the `-h` or `--help` flag:
<tr>
<td><b>How-To: Running a Spark job for reading a CSV file</b></td>
<td align="center", style="min-width:45px; padding: 10px;">
<a href="demos/howto/spark/spark_mlrun_read_csv.ipynb"><img src="./assets/images/Jupyter-Logo-32px.png"/><br>Open locally</a>
<a href="demos/howto/spark/spark-mlrun-read-csv.ipynb"><img src="./assets/images/Jupyter-Logo-32px.png"/><br>Open locally</a>
</td>
<td align="center", style="min-width:45px; padding: 10px;">
<a target="_blank" href="https://github.com/mlrun/demos/blob/release/v0.6.x-latest/howto/spark/spark_mlrun_read_csv.ipynb"><img src="./assets/images/GitHub-Mark-32px.png"/><br>View on GitHub</a>
<a target="_blank" href="https://github.com/mlrun/demos/blob/release/v0.6.x-latest/howto/spark/spark-mlrun-read-csv.ipynb"><img src="./assets/images/GitHub-Mark-32px.png"/><br>View on GitHub</a>
</td>
<td>Demonstrates how to run a Spark job that reads a CSV file and logs the data set to an MLRun database.
</td>
</tr>
<tr>
<td><b>How-To: Running a Spark job for analyzing data</b></td>
<td align="center", style="min-width:45px; padding: 10px;">
<a href="demos/howto/spark/spark_mlrun_describe.ipynb"><img src="./assets/images/Jupyter-Logo-32px.png"/><br>Open locally</a>
<a href="demos/howto/spark/spark-mlrun-describe.ipynb"><img src="./assets/images/Jupyter-Logo-32px.png"/><br>Open locally</a>
</td>
<td align="center", style="min-width:45px; padding: 10px;">
<a target="_blank" href="https://github.com/mlrun/demos/blob/release/v0.6.x-latest/howto/spark/spark_mlrun_describe.ipynb"><img src="./assets/images/GitHub-Mark-32px.png"/><br>View on GitHub</a>
<a target="_blank" href="https://github.com/mlrun/demos/blob/release/v0.6.x-latest/howto/spark/spark_mlrun-describe.ipynb"><img src="./assets/images/GitHub-Mark-32px.png"/><br>View on GitHub</a>
</td>
<td>Demonstrates how to create and run a Spark job that generates a profile report from an Apache Spark DataFrame based on pandas profiling.
</td>
</tr>
<tr>
<td><b>How-To: Running a Spark Job with Spark Operator</b></td>
<td align="center", style="min-width:45px; padding: 10px;">
<a href="demos/howto/spark/spark_operator.ipynb"><img src="./assets/images/Jupyter-Logo-32px.png"/><br>Open locally</a>
<a href="demos/howto/spark/spark-operator.ipynb"><img src="./assets/images/Jupyter-Logo-32px.png"/><br>Open locally</a>
</td>
<td align="center", style="min-width:45px; padding: 10px;">
<a target="_blank" href="https://github.com/mlrun/demos/blob/release/v0.6.x-latest/howto/spark/spark_operator.ipynb"><img src="./assets/images/GitHub-Mark-32px.png"/><br>View on GitHub</a>
<a target="_blank" href="https://github.com/mlrun/demos/blob/release/v0.6.x-latest/howto/spark/spark-operator.ipynb"><img src="./assets/images/GitHub-Mark-32px.png"/><br>View on GitHub</a>
</td>
<td>Demonstrates how to use <a target="_blank" href="https://github.com/GoogleCloudPlatform/spark-on-k8s-operator">Spark Operator</a> to run a Spark job over Kubernetes with MLRun.
</td>
Expand Down
2 changes: 1 addition & 1 deletion platform-overview.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
"\n",
"> **Note:** You can deploy and manage application services, such as Spark and Jupyter Notebook, from the **Services** page of the platform dashboard.\n",
"\n",
"For more information and examples of data exploration with the platform, see the [**getting-started-tutorial**](demos/getting-started-tutorial/tutorial-1-MLRun-basics.ipynb) and the (data-ingestion-and-preparation/basic-data-ingestion-and-preparation.ipynb) tutorial Jupyter notebooks."
"For more information and examples of data exploration with the platform, see the [**getting-started-tutorial**](demos/getting-started-tutorial/README.ipynb) and the (data-ingestion-and-preparation/basic-data-ingestion-and-preparation.ipynb) tutorial Jupyter notebooks."
]
},
{
Expand Down
16 changes: 8 additions & 8 deletions welcome.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,9 +109,9 @@
"\n",
"Start out by running the getting-started tutorial to familiarize yourself with the platform and experience firsthand some of its main capabilities.\n",
"\n",
"<a href=\"demos/getting-started-tutorial/tutorial-1-MLRun-basics.ipynb\"><img src=\"./assets/images/view-tutorial-button.png\" alt=\"View tutorial\"/></a>\n",
"<a href=\"demos/getting-started-tutorial/README.ipynb\"><img src=\"./assets/images/view-tutorial-button.png\" alt=\"View tutorial\"/></a>\n",
"\n",
"You can also view the tutorial on [GitHub](https://github.com/mlrun/demos/blob/release/v0.6.x-latest/getting-started-tutorial/tutorial-1-MLRun-basics.ipynb)."
"You can also view the tutorial on [GitHub](https://github.com/mlrun/demos/blob/release/v0.6.x-latest/getting-started-tutorial/README.ipynb)."
]
},
{
Expand Down Expand Up @@ -299,32 +299,32 @@
" <tr>\n",
" <td><b>How-To: Running a Spark job for reading a CSV file</b></td>\n",
" <td align=\"center\", style=\"min-width:45px; padding: 10px;\">\n",
" <a href=\"demos/howto/spark/spark_mlrun_read_csv.ipynb\"><img src=\"./assets/images/Jupyter-Logo-32px.png\"/><br>Open locally</a>\n",
" <a href=\"demos/howto/spark/spark-mlrun-read-csv.ipynb\"><img src=\"./assets/images/Jupyter-Logo-32px.png\"/><br>Open locally</a>\n",
" </td>\n",
" <td align=\"center\", style=\"min-width:45px; padding: 10px;\">\n",
" <a target=\"_blank\" href=\"https://github.com/mlrun/demos/blob/release/v0.6.x-latest/howto/spark/spark_mlrun_read_csv.ipynb\"><img src=\"./assets/images/GitHub-Mark-32px.png\"/><br>View on GitHub</a>\n",
" <a target=\"_blank\" href=\"https://github.com/mlrun/demos/blob/release/v0.6.x-latest/howto/spark/spark-mlrun-read-csv.ipynb\"><img src=\"./assets/images/GitHub-Mark-32px.png\"/><br>View on GitHub</a>\n",
" </td>\n",
" <td>Demonstrates how to run a Spark job that reads a CSV file and logs the data set to an MLRun database.\n",
" </td>\n",
" </tr>\n",
" <tr>\n",
" <td><b>How-To: Running a Spark job for analyzing data</b></td>\n",
" <td align=\"center\", style=\"min-width:45px; padding: 10px;\">\n",
" <a href=\"demos/howto/spark/spark_mlrun_describe.ipynb\"><img src=\"./assets/images/Jupyter-Logo-32px.png\"/><br>Open locally</a>\n",
" <a href=\"demos/howto/spark/spark-mlrun-describe.ipynb\"><img src=\"./assets/images/Jupyter-Logo-32px.png\"/><br>Open locally</a>\n",
" </td>\n",
" <td align=\"center\", style=\"min-width:45px; padding: 10px;\">\n",
" <a target=\"_blank\" href=\"https://github.com/mlrun/demos/blob/release/v0.6.x-latest/howto/spark/spark_mlrun_describe.ipynb\"><img src=\"./assets/images/GitHub-Mark-32px.png\"/><br>View on GitHub</a>\n",
" <a target=\"_blank\" href=\"https://github.com/mlrun/demos/blob/release/v0.6.x-latest/howto/spark/spark-mlrun-describe.ipynb\"><img src=\"./assets/images/GitHub-Mark-32px.png\"/><br>View on GitHub</a>\n",
" </td>\n",
" <td>Demonstrates how to create and run a Spark job that generates a profile report from an Apache Spark DataFrame based on pandas profiling.\n",
" </td>\n",
" </tr>\n",
" <tr>\n",
" <td><b>How-To: Running a Spark Job with Spark Operator</b></td>\n",
" <td align=\"center\", style=\"min-width:45px; padding: 10px;\">\n",
" <a href=\"demos/howto/spark/spark_operator.ipynb\"><img src=\"./assets/images/Jupyter-Logo-32px.png\"/><br>Open locally</a>\n",
" <a href=\"demos/howto/spark/spark-operator.ipynb\"><img src=\"./assets/images/Jupyter-Logo-32px.png\"/><br>Open locally</a>\n",
" </td>\n",
" <td align=\"center\", style=\"min-width:45px; padding: 10px;\">\n",
" <a target=\"_blank\" href=\"https://github.com/mlrun/demos/blob/release/v0.6.x-latest/howto/spark/spark_operator.ipynb\"><img src=\"./assets/images/GitHub-Mark-32px.png\"/><br>View on GitHub</a>\n",
" <a target=\"_blank\" href=\"https://github.com/mlrun/demos/blob/release/v0.6.x-latest/howto/spark/spark-operator.ipynb\"><img src=\"./assets/images/GitHub-Mark-32px.png\"/><br>View on GitHub</a>\n",
" </td>\n",
" <td>Demonstrates how to use <a target=\"_blank\" href=\"https://github.com/GoogleCloudPlatform/spark-on-k8s-operator\">Spark Operator</a> to run a Spark job over Kubernetes with MLRun.\n",
" </td>\n",
Expand Down

0 comments on commit 0d1df93

Please sign in to comment.