ensure 'from_files' vocab doesn't load instances (#4356)

* ensure 'from_files' vocab doesn't load instances * clean up * consolidate CUDA check in CI
allenai · Jun 14, 2020 · 6a124d8 · 6a124d8
1 parent 87c23e4
commit 6a124d8
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 10 deletions.
diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
@@ -30,10 +30,6 @@ jobs:
       run: |
         make docker-test-image DOCKER_TAG=$DOCKER_TAG
 
-    - name: Ensure CUDA available
-      run: |
-        make docker-test-run DOCKER_TAG=$DOCKER_TAG ARGS='check-for-cuda'
-
     - name: Run GPU tests
       run: |
         make docker-test-run DOCKER_TAG=$DOCKER_TAG ARGS='gpu-test'

diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
@@ -39,10 +39,6 @@ jobs:
       run: |
         make docker-test-image DOCKER_TAG=$DOCKER_TAG
 
-    - name: Ensure CUDA available
-      run: |
-        make docker-test-run DOCKER_TAG=$DOCKER_TAG ARGS='check-for-cuda'
-
     - name: Run GPU tests
       run: |
         make docker-test-run DOCKER_TAG=$DOCKER_TAG ARGS='gpu-test'

diff --git a/Makefile b/Makefile
@@ -68,7 +68,7 @@ test-with-cov :
 			--cov-report=xml
 
 .PHONY : gpu-test
-gpu-test :
+gpu-test : check-for-cuda
 	pytest --color=yes -v -rf -m gpu
 
 .PHONY : benchmarks

diff --git a/allennlp/training/util.py b/allennlp/training/util.py
@@ -423,7 +423,7 @@ def make_vocab_from_params(
     )
     # Do a quick sanity check here. There's no need to load any datasets if the vocab
     # type is "empty".
-    if datasets_for_vocab_creation is None and vocab_params.get("type") == "empty":
+    if datasets_for_vocab_creation is None and vocab_params.get("type") in ("empty", "from_files"):
         datasets_for_vocab_creation = []
 
     datasets: Dict[str, Dataset]