Remove training packages from onnxruntime-ios-packaging-pipeline (microsoft#25451)

### Description
remove support for multiple package variants (`Full` and `Training`) in
the Apple packaging pipeline, consolidating the codebase to only support
the `Full` variant. The changes simplify the code by eliminating the
`PackageVariant` enum, related logic, and configuration files for the
`Training` variant.

---------

Co-authored-by: Edward Chen <18449977+edgchen1@users.noreply.github.com>

Author: vraspar

tools/ci_build/build.py

@@ -1668,8 +1668,6 @@ def run_ios_tests(args, source_dir, config, cwd):
                 dynamic_framework_dir,
                 "--framework_info_file",
                 framework_info_file,
-                "--variant",
-                "Full",
                 "--skip_macos_test",
             ],
             cwd=cwd,
@@ -1683,8 +1681,6 @@ def run_ios_tests(args, source_dir, config, cwd):
                 static_framework_dir,
                 "--framework_info_file",
                 framework_info_file,
-                "--variant",
-                "Full",
                 "--skip_macos_test",
             ],
             cwd=cwd,

tools/ci_build/github/apple/build_and_assemble_apple_pods.py

@@ -14,7 +14,7 @@
 import tempfile
 
 from c.assemble_c_pod_package import assemble_c_pod_package
-from package_assembly_utils import PackageVariant, get_ort_version
+from package_assembly_utils import get_ort_version
 
 from objectivec.assemble_objc_pod_package import assemble_objc_pod_package
 
@@ -53,13 +53,6 @@ def parse_args():
         help="The version string of the pod. The same version is used for all pods.",
     )
 
-    parser.add_argument(
-        "--variant",
-        choices=PackageVariant.release_variant_names(),
-        default=PackageVariant.Full.name,
-        help="Pod package variant.",
-    )
-
     parser.add_argument("--test", action="store_true", help="Run tests on the framework and pod package files.")
     parser.add_argument(
         "--skip-build",
@@ -103,7 +96,6 @@ def main():
     staging_dir = args.staging_dir.resolve()
 
     # build framework
-    package_variant = PackageVariant[args.variant]
     framework_info_file = build_dir / "xcframework_info.json"
 
     log.info("Building Apple framework.")
@@ -131,8 +123,6 @@ def main():
             str(framework_info_file),
             "--c_framework_dir",
             str(build_dir / "framework_out"),
-            "--variant",
-            package_variant.name,
             "--test_project_stage_dir",  # use a specific directory so it's easier to debug
             str(build_dir / "test_apple_packages_staging"),
         ]
@@ -153,7 +143,6 @@ def main():
             framework_info_file=framework_info_file,
             framework_dir=build_dir / "framework_out" / "onnxruntime.xcframework",
             public_headers_dir=build_dir / "framework_out" / "Headers",
-            package_variant=package_variant,
         )
 
         if args.test:
@@ -168,7 +157,6 @@ def main():
             staging_dir=objc_pod_staging_dir,
             pod_version=args.pod_version,
             framework_info_file=framework_info_file,
-            package_variant=package_variant,
         )
 
         if args.test:

tools/ci_build/github/apple/c/assemble_c_pod_package.py

@@ -13,24 +13,18 @@
 
 
 from package_assembly_utils import (  # noqa: E402
-    PackageVariant,
     copy_repo_relative_to_dir,
     gen_file_from_template,
     get_podspec_values,
     load_json_config,
 )
 
 
-def get_pod_config_file(package_variant: PackageVariant):
+def get_pod_config_file():
     """
-    Gets the pod configuration file path for the given package variant.
+    Gets the pod configuration file path.
     """
