Skip to content
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

Jump to bottom

Fix merge_label utility argument order #133

Merged
merged 2 commits into from Feb 23, 2018
Merged

Fix merge_label utility argument order #133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
da22db8
Swap places of merge_label configs
Ladsgroup Feb 22, 2018
49b4ffa
Fix merge_label utility argument order
Ladsgroup Feb 22, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
44 changes: 20 additions & 24 deletions Makefile
View file
Open in desktop
Expand Up @@ -34,7 +34,6 @@ models: \
lvwiki_models \
nlwiki_models \
nowiki_models \
nowiki_models \
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't know how it got there but it's redundant and the auto-generation removed it, same for other removals.

plwiki_models \
ptwiki_models \
rowiki_models \
Expand All @@ -47,7 +46,6 @@ models: \
ukwiki_models \
urwiki_models \
viwiki_models \
viwki_models \
wikidatawiki_models \
zhwiki_models

Expand Down Expand Up @@ -81,7 +79,6 @@ tuning_reports: \
lvwiki_tuning_reports \
nlwiki_tuning_reports \
nowiki_tuning_reports \
nowiki_tuning_reports \
plwiki_tuning_reports \
ptwiki_tuning_reports \
rowiki_tuning_reports \
Expand All @@ -94,7 +91,6 @@ tuning_reports: \
ukwiki_tuning_reports \
urwiki_tuning_reports \
viwiki_tuning_reports \
viwki_tuning_reports \
wikidatawiki_tuning_reports \
zhwiki_tuning_reports

Expand Down Expand Up @@ -655,8 +651,8 @@ datasets/eswiki.human_labeled_revisions.5k_2015.json:
https://labels.wmflabs.org/campaigns/eswiki/12/ > $@

datasets/eswiki.labeled_revisions.20k_2015.json: \
datasets/eswiki.autolabeled_revisions.20k_2015.json \
datasets/eswiki.human_labeled_revisions.5k_2015.json
datasets/eswiki.human_labeled_revisions.5k_2015.json \
datasets/eswiki.autolabeled_revisions.20k_2015.json
./utility merge_labels $^ > $@

datasets/eswiki.labeled_revisions.w_cache.20k_2015.json: \
Expand Down Expand Up @@ -761,8 +757,8 @@ datasets/eswikibooks.human_labeled_revisions.5k_2015.json:
https://labels.wmflabs.org/campaigns/eswikibooks/42/ > $@

datasets/eswikibooks.labeled_revisions.20k_2015.json: \
datasets/eswikibooks.autolabeled_revisions.20k_2015.json \
datasets/eswikibooks.human_labeled_revisions.5k_2015.json
datasets/eswikibooks.human_labeled_revisions.5k_2015.json \
datasets/eswikibooks.autolabeled_revisions.20k_2015.json
./utility merge_labels $^ > $@

datasets/eswikibooks.labeled_revisions.w_cache.20k_2015.json: \
Expand Down Expand Up @@ -934,8 +930,8 @@ datasets/etwiki.human_labeled_revisions.5k_2015.json:
https://labels.wmflabs.org/campaigns/etwiki/17/ > $@

datasets/etwiki.labeled_revisions.20k_2015.json: \
datasets/etwiki.autolabeled_revisions.20k_2015.json \
datasets/etwiki.human_labeled_revisions.5k_2015.json
datasets/etwiki.human_labeled_revisions.5k_2015.json \
datasets/etwiki.autolabeled_revisions.20k_2015.json
./utility merge_labels $^ > $@

datasets/etwiki.labeled_revisions.w_cache.20k_2015.json: \
Expand Down Expand Up @@ -1061,8 +1057,8 @@ datasets/fawiki.labeled_revisions.20k_2015.json: \
./utility merge_labels $^ > $@

datasets/fawiki.labeled_revisions.20k_2016.json: \
datasets/fawiki.autolabeled_revisions.2.20k_2015.json \
datasets/fawiki.human_labeled_revisions.5k_2016.json
datasets/fawiki.human_labeled_revisions.5k_2016.json \
datasets/fawiki.autolabeled_revisions.2.20k_2015.json
./utility merge_labels $^ > $@

datasets/fawiki.labeled_revisions.w_cache.20k_2015.json: \
Expand Down Expand Up @@ -1205,8 +1201,8 @@ datasets/frwiki.revisions_for_review.5k_2016.json: \
) | shuf > $@

datasets/frwiki.labeled_revisions.20k_2016.json: \
datasets/frwiki.autolabeled_revisions.20k_2016.json \
datasets/frwiki.human_labeled_revisions.5k_2016.json
datasets/frwiki.human_labeled_revisions.5k_2016.json \
datasets/frwiki.autolabeled_revisions.20k_2016.json
./utility merge_labels $^ > $@

datasets/frwiki.labeled_revisions.w_cache.20k_2016.json: \
Expand Down Expand Up @@ -1717,8 +1713,8 @@ datasets/nlwiki.human_labeled_revisions.5k_2016.json:
https://labels.wmflabs.org/campaigns/nlwiki/14/ > $@

