cortexlabs · RobertLucian · May 27, 2021 · May 24, 2021 · May 24, 2021 · May 24, 2021
diff --git a/build/build-image.sh b/build/build-image.sh
@@ -22,20 +22,20 @@ ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")"/.. >/dev/null && pwd)"
 CORTEX_VERSION=master
 
 image=$1
+image_type=$2
 
 if [ "$image" == "inferentia" ]; then
   aws ecr get-login-password --region us-west-2 | docker login --username AWS --password-stdin 790709498068.dkr.ecr.us-west-2.amazonaws.com
 fi
 
-build_args=""
-
-if [ "${image}" == "python-handler-gpu" ]; then
-  cuda=("10.0" "10.1" "10.1" "10.2" "10.2" "11.0" "11.1")
-  cudnn=("7" "7" "8" "7" "8" "8" "8")
-  for i in ${!cudnn[@]}; do
-    build_args="${build_args} --build-arg CUDA_VERSION=${cuda[$i]} --build-arg CUDNN=${cudnn[$i]}"
-    docker build "$ROOT" -f $ROOT/images/$image/Dockerfile $build_args -t quay.io/cortexlabs/${image}:${CORTEX_VERSION}-cuda${cuda[$i]}-cudnn${cudnn[$i]} -t cortexlabs/${image}:${CORTEX_VERSION}-cuda${cuda[$i]}-cudnn${cudnn[$i]}
-  done
-else
+if [ "$image_type" = "non-api" ]; then
   docker build "$ROOT" -f $ROOT/images/$image/Dockerfile $build_args -t quay.io/cortexlabs/${image}:${CORTEX_VERSION} -t cortexlabs/${image}:${CORTEX_VERSION}
+else
+  num_words="$(awk -F'-' '{ for(i=1;i<=NF;i++) print $i }' <<< ${image} | wc -l | sed -e 's/^[[:space:]]*//')"
+  kind_dir="$( cut -d '-' -f 1 <<< "${image}" )"
+  api_name="$( cut -d '-' -f 2-$((num_words-1)) <<< "${image}" )"
+  compute_type="$( cut -d '-' -f ${num_words} <<< "${image}" )"
+
+  dir="${ROOT}/test/apis/${kind_dir}/${api_name}"
+  docker build $dir -f $dir/$api_name-$compute_type.dockerfile -t cortexlabs/$image:${CORTEX_VERSION}
 fi
diff --git a/build/build-images.sh b/build/build-images.sh
@@ -23,10 +23,23 @@ source $ROOT/build/images.sh
 source $ROOT/dev/util.sh
 
 # if parallel utility is installed, the docker build commands will be parallelized
+non_api_images=(
+  "${dev_images[@]}"
+  "${non_dev_images[@]}"
+)
 if command -v parallel &> /dev/null && [ -n "${NUM_BUILD_PROCS+set}" ] && [ "$NUM_BUILD_PROCS" != "1" ]; then
-  ROOT=$ROOT SHELL=$(type -p /bin/bash) parallel --will-cite --halt now,fail=1 --eta --jobs $NUM_BUILD_PROCS $ROOT/build/build-image.sh {} ::: "${all_images[@]}"
+  ROOT=$ROOT SHELL=$(type -p /bin/bash) parallel --will-cite --halt now,fail=1 --eta --jobs $NUM_BUILD_PROCS $ROOT/build/build-image.sh {} "non-api" ::: "${non_api_images[@]}"
 else
-  for image in "${all_images[@]}"; do
-    $ROOT/build/build-image.sh $image
+  for image in "${non_api_images[@]}"; do
+    $ROOT/build/build-image.sh $image "non-api"
+  done
+fi
+
+# if parallel utility is installed, the docker build commands will be parallelized
+if command -v parallel &> /dev/null && [ -n "${NUM_BUILD_PROCS+set}" ] && [ "$NUM_BUILD_PROCS" != "1" ]; then
+  ROOT=$ROOT SHELL=$(type -p /bin/bash) parallel --will-cite --halt now,fail=1 --eta --jobs $NUM_BUILD_PROCS $ROOT/build/build-image.sh {} "api" ::: "${api_images[@]}"
+else
+  for image in "${api_images[@]}"; do
+    $ROOT/build/build-image.sh $image "api"
   done
 fi