-    if package_variant == PackageVariant.Full:
-        return _script_dir / "onnxruntime-c.config.json"
-    elif package_variant == PackageVariant.Training:
-        return _script_dir / "onnxruntime-training-c.config.json"
-    else:
-        raise ValueError(f"Unhandled package variant: {package_variant}")
+    return _script_dir / "onnxruntime-c.config.json"
 
 
 def assemble_c_pod_package(
@@ -39,7 +33,6 @@ def assemble_c_pod_package(
     framework_info_file: pathlib.Path,
     public_headers_dir: pathlib.Path,
     framework_dir: pathlib.Path,
-    package_variant: PackageVariant,
 ):
     """
     Assembles the files for the C/C++ pod package in a staging directory.
@@ -49,7 +42,6 @@ def assemble_c_pod_package(
     :param framework_info_file Path to the framework_info.json or xcframework_info.json file containing additional values for the podspec.
     :param public_headers_dir Path to the public headers directory to include in the pod.
     :param framework_dir Path to the onnxruntime framework directory to include in the pod.
-    :param package_variant The pod package variant.
     :return Tuple of (package name, path to the podspec file).
     """
     staging_dir = staging_dir.resolve()
@@ -58,7 +50,7 @@ def assemble_c_pod_package(
     framework_dir = framework_dir.resolve(strict=True)
 
     framework_info = load_json_config(framework_info_file)
-    pod_config = load_json_config(get_pod_config_file(package_variant))
+    pod_config = load_json_config(get_pod_config_file())
 
     pod_name = pod_config["name"]
 
@@ -130,9 +122,6 @@ def parse_args():
         required=True,
         help="Path to the onnxruntime framework directory to include in the pod.",
     )
-    parser.add_argument(
-        "--variant", choices=PackageVariant.all_variant_names(), required=True, help="Pod package variant."
-    )
 
     return parser.parse_args()
 
@@ -146,7 +135,6 @@ def main():
         framework_info_file=args.framework_info_file,
         public_headers_dir=args.public_headers_dir,
         framework_dir=args.framework_dir,
-        package_variant=PackageVariant[args.variant],
     )
 
     return 0

tools/ci_build/github/apple/c/onnxruntime-training-c.config.json

@@ -13,7 +13,6 @@
 
 from c.assemble_c_pod_package import get_pod_config_file as get_c_pod_config_file  # noqa: E402
 from package_assembly_utils import (  # noqa: E402
-    PackageVariant,
     copy_repo_relative_to_dir,
     filter_files,
     gen_file_from_template,
@@ -84,58 +83,47 @@
 }
 
 
-def get_pod_files(package_variant: PackageVariant):
+def get_pod_files():
     """
-    Gets the source and header files for the given package variant.
+    Gets the source and header files.
     """
-    if package_variant == PackageVariant.Training:
-        return all_objc_files
-    else:
-        # return files that are in pod_files but not in training_only_objc_files
-        filtered_pod_files = {}
-        for key, value in all_objc_files.items():
-            filtered_pod_files[key] = filter_files(value, training_only_objc_files[key])
-        return filtered_pod_files
+    # return files that are in pod_files but not in training_only_objc_files
+    filtered_pod_files = {}
+    for key, value in all_objc_files.items():
+        filtered_pod_files[key] = filter_files(value, training_only_objc_files[key])
+    return filtered_pod_files
 
 
-def get_pod_config_file(package_variant: PackageVariant):
+def get_pod_config_file():
     """
-    Gets the pod configuration file path for the given package variant.
+    Gets the pod configuration file path.
     """
-    if package_variant == PackageVariant.Full:
-        return _script_dir / "onnxruntime-objc.config.json"
-    elif package_variant == PackageVariant.Training:
-        return _script_dir / "onnxruntime-training-objc.config.json"
-    else:
-        raise ValueError(f"Unhandled package variant: {package_variant}")
+    return _script_dir / "onnxruntime-objc.config.json"
 
 
-def assemble_objc_pod_package(
-    staging_dir: pathlib.Path, pod_version: str, framework_info_file: pathlib.Path, package_variant: PackageVariant
-):
+def assemble_objc_pod_package(staging_dir: pathlib.Path, pod_version: str, framework_info_file: pathlib.Path):
     """
     Assembles the files for the Objective-C pod package in a staging directory.
 
     :param staging_dir Path to the staging directory for the Objective-C pod files.
     :param pod_version Objective-C pod version.
     :param framework_info_file Path to the framework_info.json or xcframework_info.json file containing additional values for the podspec.
-    :param package_variant The pod package variant.
     :return Tuple of (package name, path to the podspec file).
     """
     staging_dir = staging_dir.resolve()
     framework_info_file = framework_info_file.resolve(strict=True)
 
     framework_info = load_json_config(framework_info_file)
