Skip to content

Commit

Permalink
Final wording for tut 2,3,4
Browse files Browse the repository at this point in the history
  • Loading branch information
Michael committed Aug 8, 2023
1 parent 6ec0eb3 commit fe6b09a
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 12 deletions.
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"cells": [
{
"attachments": {},
"cell_type": "markdown",
"id": "d11c31ec",
"metadata": {},
Expand All @@ -18,7 +17,15 @@
"execution_count": 1,
"id": "8f28bf9a",
"metadata": {},
"outputs": [],
"outputs": [
{
"name": "stdout",
"output_type": "stream",
"text": [
"Please run on linux, sparc_flow does not yet support windows\n"
]
}
],
"source": [
"try:\n",
" import sparc_flow \n",
Expand All @@ -27,7 +34,6 @@
]
},
{
"attachments": {},
"cell_type": "markdown",
"id": "279fdacd",
"metadata": {},
Expand Down Expand Up @@ -75,7 +81,6 @@
]
},
{
"attachments": {},
"cell_type": "markdown",
"id": "28c29b8e",
"metadata": {},
Expand Down Expand Up @@ -132,7 +137,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.9.17"
"version": "3.9.16"
}
},
"nbformat": 4,
Expand Down
26 changes: 20 additions & 6 deletions tutorials/tutorial_3/tutorial_3_running_locally_with_cwltool.ipynb
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"cells": [
{
"attachments": {},
"cell_type": "markdown",
"id": "2554948a",
"metadata": {},
Expand All @@ -11,6 +10,8 @@
"This tutorial will use sparc-flow to run the standardised workflow described in Tutorial 2 locally using cwltool. \n",
"\n",
"## Requirements\n",
"Tutorial 3 requires that you have first run tutorial 2 as it uses the work flows generated using sparc_flow. \n",
"\n",
"pip install sparc_flow\n",
"\n",
"## Loading a workflow\n",
Expand Down Expand Up @@ -57,7 +58,6 @@
]
},
{
"attachments": {},
"cell_type": "markdown",
"id": "e8838b92",
"metadata": {},
Expand All @@ -82,16 +82,30 @@
}
],
"source": [
"workflow.run() \n"
"workflow.run() "
]
},
{
"attachments": {},
"cell_type": "markdown",
"id": "b037bb11",
"metadata": {},
"source": [
"This executes the work flow and saves(?) the output to an SDS located (??)."
"Here we are displaying the data generated by the workflow which has been saved into the tutorial folder."
]
},
{
"cell_type": "code",
"execution_count": null,
"id": "4f86a4f9",
"metadata": {},
"outputs": [],
"source": [
"import matplotlib as plt\n",
"plt.figure(figsize = (10,6))\n",
"plt.imshow(plt.imread('output.png'))\n",
"plt.axis('off')\n",
"plt.title(\"Output of workflow\")\n",
"plt.show()"
]
}
],
Expand All @@ -111,7 +125,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.9.17"
"version": "3.9.16"
}
},
"nbformat": 4,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"metadata": {},
"source": [
"# Tutorial 4: Running a workflow locally using docstore\n",
"This tutorial will use sparc-flow to run the standardised workflow described in Tutorial 2 locally using Dockstore.\n",
"This tutorial will use sparc-flow to run the standardised workflow described in Tutorial 2 locally using Dockstore. Tutorial 4 requires that you have first run tutorial 2 in order to generate the workflow.\n",
"\n",
"## Installing Dockstore CLI\n",
"These instructions are suitable for the following systems: Linux/Ubuntu/MacOS\n",
Expand Down

0 comments on commit fe6b09a

Please sign in to comment.