fix: updates based on PR feedback, fix fixture

Author: metrizable

tests/conftest.py

@@ -285,21 +285,6 @@ def sklearn_full_version(request):
     return request.config.getoption("--sklearn-full-version")
 
 
-@pytest.fixture(scope="module")
-def tf_latest_version(request, tf_full_version):
-    return request.param
-
-
-@pytest.fixture(scope="module")
-def tf_latest_py_version():
-    return "py37"
-
-
-@pytest.fixture(scope="module")
-def tf_latest_serving_version():
-    return "2.1.0"
-
-
 @pytest.fixture(scope="module")
 def tf_full_version(request):
     return request.config.getoption("--tf-full-version")
@@ -323,10 +308,11 @@ def tf_full_py_version(tf_full_version):
 
 
 @pytest.fixture(scope="module")
-def tf_serving_version(tf_full_version, tf_latest_version, tf_latest_serving_version):
-    if tf_full_version == tf_latest_version:
-        return tf_latest_serving_version
-    return tf_full_version
+def tf_serving_version(tf_full_version):
+    full_version = [int(val) for val in tf_full_version.split(".")]
+    if full_version < [2, 2]:
+        return tf_full_version
+    return "2.1.0"
 
 
 @pytest.fixture(scope="module", params=["1.15.0", "2.0.0"])

tests/integ/test_airflow_config.py

