Skip to content

Commit ffcd89c

Browse files
authored
Merge branch 'master' into master-fp-extra-data-source
2 parents 2971c88 + 3d0f660 commit ffcd89c

File tree

4 files changed

+27
-3
lines changed

4 files changed

+27
-3
lines changed

doc/api/inference/deserializers.rst

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
11
Deserializers
22
-------------
33

4-
.. automodule:: sagemaker.deserializers
4+
.. automodule:: sagemaker.base_deserializers
55
:members:
66
:undoc-members:
77
:show-inheritance:
88

9+
.. automodule:: sagemaker.deserializers
10+
:members:
11+
:undoc-members:
12+
:show-inheritance:

doc/api/inference/serializers.rst

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
11
Serializers
22
-----------
33

4-
.. automodule:: sagemaker.serializers
4+
.. automodule:: sagemaker.base_serializers
55
:members:
66
:undoc-members:
77
:show-inheritance:
88

9+
.. automodule:: sagemaker.serializers
10+
:members:
11+
:undoc-members:
12+
:show-inheritance:

doc/workflows/airflow/using_workflow.rst

+10
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,16 @@ the configuration dictionary in the SageMaker Python SDK. Currently, the followi
2222
* ``SageMakerTransformOperator``
2323
* ``SageMakerEndpointConfigOperator``
2424
* ``SageMakerEndpointOperator``
25+
* ``SageMakerProcessingOperator``
26+
* ``SageMakerDeleteModelOperator``
27+
* ``SageMakerStartPipelineOperator``
28+
* ``SageMakerStopPipelineOperator``
29+
* ``SageMakerRegisterModelVersionOperator``
30+
* ``SageMakerAutoMLOperator``
31+
* ``SageMakerCreateExperimentOperator``
32+
33+
You can look into `the Apache Airflow documentation <https://airflow.apache.org/docs/apache-airflow-providers-amazon/stable/operators/sagemaker.html>`_ for the full
34+
list of operators with examples.
2535

2636
2. PythonOperator: Airflow built-in operator that executes Python callables. You can use the PythonOperator to execute
2737
operations in the SageMaker Python SDK to create a SageMaker workflow.

tests/integ/sagemaker/jumpstart/retrieve_uri/test_transfer_learning.py

+7-1
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
from sagemaker import script_uris
2929
from sagemaker import model_uris
3030
from sagemaker import hyperparameters
31+
import pytest
3132

3233

3334
def test_jumpstart_transfer_learning_retrieve_functions(setup):
@@ -71,7 +72,12 @@ def test_jumpstart_transfer_learning_retrieve_functions(setup):
7172
base_name="huggingface",
7273
)
7374

74-
training_job.create_training_job()
75+
try:
76+
training_job.create_training_job()
77+
except Exception as e:
78+
if "ResourceInUse" in str(e):
79+
pytest.xfail("Known issue with conflicting resources.")
80+
raise
7581
training_job.wait_until_training_job_complete()
7682

7783
# inference

0 commit comments

Comments
 (0)