Container support for AWS

benchmarks/wrappers/aws/python/setup.py

@@ -0,0 +1,15 @@
+from distutils.core import setup
+from glob import glob
+from pkg_resources import parse_requirements
+
+with open('requirements.txt') as f:
+    requirements = [str(r) for r in parse_requirements(f)]
+
+setup(
+    name='function',
+    install_requires=requirements,
+    packages=['function'],
+    package_dir={'function': '.'},
+    package_data={'function': glob('**', recursive=True)},
+)
+

config/example.json

@@ -1,13 +1,14 @@
 {
   "experiments": {
-    "deployment": "openwhisk",
+    "deployment": "aws",
     "update_code": false,
     "update_storage": false,
-    "download_results": false, 
+    "download_results": false,
     "architecture": "arm64", 
+    "container_deployment": true,
     "runtime": {
-      "language": "nodejs",
-      "version": "16"
+      "language": "python",
+      "version": "3.8"
     },
     "type": "invocation-overhead",
     "perf-cost": {

config/systems.json

@@ -55,31 +55,46 @@
         }
       }
     },
-    "architecture": ["x64"]
+    "architecture": ["x64"],
+    "deployments": ["package"]
   },
   "aws": {
     "languages": {
       "python": {
         "base_images": {
-          "3.11": "amazon/aws-lambda-python:3.11",
-          "3.10": "amazon/aws-lambda-python:3.10",
-          "3.9": "amazon/aws-lambda-python:3.9",
-          "3.8": "amazon/aws-lambda-python:3.8"
+          "x64": {
+            "3.11": "amazon/aws-lambda-python:3.11",
+            "3.10": "amazon/aws-lambda-python:3.10",
+            "3.9": "amazon/aws-lambda-python:3.9",
+            "3.8": "amazon/aws-lambda-python:3.8"
+          },
+          "arm64": {
+            "3.11": "amazon/aws-lambda-python:3.11.2024.05.23.17",
+            "3.10": "amazon/aws-lambda-python:3.10.2024.06.19.11",
+            "3.9": "amazon/aws-lambda-python:3.9.2024.05.20.23",
+            "3.8": "amazon/aws-lambda-python:3.8.2024.09.05.16"
+          }
         },
         "images": [
           "build"
         ],
         "deployment": {
           "files": [
             "handler.py",
-            "storage.py"
+            "storage.py",
+            "setup.py"
           ],
           "packages": []
         }
       },
       "nodejs": {
         "base_images": {
-          "16": "amazon/aws-lambda-nodejs:16"
+          "x64": {
+            "16": "amazon/aws-lambda-nodejs:16"
+          },
+          "arm64": {
+            "16": "amazon/aws-lambda-nodejs:16.2024.09.06.13"
+          }
         },
         "images": [
           "build"
@@ -95,17 +110,20 @@
         }
       }
     },
-    "architecture": ["x64", "arm64"]
+    "architecture": ["x64", "arm64"],
+    "deployments": ["package", "container"]
   },
   "azure": {
     "languages": {
       "python": {
         "base_images": {
-          "3.7": "mcr.microsoft.com/azure-functions/python:3.0-python3.7",
-          "3.8": "mcr.microsoft.com/azure-functions/python:3.0-python3.8",
-          "3.9": "mcr.microsoft.com/azure-functions/python:3.0-python3.9",
-          "3.10": "mcr.microsoft.com/azure-functions/python:4-python3.10",
-          "3.11": "mcr.microsoft.com/azure-functions/python:4-python3.11"
+          "x64": {
+            "3.7": "mcr.microsoft.com/azure-functions/python:3.0-python3.7",
+            "3.8": "mcr.microsoft.com/azure-functions/python:3.0-python3.8",
+            "3.9": "mcr.microsoft.com/azure-functions/python:3.0-python3.9",
+            "3.10": "mcr.microsoft.com/azure-functions/python:4-python3.10",
+            "3.11": "mcr.microsoft.com/azure-functions/python:4-python3.11"
+          }
         },
         "images": [
           "build"
@@ -123,9 +141,11 @@
       },
       "nodejs": {
         "base_images": {
-          "16": "mcr.microsoft.com/azure-functions/node:4-node16",
-          "18": "mcr.microsoft.com/azure-functions/node:4-node18",
-          "20": "mcr.microsoft.com/azure-functions/node:4-node20"
+          "x64": {
+            "16": "mcr.microsoft.com/azure-functions/node:4-node16",
+            "18": "mcr.microsoft.com/azure-functions/node:4-node18",
+            "20": "mcr.microsoft.com/azure-functions/node:4-node20"
+          }
         },
         "images": [
           "build"
@@ -148,18 +168,21 @@
         "username": "docker_user"
       }
     },
-    "architecture": ["x64"]
+    "architecture": ["x64"],
+    "deployments": ["package"]
   },
   "gcp": {
     "languages": {
       "python": {
         "base_images": {
-          "3.7": "ubuntu:22.04",
-          "3.8": "ubuntu:22.04",
-          "3.9": "ubuntu:22.04",
-          "3.10": "ubuntu:22.04",
-          "3.11": "ubuntu:22.04",
-          "3.12": "ubuntu:22.04"
+          "x64": {
+            "3.7": "ubuntu:22.04",
+            "3.8": "ubuntu:22.04",
+            "3.9": "ubuntu:22.04",
+            "3.10": "ubuntu:22.04",
+            "3.11": "ubuntu:22.04",
+            "3.12": "ubuntu:22.04"
+          }
         },
         "images": [
           "build"
@@ -177,12 +200,14 @@
       },
       "nodejs": {
         "base_images": {
-          "10": "ubuntu:18.04",
-          "12": "ubuntu:18.04",
-          "14": "ubuntu:18.04",
-          "16": "ubuntu:18.04",
-          "18": "ubuntu:22.04",
-          "20": "ubuntu:22.04"
+          "x64": {
+            "10": "ubuntu:18.04",
+            "12": "ubuntu:18.04",
+            "14": "ubuntu:18.04",
+            "16": "ubuntu:18.04",
+            "18": "ubuntu:22.04",
+            "20": "ubuntu:22.04"
+          }
         },
         "images": [
           "build"
@@ -200,16 +225,19 @@
         }
       }
     },
-    "architecture": ["x64"]
+    "architecture": ["x64"],
+    "deployments": ["package"]
   },
   "openwhisk": {
     "languages": {
       "python": {
         "base_images": {
-          "3.7": "openwhisk/action-python-v3.7",
-          "3.9": "openwhisk/action-python-v3.9",
-          "3.10": "openwhisk/action-python-v3.10",
-          "3.11": "openwhisk/action-python-v3.11"
+          "x64": {
+            "3.7": "openwhisk/action-python-v3.7",
+            "3.9": "openwhisk/action-python-v3.9",
+            "3.10": "openwhisk/action-python-v3.10",
+            "3.11": "openwhisk/action-python-v3.11"
+          }
         },
         "images": [
           "function"
@@ -228,11 +256,13 @@
       },
       "nodejs": {
         "base_images": {
-          "10": "openwhisk/action-nodejs-v10",
-          "12": "openwhisk/action-nodejs-v12",
-          "14": "openwhisk/action-nodejs-v14",
-          "18": "openwhisk/action-nodejs-v18",
-          "20": "openwhisk/action-nodejs-v20"
+          "x64": {
+            "10": "openwhisk/action-nodejs-v10",
+            "12": "openwhisk/action-nodejs-v12",
+            "14": "openwhisk/action-nodejs-v14",
+            "18": "openwhisk/action-nodejs-v18",
+            "20": "openwhisk/action-nodejs-v20"
+          }
         },
         "images": [
           "function"
@@ -249,6 +279,7 @@
         }
       }
     },
-    "architecture": ["x64"]
+    "architecture": ["x64"],
+    "deployments": ["container"]
   }
 }

dockerfiles/aws/nodejs/Dockerfile.function

@@ -0,0 +1,9 @@
+ARG BASE_IMAGE
+FROM $BASE_IMAGE
+COPY . function/
+COPY handler.js .
+RUN cd function \
+    && npm install --no-package-lock --production \
+    && npm cache clean --force
+
+CMD ["handler.handler"]

dockerfiles/aws/python/Dockerfile.function

@@ -0,0 +1,22 @@
+ARG BASE_IMAGE
+FROM $BASE_IMAGE
+ARG VERSION
+ENV PYTHON_VERSION=${VERSION}
+
+COPY . function/
+
+RUN touch function/__init__.py
+RUN if test -f "function/requirements.txt.${PYTHON_VERSION}"; then \
+        pip install --no-cache-dir \
+            -r function/requirements.txt \
+            -r function/requirements.txt.${PYTHON_VERSION} \
+            function/ && \
+        pip cache purge; \
+    else \
+        pip install --no-cache-dir \
+            -r function/requirements.txt \
+            function/ && \
+        pip cache purge; \
+    fi
+
+CMD ["function/handler.handler"]

docs/modularity.md

@@ -340,7 +340,7 @@ This function has been retrieved from the cache and requires refreshing function
 In practice, this is often limited to updating logging handlers - see existing implementations for details.
 
 ```python
-    def update_function(self, function: Function, code_package: Benchmark):
+    def update_function(self, function: Function, code_package: Benchmark, container_deployment: bool, container_uri: str):
 ```
 
 This function updates the function's code and configuration in the platform.

docs/usage.md

@@ -4,8 +4,7 @@ For each command you can pass `--verbose` flag to increase the verbosity of the
 By default, all scripts will create a cache in the directory `cache` to store code with
 dependencies and information on allocated cloud resources.
 Benchmarks will be rebuilt after a change in source code is detected.
-To enforce redeployment of code and benchmark inputs please use flags `--update-code`
-and `--update-storage`, respectively.
+To enforce redeployment of code, benchmark inputs, container deployment (supported in AWS) please use flags `--update-code`, `--update-storage` and `--container-deployment` respectively.
 
 **Note:** The cache does not support updating the cloud region. If you want to deploy benchmarks
 to a new cloud region, then use a new cache directory.

requirements.aws.txt

@@ -2,5 +2,4 @@ boto3
 botocore
 flake8-boto3
 urllib3
-boto3-stubs
-boto3-stubs[lambda,s3,apigatewayv2,sts,logs,iam]
+boto3-stubs[lambda,s3,apigatewayv2,sts,logs,iam,ecr]

requirements.txt

@@ -18,4 +18,5 @@ scipy
 #
 pycurl>=7.43
 click>=7.1.2
+rich