@@ -550,7 +550,7 @@ def test_sklearn_airflow_config_uploads_data_source_to_s3(
 
 @pytest.mark.canary_quick
 def test_tf_airflow_config_uploads_data_source_to_s3(
-    sagemaker_session, cpu_instance_type, tf_latest_version, tf_latest_py_version
+    sagemaker_session, cpu_instance_type, tf_full_version, tf_full_py_version
 ):
     with timeout(seconds=AIRFLOW_CONFIG_TIMEOUT_IN_SECONDS):
         tf = TensorFlow(
@@ -562,8 +562,8 @@ def test_tf_airflow_config_uploads_data_source_to_s3(
             train_instance_count=SINGLE_INSTANCE_COUNT,
             train_instance_type=cpu_instance_type,
             sagemaker_session=sagemaker_session,
-            framework_version=tf_latest_version,
-            py_version=tf_latest_py_version,
+            framework_version=tf_full_version,
+            py_version=tf_full_py_version,
             metric_definitions=[
                 {"Name": "train:global_steps", "Regex": r"global_step\/sec:\s(.*)"}
             ],

tests/integ/test_tf.py

@@ -147,7 +147,7 @@ def test_mnist_distributed(sagemaker_session, instance_type, tf_full_version, tf
     )
 
 
-def test_mnist_async(sagemaker_session, cpu_instance_type, tf_latest_serving_version):
+def test_mnist_async(sagemaker_session, cpu_instance_type, tf_serving_version):
     estimator = TensorFlow(
         entry_point=SCRIPT,
         role=ROLE,
@@ -156,7 +156,7 @@ def test_mnist_async(sagemaker_session, cpu_instance_type, tf_latest_serving_ver
         py_version=PYTHON_VERSION,
         sagemaker_session=sagemaker_session,
         # testing py-sdk functionality, no need to run against all TF versions
-        framework_version=tf_latest_serving_version,
+        framework_version=tf_serving_version,
         tags=TAGS,
     )
     inputs = estimator.sagemaker_session.upload_data(

tests/integ/test_tf_efs_fsx.py

@@ -55,7 +55,7 @@ def efs_fsx_setup(sagemaker_session, ec2_instance_type):
     reason="EFS integration tests need to be fixed before running in all regions.",
 )
 def test_mnist_efs(
-    efs_fsx_setup, sagemaker_session, cpu_instance_type, tf_latest_version, tf_latest_py_version
+    efs_fsx_setup, sagemaker_session, cpu_instance_type, tf_full_version, tf_full_py_version
 ):
     role = efs_fsx_setup["role_name"]
     subnets = [efs_fsx_setup["subnet_id"]]
@@ -67,8 +67,8 @@ def test_mnist_efs(
         train_instance_count=1,
         train_instance_type=cpu_instance_type,
         sagemaker_session=sagemaker_session,
-        framework_version=tf_latest_version,
-        py_version=tf_latest_py_version,
+        framework_version=tf_full_version,
+        py_version=tf_full_py_version,
         subnets=subnets,
         security_group_ids=security_group_ids,
     )
@@ -96,7 +96,7 @@ def test_mnist_efs(
     reason="EFS integration tests need to be fixed before running in all regions.",
 )
 def test_mnist_lustre(
-    efs_fsx_setup, sagemaker_session, cpu_instance_type, tf_latest_version, tf_latest_py_version
+    efs_fsx_setup, sagemaker_session, cpu_instance_type, tf_full_version, tf_full_py_version
 ):
     role = efs_fsx_setup["role_name"]
     subnets = [efs_fsx_setup["subnet_id"]]
@@ -108,8 +108,8 @@ def test_mnist_lustre(
         train_instance_count=1,
         train_instance_type=cpu_instance_type,
         sagemaker_session=sagemaker_session,
-        framework_version=tf_latest_version,
-        py_version=tf_latest_py_version,
+        framework_version=tf_full_version,
+        py_version=tf_full_py_version,
         subnets=subnets,
         security_group_ids=security_group_ids,
     )
@@ -133,7 +133,7 @@ def test_mnist_lustre(
     reason="EFS integration tests need to be fixed before running in all regions.",
 )
 def test_tuning_tf_efs(
-    efs_fsx_setup, sagemaker_session, cpu_instance_type, tf_latest_version, tf_latest_py_version
+    efs_fsx_setup, sagemaker_session, cpu_instance_type, tf_full_version, tf_full_py_version
 ):
     role = efs_fsx_setup["role_name"]
     subnets = [efs_fsx_setup["subnet_id"]]
@@ -145,8 +145,8 @@ def test_tuning_tf_efs(
         train_instance_count=1,
         train_instance_type=cpu_instance_type,
         sagemaker_session=sagemaker_session,
-        framework_version=tf_latest_version,
-        py_version=tf_latest_py_version,
+        framework_version=tf_full_version,
+        py_version=tf_full_py_version,
         subnets=subnets,
         security_group_ids=security_group_ids,
     )
@@ -182,7 +182,7 @@ def test_tuning_tf_efs(
     reason="EFS integration tests need to be fixed before running in all regions.",
 )
 def test_tuning_tf_lustre(
-    efs_fsx_setup, sagemaker_session, cpu_instance_type, tf_latest_version, tf_latest_py_version
+    efs_fsx_setup, sagemaker_session, cpu_instance_type, tf_full_version, tf_full_py_version
 ):
     role = efs_fsx_setup["role_name"]
     subnets = [efs_fsx_setup["subnet_id"]]
@@ -194,8 +194,8 @@ def test_tuning_tf_lustre(
         train_instance_count=1,
         train_instance_type=cpu_instance_type,
         sagemaker_session=sagemaker_session,
-        framework_version=tf_latest_version,
-        py_version=tf_latest_py_version,
+        framework_version=tf_full_version,
+        py_version=tf_full_py_version,
         subnets=subnets,
         security_group_ids=security_group_ids,
     )

tests/integ/test_transformer.py

@@ -345,7 +345,7 @@ def test_transform_mxnet_logs(
 
 
 def test_transform_tf_kms_network_isolation(
-    sagemaker_session, cpu_instance_type, tmpdir, tf_latest_serving_version
+    sagemaker_session, cpu_instance_type, tmpdir, tf_serving_version
 ):
     data_path = os.path.join(DATA_DIR, "tensorflow_mnist")
 
@@ -354,7 +354,7 @@ def test_transform_tf_kms_network_isolation(
         role="SageMakerRole",
         train_instance_count=1,
         train_instance_type=cpu_instance_type,
-        framework_version=tf_latest_serving_version,
+        framework_version=tf_serving_version,
         py_version=PYTHON_VERSION,
         sagemaker_session=sagemaker_session,
     )