Download onnx model and convert it to dab instead of download dab in ci

JDAI-CV · Aug 20, 2019 · d7df0a2 · d7df0a2
1 parent e29ebeb
commit d7df0a2
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 10 deletions.
diff --git a/ci/dabnn_build_and_test.yml b/ci/dabnn_build_and_test.yml
@@ -32,7 +32,7 @@ jobs:
   - bash: brew install watch gnu-sed
     displayName: Install watch and gnu-sed
   - bash: ci/build_dabnn.sh
-    displayName: Build
+    displayName: Build dabnn
   - bash: ci/start_android_emulator.sh
     displayName: Start Android Emulator
   - template: template_dabnn_run_test.yml
@@ -49,7 +49,7 @@ jobs:
   - bash: brew install watch gnu-sed
     displayName: Install watch and gnu-sed
   - bash: ci/build_dabnn_v7.sh
-    displayName: Build
+    displayName: Build dabnn
   - bash: ci/start_android_emulator_v7.sh
     displayName: Start Android Emulator
   - template: template_dabnn_run_test.yml
diff --git a/ci/download_and_convert_models.sh b/ci/download_and_convert_models.sh
@@ -0,0 +1,8 @@
+#! /usr/bin/env bash
+
+wget "https://drive.google.com/uc?export=download&id=1Xp3HB51H6Nhl6e555ieJubVutQake5sR" -O model_imagenet.onnx
+./build_onnx2bnn/tools/onnx2bnn/onnx2bnn model_imagenet.onnx model_imagenet.dab --aggressive --verbose
+adb push model_imagenet.dab /data/local/tmp 
+wget "https://drive.google.com/uc?export=download&id=1zu48CFptAGZ91IDCBPJSPM0bxDuPm9HS" -O model_imagenet_stem.onnx
+./build_onnx2bnn/tools/onnx2bnn/onnx2bnn model_imagenet_stem.onnx model_imagenet_stem.dab --aggressive --verbose
+adb push model_imagenet_stem.dab /data/local/tmp/ 
diff --git a/ci/download_models.sh b/ci/download_models.sh
diff --git a/ci/template_dabnn_run_test.yml b/ci/template_dabnn_run_test.yml
@@ -3,7 +3,9 @@ steps:
   displayName: Binary Conv Test
 - bash: ci/adb_push_and_run.sh build_dabnn/tests/bgemm_test
   displayName: Binary Gemm Test
-- bash: ci/download_models.sh
-  displayName: Download Models
+- bash: ci/build_onnx2bnn.sh
+  displayName: Build onnx2bnn
+- bash: ci/download_and_convert_models.sh
+  displayName: Download and Convert Models
 - bash: ci/adb_push_and_run.sh build_dabnn/tests/net_test
   displayName: Model Test