Skip to content

Commit cbb4e5d

Browse files
committed
Update cgmanifest.json and onnx submodule
1 parent c3f6a1e commit cbb4e5d

File tree

2 files changed

+90
-12
lines changed

2 files changed

+90
-12
lines changed

cgmanifests/submodules/cgmanifest.json

Lines changed: 45 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,50 @@
11
{
22
"Version": 1,
33
"Registrations": [
4+
{
5+
"Component": {
6+
"Type": "other",
7+
"other": {
8+
"Name": "automake",
9+
"Version": "1.16.2",
10+
"DownloadUrl": "http://ftp.gnu.org/gnu/automake/automake-1.16.2.tar.gz"
11+
},
12+
"comments": "manylinux dependency"
13+
}
14+
},
15+
{
16+
"Component": {
17+
"Type": "other",
18+
"other": {
19+
"Name": "libtool",
20+
"Version": "2.4.6",
21+
"DownloadUrl": "http://ftp.gnu.org/gnu/libtool/libtool-2.4.6.tar.gz"
22+
},
23+
"comments": "manylinux dependency"
24+
}
25+
},
26+
{
27+
"Component": {
28+
"Type": "other",
29+
"other": {
30+
"Name": "sqlite",
31+
"Version": "3320300",
32+
"DownloadUrl": "https://www.sqlite.org/2020/sqlite-autoconf-3320300.tar.gz"
33+
},
34+
"comments": "manylinux dependency"
35+
}
36+
},
37+
{
38+
"Component": {
39+
"Type": "other",
40+
"other": {
41+
"Name": "git",
42+
"Version": "2.26.2",
43+
"DownloadUrl": "https://github.com/git/git/archive/2.26.2.tar.gz"
44+
},
45+
"comments": "manylinux dependency"
46+
}
47+
},
448
{
549
"component": {
650
"type": "git",
@@ -365,22 +409,12 @@
365409
"component": {
366410
"type": "git",
367411
"git": {
368-
"commitHash": "80d452484c5409444b0ec19383faa84bb7a4d351",
412+
"commitHash": "59a2ac2745d8a57ac94c6accced73620d59fb844",
369413
"repositoryUrl": "https://github.com/pybind/pybind11.git"
370414
},
371415
"comments": "git submodule at cmake/external/onnx/third_party/pybind11"
372416
}
373417
},
374-
{
375-
"component": {
376-
"type": "git",
377-
"git": {
378-
"commitHash": "6a00cbc4a9b8e68b71caf7f774b3f9c753ae84d5",
379-
"repositoryUrl": "https://github.com/wjakob/clang-cindex-python3"
380-
},
381-
"comments": "git submodule at cmake/external/onnx/third_party/pybind11/tools/clang"
382-
}
383-
},
384418
{
385419
"component": {
386420
"type": "git",

cgmanifests/submodules/generate_submodule_cgmanifest.py

Lines changed: 45 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,54 @@
44
import os
55
import subprocess
66
import sys
7+
import re
78

89
SCRIPT_DIR = os.path.dirname(os.path.realpath(__file__))
910
REPO_DIR = os.path.normpath(os.path.join(SCRIPT_DIR, "..", ".."))
1011

12+
package_name = None
13+
package_filename = None
14+
package_url = None
15+
16+
registrations = []
17+
18+
with open(os.path.join(REPO_DIR,'tools','ci_build','github','linux','docker','manylinux2014_build_scripts','build_env.sh'), "r") as f:
19+
for line in f:
20+
if not line.strip():
21+
package_name = None
22+
package_filename = None
23+
package_url = None
24+
if package_filename is None:
25+
m = re.match("(.+?)_ROOT=(.*)$",line)
26+
if m != None:
27+
package_name = m.group(1)
28+
package_filename = m.group(2)
29+
else:
30+
m = re.match("(.+?)_AUTOCONF_VERSION=(.*)$",line)
31+
if m != None:
32+
package_name = m.group(1)
33+
package_filename = m.group(2)
34+
elif package_url is None:
35+
m = re.match("(.+?)_DOWNLOAD_URL=(.+)$",line)
36+
if m != None:
37+
package_url = m.group(2) + "/" + package_filename + ".tar.gz"
38+
registration = {
39+
"Component": {
40+
"Type": "other",
41+
"other": {
42+
"Name": package_name.lower(),
43+
"Version": package_filename.split("-")[-1],
44+
"DownloadUrl": package_url,
45+
},
46+
"comments": "manylinux dependency"
47+
}
48+
}
49+
registrations.append(registration)
50+
package_name = None
51+
package_filename = None
52+
package_url = None
53+
54+
1155
proc = subprocess.run(
1256
["git", "submodule", "foreach", "--quiet", "--recursive", "{} {} $toplevel/$sm_path".format(
1357
sys.executable, os.path.join(SCRIPT_DIR, "print_submodule_info.py"))],
@@ -17,7 +61,7 @@
1761
stderr=subprocess.PIPE,
1862
universal_newlines=True)
1963

20-
registrations = []
64+
2165
submodule_lines = proc.stdout.splitlines()
2266
for submodule_line in submodule_lines:
2367
(absolute_path, url, commit) = submodule_line.split(" ")

0 commit comments

Comments
 (0)