diff --git a/build/images.sh b/build/images.sh
@@ -20,10 +20,19 @@
 set -euo pipefail
 
 api_images=(
-  "python-handler-cpu"
-  "python-handler-gpu"
-  "tensorflow-handler"
-  "python-handler-inf"
+  "async-text-generator-cpu"
+  "async-text-generator-gpu"
+  "batch-image-classifier-alexnet-cpu"
+  "batch-image-classifier-alexnet-gpu"
+  "batch-sum-cpu"
+  "realtime-image-classifier-resnet50-cpu"
+  "realtime-image-classifier-resnet50-gpu"
+  "realtime-prime-generator-cpu"
+  "realtime-sleep-cpu"
+  "realtime-text-generator-cpu"
+  "realtime-text-generator-gpu"
+  "task-iris-classifier-trainer-cpu"
+  "trafficsplitter-prime-generator-cpu"
 )
 
 dev_images=(

diff --git a/build/push-image.sh b/build/push-image.sh
@@ -23,13 +23,4 @@ host=$1
 image=$2
 
 echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
-
-if [ "$image" == "python-handler-gpu" ]; then
-  cuda=("10.0" "10.1" "10.1" "10.2" "10.2" "11.0" "11.1")
-  cudnn=("7" "7" "8" "7" "8" "8" "8")
-  for i in ${!cudnn[@]}; do
-    docker push $host/cortexlabs/${image}:${CORTEX_VERSION}-cuda${cuda[$i]}-cudnn${cudnn[$i]}
-  done
-else
-  docker push $host/cortexlabs/${image}:${CORTEX_VERSION}
-fi
+docker push $host/cortexlabs/${image}:${CORTEX_VERSION}
diff --git a/dev/export_images.sh b/dev/export_images.sh
@@ -40,23 +40,10 @@ for image in "${all_images[@]}"; do
 done
 echo
 
-cuda=("10.0" "10.1" "10.1" "10.2" "10.2" "11.0" "11.1")
-cudnn=("7" "7" "8" "7" "8" "8" "8")
-
 # pull the images from source registry and push them to ECR
 for image in "${all_images[@]}"; do
-    # copy the different cuda/cudnn variations of the python handler image
-    if [ "$image" = "python-handler-gpu" ]; then
-        for i in "${!cuda[@]}"; do
-            full_image="$image:$cortex_version-cuda${cuda[$i]}-cudnn${cudnn[$i]}"
-            echo "copying $full_image from $source_registry to $destination_registry"
-            skopeo copy --src-no-creds "docker://$source_registry/$full_image" "docker://$destination_registry/$full_image"
-            echo
-        done
-    else
-        echo "copying $image:$cortex_version from $source_registry to $destination_registry"
-        skopeo copy --src-no-creds "docker://$source_registry/$image:$cortex_version" "docker://$destination_registry/$image:$cortex_version"
-        echo
-    fi
+    echo "copying $image:$cortex_version from $source_registry to $destination_registry"
+    skopeo copy --src-no-creds "docker://$source_registry/$image:$cortex_version" "docker://$destination_registry/$image:$cortex_version"
+    echo
 done
 echo "done ✓"
diff --git a/dev/registry.sh b/dev/registry.sh
@@ -106,17 +106,27 @@ function create_ecr_repository() {
 function build() {
   local image=$1
   local tag=$2
-  local dir="${ROOT}/images/${image}"
-
-  build_args=""
+  local image_type=$3
 
   tag_args=""
   if [ -n "$AWS_ACCOUNT_ID" ] && [ -n "$AWS_REGION" ]; then
     tag_args+=" -t $AWS_ACCOUNT_ID.dkr.ecr.$AWS_REGION.amazonaws.com/cortexlabs/$image:$tag"
   fi
 
   blue_echo "Building $image:$tag..."
-  docker build $ROOT -f $dir/Dockerfile -t cortexlabs/$image:$tag $tag_args $build_args
+  if [ "$image_type" = "non-api" ]; then
+    local dir="${ROOT}/images/${image}"
+    docker build $ROOT -f $dir/Dockerfile -t cortexlabs/$image:$tag $tag_args
+  else
+    local num_words="$(awk -F'-' '{ for(i=1;i<=NF;i++) print $i }' <<< ${image} | wc -l | sed -e 's/^[[:space:]]*//')"
+    local kind_dir="$( cut -d '-' -f 1 <<< "${image}" )"
+    local api_name="$( cut -d '-' -f 2-$((num_words-1)) <<< "${image}" )"
+    local compute_type="$( cut -d '-' -f ${num_words} <<< "${image}" )"
+
+    local dir="${ROOT}/test/apis/${kind_dir}/${api_name}"
+    echo "docker build $dir -f $api_name-$compute_type.dockerfile -t cortexlabs/$image:$tag $tag_args"
+    docker build $dir -f $dir/$api_name-$compute_type.dockerfile -t cortexlabs/$image:$tag $tag_args
+  fi
   green_echo "Built $image:$tag\n"
 }
 
@@ -146,15 +156,12 @@ function push() {
 
 function build_and_push() {
   local image=$1
+  local image_type=$2
 
   set -euo pipefail  # necessary since this is called in a new shell by parallel
 
   tag=$CORTEX_VERSION
-  if [ "${image}" == "python-handler-gpu" ]; then
-    tag="${CORTEX_VERSION}-cuda10.2-cudnn8"
-  fi
-
-  build $image $tag
+  build $image $tag $image_type
   push $image $tag
 }
 
@@ -225,7 +232,7 @@ elif [ "$cmd" = "update-single" ]; then
   if [ "$image" = "operator" ] || [ "$image" = "proxy" ]; then
     cache_builder $image
   fi
-  build_and_push $image
+  build_and_push $image "non-api"
 
 # usage: registry.sh update all|dev|api
 # if parallel utility is installed, the docker build commands will be parallelized
@@ -240,8 +247,6 @@ elif [ "$cmd" = "update" ]; then
     images_to_build+=( "${dev_images[@]}" )
   fi
 
-  images_to_build+=( "${api_images[@]}" )
-
   if [[ " ${images_to_build[@]} " =~ " operator " ]]; then
     cache_builder operator
   fi
@@ -252,11 +257,21 @@ elif [ "$cmd" = "update" ]; then
     cache_builder async-gateway
   fi
 
+  # build non-api images
   if command -v parallel &> /dev/null && [ -n "${NUM_BUILD_PROCS+set}" ] && [ "$NUM_BUILD_PROCS" != "1" ]; then
-    is_registry_logged_in=$is_registry_logged_in ROOT=$ROOT registry_push_url=$registry_push_url SHELL=$(type -p /bin/bash) parallel --will-cite --halt now,fail=1 --eta --jobs $NUM_BUILD_PROCS build_and_push "{}" ::: "${images_to_build[@]}"
+    is_registry_logged_in=$is_registry_logged_in ROOT=$ROOT registry_push_url=$registry_push_url SHELL=$(type -p /bin/bash) parallel --will-cite --halt now,fail=1 --eta --jobs $NUM_BUILD_PROCS build_and_push "{}" "non-api"::: "${images_to_build[@]}"
   else
     for image in "${images_to_build[@]}"; do
-      build_and_push $image
+      build_and_push $image "non-api"
+    done
+  fi
+
+  # build api images
+  if command -v parallel &> /dev/null && [ -n "${NUM_BUILD_PROCS+set}" ] && [ "$NUM_BUILD_PROCS" != "1" ]; then
+    is_registry_logged_in=$is_registry_logged_in ROOT=$ROOT registry_push_url=$registry_push_url SHELL=$(type -p /bin/bash) parallel --will-cite --halt now,fail=1 --eta --jobs $NUM_BUILD_PROCS build_and_push "{}" "api" ::: "${api_images[@]}"
+  else
+    for image in "${api_images[@]}"; do
+      build_and_push $image "api"
     done
   fi
 

diff --git a/test/apis/README.md b/test/apis/README.md
diff --git a/test/apis/async/iris-classifier/cortex.yaml b/test/apis/async/iris-classifier/cortex.yaml
diff --git a/test/apis/async/iris-classifier/expectations.yaml b/test/apis/async/iris-classifier/expectations.yaml
diff --git a/test/apis/async/iris-classifier/handler.py b/test/apis/async/iris-classifier/handler.py
diff --git a/test/apis/async/iris-classifier/requirements.txt b/test/apis/async/iris-classifier/requirements.txt
diff --git a/test/apis/async/iris-classifier/sample.json b/test/apis/async/iris-classifier/sample.json
diff --git a/test/apis/async/tensorflow/cortex.yaml b/test/apis/async/tensorflow/cortex.yaml
diff --git a/test/apis/async/tensorflow/handler.py b/test/apis/async/tensorflow/handler.py
diff --git a/test/apis/async/tensorflow/sample.json b/test/apis/async/tensorflow/sample.json
diff --git a/test/apis/async/text-generator/.dockerignore b/test/apis/async/text-generator/.dockerignore
@@ -0,0 +1,9 @@
+Dockerfile
+README.md
+sample.json
+expectations.yaml
+*.pyc
+*.pyo
+*.pyd
+__pycache__
+.pytest_cache
diff --git a/test/apis/async/text-generator/cortex_cpu.yaml b/test/apis/async/text-generator/cortex_cpu.yaml
@@ -0,0 +1,16 @@
+- name: text-generator
+  kind: AsyncAPI
+  pod:
+    port: 9000
+    containers:
+    - name: api
+      image: 499593605069.dkr.ecr.us-west-2.amazonaws.com/cortexlabs/realtime-async-text-generator-cpu:master
+      readiness_probe:
+        http_get:
+          path: "/healthz"
+          port: 9000
+      compute:
+        cpu: 1
+        mem: 2.5G
+  autoscaling:
+    max_concurrency: 1