Skip to content
This repository has been archived by the owner on Dec 16, 2022. It is now read-only.

Commit

Permalink
Resolve some of the token_embedders warnings. (#2100)
Browse files Browse the repository at this point in the history
  • Loading branch information
@schmmd
schmmd committed Nov 27, 2018
1 parent 2648d95 commit dcd1d25
Show file tree
Hide file tree
Showing 27 changed files with 202 additions and 141 deletions.
8 changes: 5 additions & 3 deletions allennlp/tests/commands/dry_run_test.py
View file
Expand Up @@ -18,9 +18,11 @@ def setUp(self):
"model": {
"type": "simple_tagger",
"text_field_embedder": {
"tokens": {
"type": "embedding",
"embedding_dim": 5
"token_embedders": {
"tokens": {
"type": "embedding",
"embedding_dim": 5
}
}
},
"encoder": {
Expand Down
16 changes: 10 additions & 6 deletions allennlp/tests/commands/find_learning_rate_test.py
View file
Expand Up @@ -23,9 +23,11 @@ def setUp(self):
"model": {
"type": "simple_tagger",
"text_field_embedder": {
"tokens": {
"type": "embedding",
"embedding_dim": 5
"token_embedders": {
"tokens": {
"type": "embedding",
"embedding_dim": 5
}
}
},
"encoder": {
Expand Down Expand Up @@ -141,9 +143,11 @@ def setUp(self):
"model": {
"type": "simple_tagger",
"text_field_embedder": {
"tokens": {
"type": "embedding",
"embedding_dim": 5
"token_embedders": {
"tokens": {
"type": "embedding",
"embedding_dim": 5
}
}
},
"encoder": {
Expand Down
8 changes: 5 additions & 3 deletions allennlp/tests/commands/main_test.py
View file
Expand Up @@ -74,9 +74,11 @@ def test_other_modules(self):
"model": {
"type": "duplicate-test-tagger",
"text_field_embedder": {
"tokens": {
"type": "embedding",
"embedding_dim": 5
"token_embedders": {
"tokens": {
"type": "embedding",
"embedding_dim": 5
}
}
},
"encoder": {
Expand Down
40 changes: 25 additions & 15 deletions allennlp/tests/commands/train_test.py
View file
Expand Up @@ -23,9 +23,11 @@ def test_train_model(self):
"model": {
"type": "simple_tagger",
"text_field_embedder": {
"tokens": {
"type": "embedding",
"embedding_dim": 5
"token_embedders": {
"tokens": {
"type": "embedding",
"embedding_dim": 5
}
}
},
"encoder": {
Expand Down Expand Up @@ -114,9 +116,11 @@ def test_train_with_test_set(self):
"model": {
"type": "simple_tagger",
"text_field_embedder": {
"tokens": {
"type": "embedding",
"embedding_dim": 5
"token_embedders": {
"tokens": {
"type": "embedding",
"embedding_dim": 5
}
}
},
"encoder": {
Expand Down Expand Up @@ -184,9 +188,11 @@ def test_train_model(self):
"model": {
"type": "simple_tagger",
"text_field_embedder": {
"tokens": {
"type": "embedding",
"embedding_dim": 5
"token_embedders": {
"tokens": {
"type": "embedding",
"embedding_dim": 5
}
}
},
"encoder": {
Expand All @@ -213,9 +219,11 @@ def test_train_with_test_set(self):
"model": {
"type": "simple_tagger",
"text_field_embedder": {
"tokens": {
"type": "embedding",
"embedding_dim": 5
"token_embedders": {
"tokens": {
"type": "embedding",
"embedding_dim": 5
}
}
},
"encoder": {
Expand Down Expand Up @@ -244,9 +252,11 @@ def test_train_nograd_regex(self):
"model": {
"type": "simple_tagger",
"text_field_embedder": {
"tokens": {
"type": "embedding",
"embedding_dim": 5
"token_embedders": {
"tokens": {
"type": "embedding",
"embedding_dim": 5
}
}
},
"encoder": {
Expand Down
10 changes: 6 additions & 4 deletions allennlp/tests/fixtures/biaffine_dependency_parser/experiment.json
View file
Expand Up @@ -7,10 +7,12 @@
"model": {
"type": "biaffine_parser",
"text_field_embedder": {
"tokens": {
"type": "embedding",
"embedding_dim": 2,
"trainable": true
"token_embedders": {
"tokens": {
"type": "embedding",
"embedding_dim": 2,
"trainable": true
}
}
},
"encoder": {
Expand Down
36 changes: 19 additions & 17 deletions allennlp/tests/fixtures/bimpm/experiment.json
View file
Expand Up @@ -24,25 +24,27 @@
"type": "bimpm",
"dropout": 0.1,
"text_field_embedder": {
"tokens": {
"type": "embedding",
"pretrained_file": "allennlp/tests/fixtures/embeddings/glove.6B.300d.sample.txt.gz",
"embedding_dim": 300,
"trainable": false,
"padding_index": 0
},
"token_characters": {
"type": "character_encoding",
"embedding": {
"embedding_dim": 20,
"token_embedders": {
"tokens": {
"type": "embedding",
"pretrained_file": "allennlp/tests/fixtures/embeddings/glove.6B.300d.sample.txt.gz",
"embedding_dim": 300,
"trainable": false,
"padding_index": 0
},
"encoder": {
"type": "gru",
"input_size": 20,
"hidden_size": 50,
"num_layers": 1,
"bidirectional": true
"token_characters": {
"type": "character_encoding",
"embedding": {
"embedding_dim": 20,
"padding_index": 0
},
"encoder": {
"type": "gru",
"input_size": 20,
"hidden_size": 50,
"num_layers": 1,
"bidirectional": true
}
}
}
},
Expand Down
10 changes: 6 additions & 4 deletions allennlp/tests/fixtures/constituency_parser/experiment.json
View file
Expand Up @@ -9,10 +9,12 @@
"type": "constituency_parser",
"text_field_embedder": {
"token_embedders": {
"tokens": {
"type": "embedding",
"embedding_dim": 2,
"trainable": true
"token_embedders": {
"tokens": {
"type": "embedding",
"embedding_dim": 2,
"trainable": true
}
}
}
},
Expand Down
Binary file added allennlp/tests/fixtures/coref/serialization/weights.th
View file
Binary file not shown.
28 changes: 15 additions & 13 deletions allennlp/tests/fixtures/dialog_qa/experiment.json
View file
Expand Up @@ -20,19 +20,21 @@
"num_context_answers": 2,
"marker_embedding_dim": 5,
"text_field_embedder": {
"token_characters": {
"type": "character_encoding",
"embedding": {
"num_embeddings": 262,
"embedding_dim": 20
},
"encoder": {
"type": "cnn",
"embedding_dim": 20,
"num_filters": 10,
"ngram_filter_sizes": [5]
},
"dropout": 0.2
"token_embedders": {
"token_characters": {
"type": "character_encoding",
"embedding": {
"num_embeddings": 262,
"embedding_dim": 20
},
"encoder": {
"type": "cnn",
"embedding_dim": 20,
"num_filters": 10,
"ngram_filter_sizes": [5]
},
"dropout": 0.2
}
}
},
"phrase_layer": {
Expand Down
42 changes: 22 additions & 20 deletions allennlp/tests/fixtures/encoder_decoder/simple_seq2seq/experiment.json
View file
Expand Up @@ -42,26 +42,28 @@
"model": {
"type": "simple_seq2seq",
"source_embedder": {
"tokens": {
"type": "embedding",
"vocab_namespace": "source_tokens",
"embedding_dim": 25,
"trainable": true
},
"pos_tags": {
"type": "embedding",
"vocab_namespace": "pos",
"embedding_dim": 5
},
"ner_tags": {
"type": "embedding",
"vocab_namespace": "ner",
"embedding_dim": 7
},
"dependency_label": {
"type": "embedding",
"vocab_namespace": "dependencies",
"embedding_dim": 10
"token_embedders": {
"tokens": {
"type": "embedding",
"vocab_namespace": "source_tokens",
"embedding_dim": 25,
"trainable": true
},
"pos_tags": {
"type": "embedding",
"vocab_namespace": "pos",
"embedding_dim": 5
},
"ner_tags": {
"type": "embedding",
"vocab_namespace": "ner",
"embedding_dim": 7
},
"dependency_label": {
"type": "embedding",
"vocab_namespace": "dependencies",
"embedding_dim": 10
}
}
},
"encoder": {
Expand Down
10 changes: 6 additions & 4 deletions allennlp/tests/fixtures/graph_parser/experiment.json
View file
Expand Up @@ -7,10 +7,12 @@
"model": {
"type": "graph_parser",
"text_field_embedder": {
"tokens": {
"type": "embedding",
"embedding_dim": 2,
"trainable": true
"token_embedders": {
"tokens": {
"type": "embedding",
"embedding_dim": 2,
"trainable": true
}
}
},
"encoder": {
Expand Down
10 changes: 6 additions & 4 deletions allennlp/tests/fixtures/semantic_parsing/atis/experiment.json
View file
Expand Up @@ -13,10 +13,12 @@
"model": {
"type": "atis_parser",
"utterance_embedder": {
"tokens": {
"type": "embedding",
"embedding_dim": 20,
"trainable": true
"token_embedders": {
"tokens": {
"type": "embedding",
"embedding_dim": 20,
"trainable": true
}
}
},
"action_embedding_dim": 10,
Expand Down
10 changes: 6 additions & 4 deletions allennlp/tests/fixtures/semantic_parsing/nlvr_coverage_semantic_parser/experiment.json
View file
Expand Up @@ -11,10 +11,12 @@
"model": {
"type": "nlvr_coverage_parser",
"sentence_embedder": {
"tokens": {
"type": "embedding",
"embedding_dim": 25,
"trainable": true
"token_embedders": {
"tokens": {
"type": "embedding",
"embedding_dim": 25,
"trainable": true
}
}
},
"action_embedding_dim": 50,
Expand Down
10 changes: 6 additions & 4 deletions ...lp/tests/fixtures/semantic_parsing/nlvr_coverage_semantic_parser/mml_init_experiment.json
View file
Expand Up @@ -11,10 +11,12 @@
"model": {
"type": "nlvr_coverage_parser",
"sentence_embedder": {
"tokens": {
"type": "embedding",
"embedding_dim": 25,
"trainable": true
"token_embedders": {
"tokens": {
"type": "embedding",
"embedding_dim": 25,
"trainable": true
}
}
},
"action_embedding_dim": 50,
Expand Down
10 changes: 6 additions & 4 deletions ...p/tests/fixtures/semantic_parsing/nlvr_coverage_semantic_parser/ungrouped_experiment.json
View file
Expand Up @@ -11,10 +11,12 @@
"model": {
"type": "nlvr_coverage_parser",
"sentence_embedder": {
"tokens": {
"type": "embedding",
"embedding_dim": 25,
"trainable": true
"token_embedders": {
"tokens": {
"type": "embedding",
"embedding_dim": 25,
"trainable": true
}
}
},
"action_embedding_dim": 50,
Expand Down
10 changes: 6 additions & 4 deletions allennlp/tests/fixtures/semantic_parsing/nlvr_direct_semantic_parser/experiment.json
View file
Expand Up @@ -11,10 +11,12 @@
"model": {
"type": "nlvr_direct_parser",
"sentence_embedder": {
"tokens": {
"type": "embedding",
"embedding_dim": 25,
"trainable": true
"token_embedders": {
"tokens": {
"type": "embedding",
"embedding_dim": 25,
"trainable": true
}
}
},
"action_embedding_dim": 50,
Expand Down

0 comments on commit dcd1d25

Please sign in to comment.