Skip to content

Migrate Dawn-specific GPGMM DEPS into Dawn DEPS. #645

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 21, 2022
Merged

Migrate Dawn-specific GPGMM DEPS into Dawn DEPS. #645

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 0 additions & 59 deletions DEPS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,17 @@ use_relative_paths = True

gclient_gn_args_file = 'build/config/gclient_args.gni'
gclient_gn_args = [
'checkout_dawn',
'checkout_webnn',
'build_with_chromium',
'generate_location_tags',
]

vars = {
'chromium_git': 'https://chromium.googlesource.com',
'dawn_git': 'https://dawn.googlesource.com',
'github_git': 'https://github.com',

'gpgmm_standalone': True,
'build_with_chromium': False,

# Checkout and download Dawn by default. This can be disabled with custom_vars.
'checkout_dawn': False,

# Checkout and download WebNN by default. This can be disabled with custom_vars.
'checkout_webnn': False,

# Required by Chromium's //testing to generate directory->tags mapping used by ResultDB.
'generate_location_tags': False,

Expand All @@ -30,21 +21,6 @@ vars = {
}

deps = {
# Dependencies required to test integrations
# Note: rolling Dawn also may require vulkan-deps to be rolled below.
# TODO(gpgmm): Consider linking vulkan-deps to Dawn like Tint.
# TODO(gpgmm): WebNN hard codes builds to third_party/dawn and should be fixed if the
# build errors are related to Dawn version mismatches.
'third_party/dawn': {
'url': '{dawn_git}/dawn.git@be4c9f48aaef9f2144a654a847b76a6a0050ec5b',
'condition': 'checkout_dawn or checkout_webnn',
},

'third_party/webnn_native': {
'url': '{github_git}/webmachinelearning/webnn-native.git@9add656df0e715aa9cf1d28536c132dd6506f784',
'condition': 'checkout_webnn',
},

# Dependencies required to use GN/Clang in standalone
'build': {
'url': '{chromium_git}/chromium/src/build@f14f6d206b9a0c81a0fefba487bcba0d90ddb5fe',
Expand Down Expand Up @@ -232,44 +208,9 @@ hooks = [
'action': ['python3', 'build/util/lastchange.py',
'-o', 'build/util/LASTCHANGE'],
},
# Apply Dawn integration patch.
# Patch can be removed should GPGMM be merged into upstream.
# Removes un-tracked files from previous apply.
{
'name': 'apply_dawn_patch_1',
'pattern': '.',
'condition': 'checkout_dawn',
'action': [ 'git', '-C', './third_party/dawn/',
'clean', '-f', '-x',
],
},
# Removes un-staged changes from previous apply.
{
'name': 'apply_dawn_patch_2',
'pattern': '.',
'condition': 'checkout_dawn',
'action': [ 'git', '-C', './third_party/dawn/',
'checkout', '.',
],
},
{
'name': 'apply_dawn_patch_3',
'pattern': '.',
'condition': 'checkout_dawn',
'action': [ 'git', '-C', './third_party/dawn/',
'apply', '--ignore-space-change', '--ignore-whitespace',
'../../.github/workflows/.patches/dawn.diff',
],
},
]

recursedeps = [
# vulkan-deps provides vulkan-headers, spirv-tools, and gslang
'third_party/vulkan-deps',

# Dawn and Tint's revision are linked
'third_party/dawn',

# WebNN and DirectML revision are linked
'third_party/webnn_native',
]
16 changes: 1 addition & 15 deletions scripts/dawn.deps
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ use_relative_paths = True
gclient_gn_args_file = 'build/config/gclient_args.gni'
gclient_gn_args = [
'checkout_dawn',
'checkout_webnn',
'build_with_chromium',
'generate_location_tags',
]
Expand All @@ -24,9 +23,6 @@ vars = {
# Checkout and download Dawn by default. This can be disabled with custom_vars.
'checkout_dawn': False,

# Checkout and download WebNN by default. This can be disabled with custom_vars.
'checkout_webnn': False,

# Required by Chromium's //testing to generate directory->tags mapping used by ResultDB.
'generate_location_tags': False,

Expand All @@ -38,16 +34,9 @@ deps = {
# Dependencies required to test integrations
# Note: rolling Dawn also may require vulkan-deps to be rolled below.
# TODO(gpgmm): Consider linking vulkan-deps to Dawn like Tint.
# TODO(gpgmm): WebNN hard codes builds to third_party/dawn and should be fixed if the
# build errors are related to Dawn version mismatches.
'third_party/dawn': {
'url': '{dawn_git}/dawn.git@be4c9f48aaef9f2144a654a847b76a6a0050ec5b',
'condition': 'checkout_dawn or checkout_webnn',
},

'third_party/webnn_native': {
'url': '{github_git}/webmachinelearning/webnn-native.git@9add656df0e715aa9cf1d28536c132dd6506f784',
'condition': 'checkout_webnn',
'condition': 'checkout_dawn',
},

# Dependencies required to use GN/Clang in standalone
Expand Down Expand Up @@ -274,7 +263,4 @@ recursedeps = [

# Dawn and Tint's revision are linked
'third_party/dawn',

# WebNN and DirectML revision are linked
'third_party/webnn_native',
]