Mirror many updates from pose repo

Closes drivendataorg/competition-spacecraft-pose#59

Makefile

@@ -1,4 +1,4 @@
-.PHONY: build pull pack-benchmark pack-submission test-submission
+.PHONY: build pull pack-benchmark pack-submission repack-submission repack-example test-submission
 
 # ================================================================================================
 # Settings
@@ -47,9 +47,8 @@ test-container: build _submission_write_perms
 	docker run \
 		${TTY_ARGS} \
 		--mount type=bind,source="$(shell pwd)"/runtime/tests,target=/tests,readonly \
-		--entrypoint /bin/bash \
 		${LOCAL_IMAGE} \
-		-c "conda run --no-capture-output -n condaenv python -m pytest tests"
+		pytest tests/test_packages.py
 
 ## Start your locally built container and open a bash shell within the running container; same as submission setup except has network access
 interact-container: build _submission_write_perms
@@ -83,6 +82,9 @@ endif
 	mkdir -p submission/
 	cd submission_src; zip -r ../submission/submission.zip ./*
 
+repack-submission: clean pack-submission
+
+repack-example: clean pack-example
 
 ## Runs container using code from `submission/submission.zip` and data from `data/`
 test-submission: _submission_write_perms
@@ -105,4 +107,5 @@ endif
 ## Delete temporary Python cache and bytecode files
 clean:
 	find . -type f -name "*.py[co]" -delete
-	find . -type d -name "__pycache__" -delete
+	find . -type d -name "__pycache__" -delete
+	rm -rf ./submission/*

runtime/apt.txt

@@ -2,4 +2,6 @@ curl
 libxml2
 tzdata
 wget
-zip
+zip
+parallel
+libgl1-mesa-glx

runtime/entrypoint.sh

@@ -24,7 +24,7 @@ main () {
     popd
 
     # test the submission
-    pytest tests/test_submission.py
+    pytest --no-header -vv tests/test_submission.py
 }
 
 main |& tee "/code_execution/submission/log.txt"

runtime/tests/test_packages.py

@@ -10,6 +10,7 @@
     "sklearn",
     "tensorflow",
     "torch",
+    "cv2",
 ]
 
 

runtime/tests/test_submission.py

@@ -1,13 +1,25 @@
-import os
-
 from pathlib import Path
 
-import pytest
+import pandas as pd
+from numpy.testing import assert_array_equal
+from pandas._testing import assert_index_equal
 
-SUBMISSION_PATH = Path("/code_execution/workdir/submission.csv")
-CHECK_SUBMISSION = os.environ.get("CHECK_SUBMISSION", "false") == "true"
+SUBMISSION_PATH = Path("/code_execution/submission/submission.csv")
+SUBMISSION_FORMAT_PATH = Path("/code_execution/data/submission_format.csv")
 
 
-@pytest.mark.skipif(not CHECK_SUBMISSION, reason="Not checking submission yet")
 def test_submission_exists():
-    assert SUBMISSION_PATH.exists()
+    assert SUBMISSION_PATH.exists(), f"Expected submission at {SUBMISSION_PATH}"
+
+
+def test_submission_matches_submission_format():
+    assert SUBMISSION_FORMAT_PATH.exists(), "Submission format not found"
+
+    submission = pd.read_csv(SUBMISSION_PATH)
+    fmt = pd.read_csv(SUBMISSION_FORMAT_PATH)
+
+    assert_array_equal(submission.columns, fmt.columns, err_msg="Columns not identical")
+    assert_index_equal(submission.index, fmt.index), "Index not identical"
+
+    for col in submission.columns:
+        assert submission[col].dtype == fmt[col].dtype, f"dtype for columns not equal"