change: upgrade TF Serving version to TF2.3.0

Author: wanyixia

src/sagemaker/image_uri_config/tensorflow.json

@@ -10,7 +10,8 @@
             "1.13": "1.13.0",
             "1.14": "1.14.0",
             "1.15": "1.15.0",
-            "2.0": "2.0.0"
+            "2.0": "2.0.0",
+            "2.3": "2.3.0"
         },
         "versions": {
             "1.10.0": {
@@ -190,6 +191,35 @@
                 },
                 "repository": "tensorflow-inference-eia"
             },
+            "2.0.0": {
+                "registries": {
+                    "af-south-1": "626614931356",
+                    "ap-east-1": "871362719292",
+                    "ap-northeast-1": "763104351884",
+                    "ap-northeast-2": "763104351884",
+                    "ap-south-1": "763104351884",
+                    "ap-southeast-1": "763104351884",
+                    "ap-southeast-2": "763104351884",
+                    "ca-central-1": "763104351884",
+                    "cn-north-1": "727897471807",
+                    "cn-northwest-1": "727897471807",
+                    "eu-central-1": "763104351884",
+                    "eu-north-1": "763104351884",
+                    "eu-south-1": "692866216735",
+                    "eu-west-1": "763104351884",
+                    "eu-west-2": "763104351884",
+                    "eu-west-3": "763104351884",
+                    "me-south-1": "217643126080",
+                    "sa-east-1": "763104351884",
+                    "us-east-1": "763104351884",
+                    "us-east-2": "763104351884",
+                    "us-gov-west-1": "442386744353",
+                    "us-iso-east-1": "886529160074",
+                    "us-west-1": "763104351884",
+                    "us-west-2": "763104351884"
+                },
+                "repository": "tensorflow-inference-eia"
+            },
             "2.0.0": {
                 "registries": {
                     "af-south-1": "626614931356",

src/sagemaker/tensorflow/model.py

@@ -118,7 +118,7 @@ class TensorFlowModel(sagemaker.model.FrameworkModel):
         logging.ERROR: "error",
         logging.CRITICAL: "crit",
     }
-    LATEST_EIA_VERSION = [2, 0]
+    LATEST_EIA_VERSION = [2, 3]
 
     def __init__(
         self,

tests/data/cuteCat.jpg

@@ -138,6 +138,42 @@ def tfs_predictor_with_accelerator(
         yield predictor
 
 
+@pytest.fixture(scope="module")
+def tfs_trt_predictor_with_accelerator(
+    sagemaker_session, tensorflow_eia_latest_version, cpu_instance_type
+):
+    endpoint_name = sagemaker.utils.unique_name_from_base("sagemaker-tensorflow-serving")
+    model_data = sagemaker_session.upload_data(
+        path=os.path.join(tests.integ.DATA_DIR, "tensorflow-serving-test-model.tar.gz"),
+        key_prefix="tensorflow-serving/compiledmodels",
+    )
+    bucket = sagemaker_session.default_bucket()
+    with tests.integ.timeout.timeout_and_delete_endpoint_by_name(endpoint_name, sagemaker_session):
+        model = TensorFlowModel(
+            model_data=model_data,
+            role="SageMakerRole",
+            framework_version=tensorflow_eia_latest_version,
+            sagemaker_session=sagemaker_session,
+            name=endpoint_name,
+        )
+        data_shape = {"input": [1, 224, 224, 3]}
+        tfs_eia_compilation_job_name = "tfs_eia_compilation_job_name"
+        compiled_model_path = "s3://{}/{}/output".format(bucket, tfs_eia_compilation_job_name)
+        compiled_model = model.compile(
+            target_instance_family='ml_eia2',
+            input_shape=data_shape,
+            output_path=compiled_model_path,
+            role="SageMakerRole",
+            job_name=tfs_eia_compilation_job_name,
+            framework='tensorflow',
+            framework_version='2.3'
+        )
+        predictor = compiled_model.deploy(
+            1, cpu_instance_type, endpoint_name=endpoint_name, accelerator_type="ml.eia2.large"
+        )
+        yield predictor
+
+
 @pytest.mark.release
 def test_predict(tfs_predictor):
     input_data = {"instances": [1.0, 2.0, 5.0]}
@@ -160,6 +196,23 @@ def test_predict_with_accelerator(tfs_predictor_with_accelerator):
     assert expected_result == result
 
 
+@pytest.mark.skipif(
+    tests.integ.test_region() not in tests.integ.EI_SUPPORTED_REGIONS,
+    reason="EI is not supported in region {}".format(tests.integ.test_region()),
+)
+@pytest.mark.release
+def test_trt_predict_with_accelerator(tfs_predictor_with_accelerator):
+    import numpy as np
+    import matplotlib.image as mpimg
+    path = os.path.join(tests.integ.DATA_DIR, "cuteCat.jpg")
+    img = mpimg.imread(path)
+    img = np.resize(img, (299, 299, 3))
+    img = np.expand_dims(img, axis=0)
+    input_data = {"inputs": img}
+    result = tfs_trt_predictor_with_accelerator.predict(input_data)
+    print("trt predictor result is: " + result)
+
+
 @pytest.mark.local_mode
 def test_predict_with_entry_point(tfs_predictor_with_model_and_entry_point_same_tar):
     input_data = {"instances": [1.0, 2.0, 5.0]}

tests/integ/test_tfs.py

@@ -142,15 +142,6 @@ def test_tfs_model_image_accelerator_not_supported(sagemaker_session):
 
     model.deploy(instance_type="ml.c4.xlarge", initial_instance_count=1)
 
-    with pytest.raises(AttributeError) as e:
-        model.deploy(
-            instance_type="ml.c4.xlarge",
-            accelerator_type="ml.eia1.medium",
-            initial_instance_count=1,
-        )
-
-    assert str(e.value) == "The TensorFlow version 2.1 doesn't support EIA."
-
 
 def test_tfs_model_with_log_level(sagemaker_session, tensorflow_inference_version):
     model = TensorFlowModel(