datasets/nlwiki.labeled_revisions.20k_2016.json: \
datasets/nlwiki.autolabeled_revisions.20k_2016.json \
datasets/nlwiki.human_labeled_revisions.5k_2016.json
datasets/nlwiki.human_labeled_revisions.5k_2016.json \
datasets/nlwiki.autolabeled_revisions.20k_2016.json
./utility merge_labels $^ > $@

datasets/nlwiki.labeled_revisions.w_cache.20k_2016.json: \
Expand Down Expand Up @@ -1988,8 +1984,8 @@ datasets/rowiki.human_labeled_revisions.5k_2016.json:
https://labels.wmflabs.org/campaigns/rowiki/48/ > $@

datasets/rowiki.labeled_revisions.20k_2016.json: \
datasets/rowiki.autolabeled_revisions.20k_2016.json \
datasets/rowiki.human_labeled_revisions.5k_2016.json
datasets/rowiki.human_labeled_revisions.5k_2016.json \
datasets/rowiki.autolabeled_revisions.20k_2016.json
./utility merge_labels $^ > $@

datasets/rowiki.labeled_revisions.w_cache.20k_2016.json: \
Expand Down Expand Up @@ -2094,8 +2090,8 @@ datasets/ruwiki.human_labeled_revisions.5k_2015.json:
https://labels.wmflabs.org/campaigns/ruwiki/10/ > $@

datasets/ruwiki.labeled_revisions.20k_2015.json: \
datasets/ruwiki.autolabeled_revisions.20k_2015.json \
datasets/ruwiki.human_labeled_revisions.5k_2015.json
datasets/ruwiki.human_labeled_revisions.5k_2015.json \
datasets/ruwiki.autolabeled_revisions.20k_2015.json
./utility merge_labels $^ > $@

datasets/ruwiki.labeled_revisions.w_cache.20k_2015.json: \
Expand Down Expand Up @@ -2201,8 +2197,8 @@ datasets/sqwiki.human_labeled_revisions.5k_2016.json:
https://labels.wmflabs.org/campaigns/sqwiki/57/ > $@

datasets/sqwiki.labeled_revisions.20k_2016.json: \
datasets/sqwiki.autolabeled_revisions.20k_2016.json \
datasets/sqwiki.human_labeled_revisions.5k_2016.json
datasets/sqwiki.human_labeled_revisions.5k_2016.json \
datasets/sqwiki.autolabeled_revisions.20k_2016.json
./utility merge_labels $^ > $@

datasets/sqwiki.labeled_revisions.w_cache.20k_2016.json: \
Expand Down Expand Up @@ -2395,8 +2391,8 @@ datasets/trwiki.human_labeled_revisions.5k_2015.json:
https://labels.wmflabs.org/campaigns/trwiki/5/ > $@

datasets/trwiki.labeled_revisions.20k_2015.json: \
datasets/trwiki.autolabeled_revisions.20k_2015.json \
datasets/trwiki.human_labeled_revisions.5k_2015.json
datasets/trwiki.human_labeled_revisions.5k_2015.json \
datasets/trwiki.autolabeled_revisions.20k_2015.json
./utility merge_labels $^ > $@

datasets/trwiki.labeled_revisions.w_cache.20k_2015.json: \
Expand Down
2 changes: 1 addition & 1 deletion config/wikis/enwiki.yaml
View file
Open in desktop
Expand Up @@ -12,7 +12,7 @@ default_sample: 20k_2015

merged_samples:
20k_2015:
20k_2015: "human_labeled_revisions"
human_labeled_revisions: "20k_2015"

models:
damaging:
Expand Down
4 changes: 2 additions & 2 deletions config/wikis/eswiki.yaml
View file
Open in desktop
Expand Up @@ -14,8 +14,8 @@ review_sample: 5k_2015

merged_samples:
20k_2015:
20k_2015: "autolabeled_revisions"
5k_2015: "human_labeled_revisions"
autolabeled_revisions: "20k_2015"
human_labeled_revisions: "5k_2015"

models:
damaging:
Expand Down
4 changes: 2 additions & 2 deletions config/wikis/eswikibooks.yaml
View file
Open in desktop
Expand Up @@ -14,8 +14,8 @@ review_sample: 5k_2015

merged_samples:
20k_2015:
20k_2015: "autolabeled_revisions"
5k_2015: "human_labeled_revisions"
autolabeled_revisions: "20k_2015"
human_labeled_revisions: "5k_2015"

models:
damaging:
Expand Down
4 changes: 2 additions & 2 deletions config/wikis/etwiki.yaml
View file
Open in desktop
Expand Up @@ -14,8 +14,8 @@ review_sample: 5k_2015

merged_samples:
20k_2015:
20k_2015: "autolabeled_revisions"
5k_2015: "human_labeled_revisions"
autolabeled_revisions: "20k_2015"
human_labeled_revisions: "5k_2015"

