Merge branch 'master' into fix-processing-image-uri-param

Author: jerrypeng7773

CHANGELOG.md

@@ -1,5 +1,32 @@
 # Changelog
 
+## v2.98.0 (2022-07-05)
+
+### Features
+
+ * Adding deepar image
+
+### Documentation Changes
+
+ * edit to clarify how to use inference.py
+
+## v2.97.0 (2022-06-28)
+
+### Deprecations and Removals
+
+ * remove support for python 3.6
+
+### Features
+
+ * update prebuilt models documentation
+
+### Bug Fixes and Other Changes
+
+ * Skipping test_candidate_estimator_default_rerun_and_deploy
+ * Update model name from 'compiled.pt' to 'model.pth' for neo
+ * update pytest, skip hf integ temp
+ * Add override_pipeline_parameter_var decorator to give grace period to update invalid pipeline var args
+
 ## v2.96.0 (2022-06-20)
 
 ### Features

VERSION

@@ -1 +1 @@
-2.96.1.dev0
+2.98.1.dev0

doc/frameworks/tensorflow/using_tf.rst

@@ -759,7 +759,7 @@ Create Python Scripts for Custom Input and Output Formats
 ---------------------------------------------------------
 
 You can add your customized Python code to process your input and output data.
-This customized Python code must be named ``inference.py`` and specified through the ``entry_point`` parameter:
+This customized Python code must be named ``inference.py`` and is specified through the ``entry_point`` parameter:
 
 .. code::
 
@@ -769,6 +769,8 @@ This customized Python code must be named ``inference.py`` and specified through
                             model_data='s3://mybucket/model.tar.gz',
                             role='MySageMakerRole')
 
+In the example above, ``inference.py`` is assumed to be a file inside ``model.tar.gz``. If you want to use a local file instead, you must add the ``source_dir`` argument. See the documentation on `TensorFlowModel <https://sagemaker.readthedocs.io/en/stable/frameworks/tensorflow/sagemaker.tensorflow.html#sagemaker.tensorflow.model.TensorFlowModel>`_.
+
 How to implement the pre- and/or post-processing handler(s)
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 

requirements/extras/test_requirements.txt

@@ -1,6 +1,6 @@
 tox==3.24.5
 flake8==4.0.1
-pytest==6.0.2
+pytest==6.2.5
 pytest-cov==3.0.0
 pytest-rerunfailures==10.2
 pytest-timeout==2.1.0

src/sagemaker/image_uri_config/forecasting-deepar.json

@@ -7,6 +7,7 @@
                 "ap-east-1": "286214385809",
                 "ap-northeast-1": "633353088612",
                 "ap-northeast-2": "204372634319",
+                "ap-northeast-3": "867004704886",
                 "ap-south-1": "991648021394",
                 "ap-southeast-1": "475088953585",
                 "ap-southeast-2": "514117268639",

tests/data/pytorch_neo/code/inference.py

@@ -71,8 +71,8 @@ def model_fn(model_dir):
     logger.info("model_fn")
     neopytorch.config(model_dir=model_dir, neo_runtime=True)
     device = torch.device("cuda" if torch.cuda.is_available() else "cpu")
-    # The compiled model is saved as "compiled.pt"
-    model = torch.jit.load(os.path.join(model_dir, "compiled.pt"), map_location=device)
+    # The compiled model is saved as "model.pth"
+    model = torch.jit.load(os.path.join(model_dir, "model.pth"), map_location=device)
 
     # It is recommended to run warm-up inference during model load
     sample_input_path = os.path.join(model_dir, "sample_input.pkl")

tests/integ/test_auto_ml.py

@@ -293,6 +293,9 @@ def test_deploy_best_candidate(sagemaker_session, cpu_instance_type):
     tests.integ.test_region() in tests.integ.NO_AUTO_ML_REGIONS,
     reason="AutoML is not supported in the region yet.",
 )
+@pytest.mark.skip(
+    reason="",
+)
 def test_candidate_estimator_default_rerun_and_deploy(sagemaker_session, cpu_instance_type):
     auto_ml_utils.create_auto_ml_job_if_not_exist(sagemaker_session)
 

tests/integ/test_huggingface.py

@@ -116,6 +116,9 @@ def test_huggingface_training(
     and integ.test_region() in integ.TRAINING_NO_P3_REGIONS,
     reason="no ml.p2 or ml.p3 instances in this region",
 )
+@pytest.mark.skip(
+    reason="need to re enable it later t.corp:V609860141",
+)
 def test_huggingface_training_tf(
     sagemaker_session,
     gpu_instance_type,