-    pod_config = load_json_config(get_pod_config_file(package_variant))
-    c_pod_config = load_json_config(get_c_pod_config_file(package_variant))
+    pod_config = load_json_config(get_pod_config_file())
+    c_pod_config = load_json_config(get_c_pod_config_file())
 
     pod_name = pod_config["name"]
 
     print(f"Assembling files in staging directory: {staging_dir}")
     if staging_dir.exists():
         print("Warning: staging directory already exists", file=sys.stderr)
 
-    pod_files = get_pod_files(package_variant)
+    pod_files = get_pod_files()
 
     # copy the necessary files to the staging directory
     copy_repo_relative_to_dir(
@@ -196,9 +184,6 @@ def parse_args():
         help="Path to the framework_info.json or xcframework_info.json file containing additional values for the podspec. "
         "This file should be generated by CMake in the build directory.",
     )
-    parser.add_argument(
-        "--variant", choices=PackageVariant.release_variant_names(), required=True, help="Pod package variant."
-    )
 
     return parser.parse_args()
 
@@ -210,7 +195,6 @@ def main():
         staging_dir=args.staging_dir,
         pod_version=args.pod_version,
         framework_info_file=args.framework_info_file,
-        package_variant=PackageVariant[args.variant],
     )
 
     return 0

tools/ci_build/github/apple/default_training_ios_framework_build_settings.json

@@ -1,7 +1,6 @@
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License.
 
-import enum
 import json
 import os
 import pathlib
@@ -12,19 +11,6 @@
 repo_root = _script_dir.parents[3]
 
 
-class PackageVariant(enum.Enum):
-    Full = 0  # full ORT build with all opsets, ops, and types
-    Training = 1  # full ORT build with all opsets, ops, and types, plus training APIs
-
-    @classmethod
-    def release_variant_names(cls):
-        return [v.name for v in cls if v.value >= 0]
-
-    @classmethod
-    def all_variant_names(cls):
-        return [v.name for v in cls]
-
-
 _template_variable_pattern = re.compile(r"@(\w+)@")  # match "@var@"
 
 

tools/ci_build/github/apple/objectivec/assemble_objc_pod_package.py

@@ -13,7 +13,7 @@
 import tempfile
 
 from c.assemble_c_pod_package import assemble_c_pod_package
-from package_assembly_utils import PackageVariant, gen_file_from_template, get_ort_version
+from package_assembly_utils import gen_file_from_template, get_ort_version
 
 SCRIPT_PATH = pathlib.Path(__file__).resolve(strict=True)
 REPO_DIR = SCRIPT_PATH.parents[4]
@@ -81,7 +81,6 @@ def _test_apple_packages(args):
             framework_info_file=args.framework_info_file,
             public_headers_dir=public_headers_dir,
             framework_dir=framework_dir,
-            package_variant=PackageVariant[args.variant],
         )
 
         # move podspec out to target_proj_path first
@@ -239,13 +238,6 @@ def parse_args():
         "--c_framework_dir", type=pathlib.Path, required=True, help="Provide the parent directory for C/C++ framework"
     )
 
-    parser.add_argument(
-        "--variant",
-        choices=PackageVariant.all_variant_names(),
-        required=True,
-        help="Pod package variant.",
-    )
-
     parser.add_argument(
         "--test_project_stage_dir",
         type=pathlib.Path,