From 02b6510a4ed9f7fea21aa6fc2a1581c685f96f7a Mon Sep 17 00:00:00 2001 From: Sean McBride Date: Mon, 5 Apr 2021 22:49:07 -0400 Subject: [PATCH] chore: Use relative paths and cleanup workflow --- .github/workflows/main.yaml | 1 - runtime/tests/CMSIS_5_NN | 2 +- runtime/tests/TinyEKF | 2 +- runtime/tests/gocr | 2 +- test.sh | 32 ++++++++++++++++---------------- 5 files changed, 19 insertions(+), 20 deletions(-) diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index d4808b3..6d304d6 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -55,7 +55,6 @@ jobs: curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | \ sh -s -- --default-toolchain stable --component rustfmt --target wasm32-wasi -y echo "/root/.cargo/bin:$PATH" >> $GITHUB_PATH - cargo install --debug cargo-audit cargo-watch rsign2 - name: Get wasmception run: | wget $WASMCEPTION_URL -O wasmception.tar.gz diff --git a/runtime/tests/CMSIS_5_NN b/runtime/tests/CMSIS_5_NN index 9712a63..503fc07 160000 --- a/runtime/tests/CMSIS_5_NN +++ b/runtime/tests/CMSIS_5_NN @@ -1 +1 @@ -Subproject commit 9712a63b92f7ab4112cb0d6b46a3ff97310a42fa +Subproject commit 503fc07b2248dc006cc5409ed964632ebd29352a diff --git a/runtime/tests/TinyEKF b/runtime/tests/TinyEKF index 7fbbbb9..58857dc 160000 --- a/runtime/tests/TinyEKF +++ b/runtime/tests/TinyEKF @@ -1 +1 @@ -Subproject commit 7fbbbb9320d635132f5f3583729f61f032c68404 +Subproject commit 58857dc898e3e2f4cbfd5d12e31e6e2ad273add4 diff --git a/runtime/tests/gocr b/runtime/tests/gocr index c707d38..d74bcda 160000 --- a/runtime/tests/gocr +++ b/runtime/tests/gocr @@ -1 +1 @@ -Subproject commit c707d388e1ea7f06c4c8d570ede071160d895889 +Subproject commit d74bcdad2d92fe909eccde19ad954c06d9f4c859 diff --git a/test.sh b/test.sh index 60e8dd6..c4b78a5 100755 --- a/test.sh +++ b/test.sh @@ -16,34 +16,34 @@ cd "$base_dir/runtime" && make clean all || exit 1 # OCR Build # FIXME: gocr incorectly reports up to date -# cd "$base_dir/runtime/tests" && make -B clean gocr || exit 1 +make clean gocr -B -C "$base_dir/runtime/tests" || exit 1 # OCR Tests -# cd "$base_dir/runtime/experiments/applications/ocr/hyde" && ./run.sh || exit 1 -# cd "$base_dir/runtime/experiments/applications/ocr/handwriting" && ./run.sh || exit 1 -# cd "$base_dir/runtime/experiments/applications/ocr/fivebyeight" && ./run.sh || exit 1 -# cd "$base_dir/runtime/experiments/applications/ocr/by_word" && ./install.sh || exit 1 -# cd "$base_dir/runtime/experiments/applications/ocr/by_word" && ./run.sh || exit 1 -# cd "$base_dir/runtime/experiments/applications/ocr/by_font" && ./install.sh || exit 1 -# cd "$base_dir/runtime/experiments/applications/ocr/by_font" && ./run.sh || exit 1 -# cd "$base_dir/runtime/experiments/applications/ocr/by_dpi" && ./install.sh || exit 1 -# cd "$base_dir/runtime/experiments/applications/ocr/by_dpi" && ./run.sh || exit 1 +cd "$base_dir/runtime/experiments/applications/ocr/hyde" && ./run.sh || exit 1 +cd "$base_dir/runtime/experiments/applications/ocr/handwriting" && ./run.sh || exit 1 +cd "$base_dir/runtime/experiments/applications/ocr/fivebyeight" && ./run.sh || exit 1 +cd "$base_dir/runtime/experiments/applications/ocr/by_word" && ./install.sh || exit 1 +cd "$base_dir/runtime/experiments/applications/ocr/by_word" && ./run.sh || exit 1 +cd "$base_dir/runtime/experiments/applications/ocr/by_font" && ./install.sh || exit 1 +cd "$base_dir/runtime/experiments/applications/ocr/by_font" && ./run.sh || exit 1 +cd "$base_dir/runtime/experiments/applications/ocr/by_dpi" && ./install.sh || exit 1 +cd "$base_dir/runtime/experiments/applications/ocr/by_dpi" && ./run.sh || exit 1 # EKF Build -# cd "$base_dir/runtime/tests" && make -B clean tinyekf || exit 1 +make clean tinyekf -B -C "$base_dir/runtime/tests" || exit 1 # EKF Tests -# cd "$base_dir/runtime/experiments/applications/ekf/by_iteration" && ./run.sh || exit 1 -# cd "$base_dir/runtime/experiments/applications/ekf/one_iteration" && ./run.sh || exit 1 +cd "$base_dir/runtime/experiments/applications/ekf/by_iteration" && ./run.sh || exit 1 +cd "$base_dir/runtime/experiments/applications/ekf/one_iteration" && ./run.sh || exit 1 # cifar10 Build -# cd "$base_dir/runtime/tests" && make -B clean cifar10 || exit 1 +make clean cifar10 -B -C "$base_dir/runtime/tests" || exit 1 # cifar10 Tests -# cd "$base_dir/runtime/experiments/applications/imageclassification" && ./run.sh || exit 1 +cd "$base_dir/runtime/experiments/applications/imageclassification" && ./run.sh || exit 1 # sod Build -cd "$base_dir/runtime/tests" && make -B clean sod || exit 1 +make clean sod -B -C "$base_dir/runtime/tests" || exit 1 # sod Tests cd "$base_dir/runtime/experiments/applications/imageresize/test" && ./install.sh || exit 1