Merge pull request #24 from gilv/pywren-new-runtime

update to PyWren-IBM-Cloud version 1.0.9

Author: rhagarty

notebooks/facial-recognition.ipynb

@@ -130,12 +130,6 @@
  "outputs": [],
  "source": [
  "%%capture\n",
- "!curl -fsSL \"https://git.io/fhe9X\" | sh\n",
- "try:\n",
- " import pywren_ibm_cloud as pywren\n",
- "except:\n",
- " !curl -fsSL \"https://git.io/fhe9X\" | sh\n",
- " import pywren_ibm_cloud as pywren\n",
  "try:\n",
  " import cv2\n",
  "except:\n",
@@ -150,6 +144,18 @@
  "import bz2"
  ]
  },
+ {
+ "cell_type": "code",
+ "execution_count": null,
+ "metadata": {},
+ "outputs": [],
+ "source": [
+ "#Install PyWren-IBM\n",
+ "import sys\n",
+ "sys.executable, sys.prefix\n",
+ "!{sys.executable} -m pip install -U pywren-ibm-cloud==1.0.9"
+ ]
+ },
  {
  "cell_type": "markdown",
  "metadata": {},
@@ -349,14 +355,17 @@
  "outputs": [],
  "source": [
  "config = {\n",
- " 'ibm_cf': {'endpoint': '<IBM Cloud Functions Endpoint>', \n",
- " 'namespace': '<NAMESPACE>', \n",
- " 'api_key': '<API KEY>'}}\n",
- "config['ibm_cos'] = {}\n",
- "config['ibm_cos']['endpoint'] = cos_endpoint\n",
- "config['ibm_cos']['api_key'] = cos_credentials['apikey']\n",
- "config['pywren'] = {}\n",
- "config['pywren']['storage_bucket'] = BUCKET"
+ " 'ibm_cf': {'endpoint': '<IBM Cloud Functions Endpoint>',\n",
+ " 'namespace': '<NAMESPACE>', \n",
+ " 'action_memory' : 512,\n",
+ " 'api_key': '<API KEY>'}, \n",
+ " 'ibm_cos': {\n",
+ " 'endpoint': cos_endpoint,\n",
+ " 'api_key' : cos_credentials['apikey']\n",
+ " },\n",
+ " 'pywren' : {'storage_bucket' : BUCKET,\n",
+ " 'runtime' : 'ibmfunctions/pywren-dlib-runtime:3.5'}\n",
+ "}"
  ]
  },
  {
@@ -366,16 +375,6 @@
  "The PyWren engine requires its server side component to be deployed in advance. This step creates a new IBM Cloud Functions function with the PyWren server side runtime. This action will be used internally by PyWren during execution phases."
  ]
  },
- {
- "cell_type": "code",
- "execution_count": null,
- "metadata": {},
- "outputs": [],
- "source": [
- "from pywren_ibm_cloud.deployutil import clone_runtime\n",
- "clone_runtime('ibmfunctions/pywren-dlib-runtime:3.5', config, 'pywren-ibm-cloud')"
- ]
- },
  {
  "cell_type": "markdown",
  "metadata": {},
@@ -631,7 +630,7 @@
  "outputs": [],
  "source": [
  "raw_images = BUCKET + '/images'\n",
- "pw = pywren.ibm_cf_executor(config=config, runtime='pywren-dlib-runtime_3.5')\n",
+ "pw = pywren.ibm_cf_executor(config=config)\n",
  "try:\n",
  " pw.map(preprocess_image, raw_images, remote_invocation=True)\n",
  " results = pw.get_result()\n",