Skip to content

Commit 4f12fe1

Browse files
daquexiandaquexian
authored
Merge pull request #52 from JDAI-CV/ci
Replace travis and appveyor with azure pipeline
2 parents a645f98 + 3ca03f7 commit 4f12fe1

50 files changed

Lines changed: 365 additions & 174 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.daq_pm/configs/all-27‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# Configuration for [project_manager.vim](https://github.com/daquexian/project_manager.vim)
2+
name DNNLibrary
3+
type cpp
4+
build_dir build-all-v27
5+
cmake_options -DCMAKE_TOOLCHAIN_FILE=~/Android/Sdk/ndk-bundle/build/cmake/android.toolchain.cmake -DANDROID_PLATFORM=android-27 -DANDROID_ABI=arm64-v8a -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -GNinja

‎.travis.yml‎

Lines changed: 0 additions & 93 deletions
This file was deleted.

‎CMakeLists.txt‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ include(cmake/system.cmake)
1212
include(cmake/glog.cmake)
1313
include(cmake/common.cmake)
1414

15+
include(cmake/utils.cmake)
16+
dnn_add_msvc_runtime_flag()
17+
1518
configure_glog()
1619

1720
if (${CMAKE_SYSTEM_NAME} STREQUAL "Android")
@@ -29,8 +32,6 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL "Android")
2932
add_subdirectory(dnnlibrary)
3033
add_subdirectory(binaries)
3134
else()
32-
include(cmake/utils.cmake)
33-
dnn_add_msvc_runtime_flag()
3435
set (CMAKE_CXX_STANDARD 11)
3536
if (MSVC)
3637
set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS 1)

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# DNNLibrary
22

3-
[![Build Status](https://travis-ci.com/JDAI-CV/DNNLibrary.svg?branch=master)](https://travis-ci.com/JDAI-CV/DNNLibrary)
3+
[![Build Status](https://dev.azure.com/daquexian/DNNLibrary/_apis/build/status/DNNLibrary%20Build%20and%20Test?branchName=master)](https://dev.azure.com/daquexian/DNNLibrary/_build/latest?definitionId=8&branchName=master)
44
[![Download](https://api.bintray.com/packages/daquexian566/maven/dnnlibrary/images/download.svg) ](https://bintray.com/daquexian566/maven/dnnlibrary/_latestVersion)
55
![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square)
66

‎appveyor.yml‎

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎binaries/CMakeLists.txt‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,25 @@ if (DNN_BUILD_BIN)
44
target_link_libraries(dnn_retrieve_result
55
dnnlibrary)
66

7-
treat_warnings_as_errors(dnn_retrieve_result)
7+
if ((NOT DNN_READ_ONNX) OR DNN_SYSTEM_PROTOBUF)
8+
treat_warnings_as_errors(dnn_retrieve_result)
9+
endif()
810

911
add_executable(dnn_benchmark
1012
dnn_benchmark.cpp)
1113
target_link_libraries(dnn_benchmark
1214
dnnlibrary)
1315

14-
treat_warnings_as_errors(dnn_benchmark)
16+
if ((NOT DNN_READ_ONNX) OR DNN_SYSTEM_PROTOBUF)
17+
treat_warnings_as_errors(dnn_benchmark)
18+
endif()
1519

1620
add_executable(ex_model_builder
1721
ex_model_builder.cpp)
1822
target_link_libraries(ex_model_builder
1923
dnnlibrary)
2024

21-
treat_warnings_as_errors(ex_model_builder)
25+
if ((NOT DNN_READ_ONNX) OR DNN_SYSTEM_PROTOBUF)
26+
treat_warnings_as_errors(ex_model_builder)
27+
endif()
2228
endif()

‎binaries/dnn_benchmark.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ auto GetModel(css &daq_name, const bool allow_fp16,
3232
#if __ANDROID_API__ >= __ANDROID_API_P__
3333
model = builder.AllowFp16(allow_fp16).Compile(compile_preference);
3434
#else
35+
(void) allow_fp16;
3536
model = builder.Compile(compile_preference);
3637
#endif
3738
return model;

‎ci/adb_push_and_run.sh‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#! /usr/bin/env bash
2+
3+
# echo "${@:2}"
4+
adb push $1 /data/local/tmp/`basename $1` && adb shell "data/local/tmp/`basename $1` ${@:2}"

android_aar/.gitignore renamed to ci/android_aar/.gitignore

File renamed without changes.

android_aar/README.md renamed to ci/android_aar/README.md

File renamed without changes.

0 commit comments

Comments
 (0)