move library_paths to element attribute (similar to org, tag)

Author: kpedro88

build.py

@@ -93,7 +93,7 @@
 THIS_SCRIPT_DIR = os.path.dirname(os.path.abspath(getsourcefile(lambda: 0)))
 
 ELEMENTS = {
-    'backend': ['tag', 'org'],
+    'backend': ['tag', 'org', 'lib'],
     'repoagent': ['tag', 'org'],
     'cache': ['tag', 'org'],
     'filesystem': ['strict'],
@@ -615,11 +615,11 @@ def backend_repo(be):
     return "{}_backend".format(be)
 
 
-def backend_cmake_args(images, be, install_dir, library_paths):
+def backend_cmake_args(images, be, install_dir):
     cmake_build_type = FLAGS.build_type
 
     if be == "onnxruntime":
-        args = onnxruntime_cmake_args(images, library_paths)
+        args = onnxruntime_cmake_args(images)
     elif be == "openvino":
         args = openvino_cmake_args()
     elif be == "python":
@@ -723,7 +723,7 @@ def pytorch_cmake_args(images):
     return cargs
 
 
-def onnxruntime_cmake_args(images, library_paths):
+def onnxruntime_cmake_args(images):
     cargs = [
         cmake_backend_arg(
             "onnxruntime",
@@ -2119,7 +2119,6 @@ def backend_build(
     build_dir,
     install_dir,
     images,
-    library_paths,
 ):
     tag, github_organization = FLAGS.backend[be]["tag"], FLAGS.backend[be]["org"]
     repo_build_dir = os.path.join(build_dir, be, "build")
@@ -2142,7 +2141,7 @@ def backend_build(
     cmake_script.mkdir(repo_build_dir)
     cmake_script.cwd(repo_build_dir)
     cmake_script.cmake(
-        backend_cmake_args(images, be, repo_install_dir, library_paths)
+        backend_cmake_args(images, be, repo_install_dir)
     )
     cmake_script.makeinstall()
 
@@ -2542,15 +2541,6 @@ def enable_all(default):
         default="/tmp",
         help="Temporary directory used for building inside docker.",
     )
-    parser.add_argument(
-        "--library-paths",
-        action="append",
-        metavar=("<backend>","<library_path>"),
-        nargs=2,
-        required=False,
-        default=[],
-        help="Specify library paths for given backend in build.",
-    )
     parser.add_argument(
         "--build-type",
         required=False,
@@ -2675,6 +2665,16 @@ def enable_all(default):
                 default=[],
                 help=f'Select <org> for specified <{element}>, to use the fork of the corresponding repository from <org> instead of the default --github-organization value.',
             )
+        if 'lib' in properties:
+            group.add_argument(
+                f"--{element}-library-path",
+                action="append",
+                metavar=(f"<{element}>","<library_path>"),
+                nargs=2,
+                required=False,
+                default=[],
+                help=f'Specify library paths for specified <{element}> in build.',
+            )
 
     parser.add_argument(
         "--min-compute-capability",
@@ -2904,15 +2904,18 @@ def do_tag(element, map, key, value):
         map[key]["tag"] = value
     def do_org(element, map, key, value):
         map[key]["org"] = value
+    def do_lib(element, map, key, value):
+        map[key]["lib"] = value
     attr_fns = {
         "enable": do_enable,
         "disable": do_disable,
         "tag": do_tag,
         "org": do_org,
+        "library_path": do_lib,
     }
     for element in ELEMENTS:
         map = getattr(FLAGS, element)
-        attr_names = [f"enable_{element}", f"disable_{element}", f"{element}_tag", f"{element}_org"]
+        attr_names = [f"enable_{element}", f"disable_{element}", f"{element}_tag", f"{element}_org", f"{element}_library_path"]
         for attr_name in attr_names:
             attr = getattr(FLAGS, attr_name, None)
             if not attr: continue
@@ -2948,6 +2951,7 @@ def do_org(element, map, key, value):
                 f'{element} "{key}"',
                 'at tag/branch "{}"'.format(info["tag"]) if "tag" in info else "",
                 'from org "{}"'.format(info["org"]) if "org" in info else "",
+                'with library path "{}"'.format(info["lib"]) if "lib" in info else "",
             ])))
 
     # Initialize map of docker images.
@@ -2965,12 +2969,6 @@ def do_org(element, map, key, value):
         if "base" in images:
             images["buildbase"] = images["base"]
 
-    # Initialize map of library paths for each backend.
-    library_paths = {}
-    for key,val in FLAGS.library_paths:
-        log('backend "{}" library path "{}"'.format(parts[0], parts[1]))
-        library_paths[key] = val
-
     # Parse any explicitly specified cmake arguments
     for key,val in FLAGS.extra_core_cmake_arg:
         log('CMake core extra "-D{}={}"'.format(key, val))
@@ -3069,7 +3067,6 @@ def do_org(element, map, key, value):
                     script_build_dir,
                     script_install_dir,
                     images,
-                    library_paths,
                 )
 
         # Commands to build each repo agent...