Browse Source

ci opencv (#1511)

tags/20200226
nihui GitHub 6 years ago
parent
commit
0979a67990
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 7 deletions
  1. +6
    -6
      .github/workflows/ccpp.yml
  2. +1
    -0
      .travis.yml
  3. +2
    -1
      tools/quantize/CMakeLists.txt

+ 6
- 6
.github/workflows/ccpp.yml View File

@@ -8,7 +8,7 @@ jobs:
steps:
- uses: actions/checkout@v1
- name: protobuf
run: sudo apt-get install libprotobuf-dev protobuf-compiler
run: sudo apt-get install libprotobuf-dev protobuf-compiler libopencv-dev
- name: configure
run: mkdir build && cd build && cmake ..
- name: build
@@ -21,7 +21,7 @@ jobs:
steps:
- uses: actions/checkout@v1
- name: protobuf
run: sudo apt-get install libprotobuf-dev protobuf-compiler
run: sudo apt-get install libprotobuf-dev protobuf-compiler libopencv-dev
- name: cache-vulkansdk
id: cache-vulkansdk
uses: actions/cache@v1
@@ -76,7 +76,7 @@ jobs:
steps:
- uses: actions/checkout@v1
- name: protobuf
run: sudo apt-get install libprotobuf-dev protobuf-compiler
run: sudo apt-get install libprotobuf-dev protobuf-compiler libopencv-dev
- name: configure
env:
CC: clang
@@ -92,7 +92,7 @@ jobs:
steps:
- uses: actions/checkout@v1
- name: protobuf
run: sudo apt-get install libprotobuf-dev protobuf-compiler
run: sudo apt-get install libprotobuf-dev protobuf-compiler libopencv-dev
- name: cache-vulkansdk
id: cache-vulkansdk
uses: actions/cache@v1
@@ -165,7 +165,7 @@ jobs:
steps:
- uses: actions/checkout@v1
- name: protobuf
run: brew install protobuf
run: brew install protobuf opencv3
- name: configure
run: mkdir build && cd build && cmake ..
- name: build
@@ -178,7 +178,7 @@ jobs:
steps:
- uses: actions/checkout@v1
- name: protobuf
run: brew install protobuf
run: brew install protobuf opencv3
- name: cache-vulkansdk
id: cache-vulkansdk
uses: actions/cache@v1


+ 1
- 0
.travis.yml View File

@@ -8,6 +8,7 @@ addons:
- cmake
- libprotobuf-dev
- protobuf-compiler
- libopencv-dev

matrix:
include:


+ 2
- 1
tools/quantize/CMakeLists.txt View File

@@ -5,8 +5,9 @@ endif()

if(OpenCV_FOUND)
add_executable(ncnn2table ncnn2table.cpp)
target_link_libraries(ncnn2table PRIVATE ncnn ${OpenCV_LIBS})
target_compile_definitions(ncnn2table PRIVATE -DOpenCV_VERSION_MAJOR=${OpenCV_VERSION_MAJOR})
target_compile_options(ncnn2table PRIVATE -std=c++11)
target_link_libraries(ncnn2table PRIVATE ncnn ${OpenCV_LIBS})

add_executable(ncnn2int8 ncnn2int8.cpp)
target_link_libraries(ncnn2int8 PRIVATE ncnn)


Loading…
Cancel
Save