models:
damaging:
Expand Down
6 changes: 3 additions & 3 deletions config/wikis/fawiki.yaml
View file
Open in desktop
Expand Up @@ -13,10 +13,10 @@ samples:

merged_samples:
20k_2015:
20k_2015: "human_labeled_revisions"
human_labeled_revisions: "20k_2015"
20k_2016:
2.20k_2015: "autolabeled_revisions"
5k_2016: "human_labeled_revisions"
autolabeled_revisions: "2.20k_2015"
human_labeled_revisions: "5k_2016"

wikilabels_sample: 20k_2015
default_sample: 20k_2015
Expand Down
4 changes: 2 additions & 2 deletions config/wikis/frwiki.yaml
View file
Open in desktop
Expand Up @@ -18,8 +18,8 @@ default_sample: 20k_2016

merged_samples:
20k_2016:
20k_2016: "autolabeled_revisions"
5k_2016: "human_labeled_revisions"
autolabeled_revisions: "20k_2016"
human_labeled_revisions: "5k_2016"

models:
damaging:
Expand Down
4 changes: 2 additions & 2 deletions config/wikis/nlwiki.yaml
View file
Open in desktop
Expand Up @@ -15,8 +15,8 @@ default_sample: 20k_2016

merged_samples:
20k_2016:
20k_2016: "autolabeled_revisions"
5k_2016: "human_labeled_revisions"
autolabeled_revisions: "20k_2016"
human_labeled_revisions: "5k_2016"

models:
damaging:
Expand Down
2 changes: 1 addition & 1 deletion config/wikis/ptwiki.yaml
View file
Open in desktop
Expand Up @@ -12,7 +12,7 @@ review_sample: 20k_2015

merged_samples:
20k_2015:
20k_2015: "human_labeled_revisions"
human_labeled_revisions: "20k_2015"

models:
damaging:
Expand Down
4 changes: 2 additions & 2 deletions config/wikis/rowiki.yaml
View file
Open in desktop
Expand Up @@ -14,8 +14,8 @@ review_sample: 20k_2016

merged_samples:
20k_2016:
20k_2016: "autolabeled_revisions"
5k_2016: "human_labeled_revisions"
autolabeled_revisions: "20k_2016"
human_labeled_revisions: "5k_2016"

models:
damaging:
Expand Down
4 changes: 2 additions & 2 deletions config/wikis/ruwiki.yaml
View file
Open in desktop
Expand Up @@ -14,8 +14,8 @@ review_sample: 20k_2015

merged_samples:
20k_2015:
20k_2015: "autolabeled_revisions"
5k_2015: "human_labeled_revisions"
autolabeled_revisions: "20k_2015"
human_labeled_revisions: "5k_2015"

models:
damaging:
Expand Down
4 changes: 2 additions & 2 deletions config/wikis/sqwiki.yaml
View file
Open in desktop
Expand Up @@ -15,8 +15,8 @@ review_sample: 20k_2016

merged_samples:
20k_2016:
20k_2016: "autolabeled_revisions"
5k_2016: "human_labeled_revisions"
autolabeled_revisions: "20k_2016"
human_labeled_revisions: "5k_2016"

models:
damaging:
Expand Down
4 changes: 2 additions & 2 deletions config/wikis/trwiki.yaml
View file
Open in desktop
Expand Up @@ -14,8 +14,8 @@ review_sample: 20k_2015

merged_samples:
20k_2015:
20k_2015: "autolabeled_revisions"
5k_2015: "human_labeled_revisions"
autolabeled_revisions: "20k_2015"
human_labeled_revisions: "5k_2015"

models:
damaging:
Expand Down
6 changes: 3 additions & 3 deletions templates/Makefile.j2
View file
Open in desktop
Expand Up @@ -74,9 +74,9 @@ datasets/{{ wiki.name }}.revisions_for_review.{{ wiki.review_sample }}.json: \
grep '"needs_review": true' $< | shuf > $@
{% endif %}{% if wiki.merged_samples %}{% for big_sample_name, big_sample in wiki.merged_samples|dictsort %}
datasets/{{ wiki.name }}.labeled_revisions.{{ big_sample_name }}.json: \
{%- for sample_name, sample in big_sample|dictsort %}
datasets/{{ wiki.name }}.{{ sample }}.{{ sample_name }}.json{% if not loop.last %} \{% endif -%}
{% endfor %}
{%- if big_sample.human_labeled_revisions %}
datasets/{{ wiki.name }}.human_labeled_revisions.{{ big_sample.human_labeled_revisions }}.json{%- if big_sample.autolabeled_revisions %} \
datasets/{{ wiki.name }}.autolabeled_revisions.{{ big_sample.autolabeled_revisions }}.json{% endif %}{% endif %}
./utility merge_labels $^ > $@
{% endfor %}
{%- endif %}{% if wiki.models.reverted %}
Expand Down