Merge branch 'master' into master

Author: icywang86rui

tests/conftest.py

@@ -190,36 +190,9 @@ def pytorch_inference_py_version(pytorch_inference_version, request):
         return "py3"
 
 
-def _huggingface_base_fm_version(huggingface_vesion, base_fw):
-    config = image_uris.config_for_framework("huggingface")
-    training_config = config.get("training")
-    original_version = huggingface_vesion
-    if "version_aliases" in training_config:
-        huggingface_vesion = training_config.get("version_aliases").get(
-            huggingface_vesion, huggingface_vesion
-        )
-    version_config = training_config.get("versions").get(huggingface_vesion)
-    for key in list(version_config.keys()):
-        if key.startswith(base_fw):
-            base_fw_version = key[len(base_fw) :]
-            if len(original_version.split(".")) == 2:
-                base_fw_version = ".".join(base_fw_version.split(".")[:-1])
-            return base_fw_version
-
-
 @pytest.fixture(scope="module")
 def huggingface_pytorch_version(huggingface_training_version):
-    return _huggingface_base_fm_version(huggingface_training_version, "pytorch")
-
-
-@pytest.fixture(scope="module")
-def huggingface_pytorch_latest_version(huggingface_training_latest_version):
-    return _huggingface_base_fm_version(huggingface_training_latest_version, "pytorch")
-
-
-@pytest.fixture(scope="module")
-def huggingface_tensorflow_latest_version(huggingface_training_latest_version):
-    return _huggingface_base_fm_version(huggingface_training_latest_version, "tensorflow")
+    return _huggingface_base_fm_version(huggingface_training_version, "pytorch")[0]
 
 
 @pytest.fixture(scope="module")
@@ -395,6 +368,32 @@ def _generate_all_framework_version_fixtures(metafunc):
                 )
 
 
+def _huggingface_base_fm_version(huggingface_vesion, base_fw):
+    config = image_uris.config_for_framework("huggingface")
+    training_config = config.get("training")
+    original_version = huggingface_vesion
+    if "version_aliases" in training_config:
+        huggingface_vesion = training_config.get("version_aliases").get(
+            huggingface_vesion, huggingface_vesion
+        )
+    version_config = training_config.get("versions").get(huggingface_vesion)
+    versions = list()
+    for key in list(version_config.keys()):
+        if key.startswith(base_fw):
+            base_fw_version = key[len(base_fw) :]
+            if len(original_version.split(".")) == 2:
+                base_fw_version = ".".join(base_fw_version.split(".")[:-1])
+            versions.append(base_fw_version)
+    return versions
+
+
+def _generate_huggingface_base_fw_latest_versions(metafunc, huggingface_version, base_fw):
+    versions = _huggingface_base_fm_version(huggingface_version, base_fw)
+    fixture_name = f"huggingface_{base_fw}_latest_version"
+    if fixture_name in metafunc.fixturenames:
+        metafunc.parametrize(fixture_name, versions, scope="session")
+
+
 def _parametrize_framework_version_fixtures(metafunc, fixture_prefix, config):
     fixture_name = "{}_version".format(fixture_prefix)
     if fixture_name in metafunc.fixturenames:
@@ -407,6 +406,10 @@ def _parametrize_framework_version_fixtures(metafunc, fixture_prefix, config):
     if fixture_name in metafunc.fixturenames:
         metafunc.parametrize(fixture_name, (latest_version,), scope="session")
 
+    if "huggingface" in fixture_prefix:
+        _generate_huggingface_base_fw_latest_versions(metafunc, latest_version, "pytorch")
+        _generate_huggingface_base_fw_latest_versions(metafunc, latest_version, "tensorflow")
+
     fixture_name = "{}_latest_py_version".format(fixture_prefix)
     if fixture_name in metafunc.fixturenames:
         config = config["versions"]