Merge branch 'dev-0.11'

RidgeRun · Apr 6, 2021 · 40fbf63 · 40fbf63
2 parents 871c144 + b1a1d73
commit 40fbf63
Show file tree

Hide file tree

Showing 94 changed files with 13 additions and 8,683 deletions.
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -10,112 +10,6 @@ on:
       - dev-*
 
 jobs:
-  build_tensorflow_autotools:
-    runs-on: ubuntu-18.04
-    strategy:
-      matrix:
-       container: ["ridgerun/r2inference-ubuntu-18.04:v0.1.5", "ridgerun/r2inference-ubuntu-16.04:v0.3.1"]
-    container:
-      image: ${{ matrix.container }}
-    env:
-      CXXFLAGS: "-Werror"
-    steps:
-    - uses: actions/checkout@v2
-    - name: Install backend version
-      run: |
-        tar -C /usr/local -xzf /root/r2inference/backends/tensorflow/v1.15.0/libtensorflow-cpu-linux-x86_64-1.15.0.tar.gz
-        ldconfig
-    - name: Configure the project
-      run: |
-        CXXFLAGS="${{ env.CXXFLAGS }}"
-        NOCONFIGURE=1 ./autogen.sh
-        ./configure --disable-docs --enable-tensorflow
-    - name: Build library
-      run: make
-    - name: Run tests
-      run: make check
-    - name: Install library
-      run: |
-        make install
-    - name: Build example
-      env:
-        LD_LIBRARY_PATH: /usr/local/lib/
-      run: |
-        cd examples/external
-        make
-        ./list-backends
-  build_tflite_autotools:
-    runs-on: ubuntu-18.04
-    strategy:
-      matrix:
-       container: ["ridgerun/r2inference-ubuntu-18.04:v0.1.5"]
-    container:
-      image: ${{ matrix.container }}
-    env:
-      TENSORFLOW_PATH: /root/r2inference/backends/tflite/v2.0.1/include/tensorflow
-      CPPFLAGS: "-I${TENSORFLOW_PATH} -I${TENSORFLOW_PATH}/tensorflow/lite/tools/make/downloads/flatbuffers/include"
-      CXXFLAGS: "-Werror"
-    steps:
-    - uses: actions/checkout@v2
-    - name: Install backend version
-      run: |
-        cp /root/r2inference/backends/tflite/v2.0.1/binaries/libtensorflow-lite.a /usr/local/lib/
-    - name: Configure the project
-      run: |
-        CPPFLAGS="${{ env.CPPFLAGS }}"
-        CXXFLAGS="${{ env.CXXFLAGS }}"
-        ./autogen.sh --disable-docs --enable-tflite
-    - name: Build library
-      run: make
-    - name: Run tests
-      run:  make check
-    - name: Install library
-      run: |
-        make install
-    - name: Build example
-      env:
-        LD_LIBRARY_PATH: /usr/local/lib/
-      run: |
-        cd examples/external
-        make
-        ./list-backends
-  build_tensorflow_tflite_autotools:
-    runs-on: ubuntu-18.04
-    strategy:
-      matrix:
-       container: ["ridgerun/r2inference-ubuntu-18.04:v0.1.5"]
-    container:
-      image: ${{ matrix.container }}
-    env:
-      TENSORFLOW_PATH: /root/r2inference/backends/tflite/v2.0.1/include/tensorflow
-      CPPFLAGS: "-I${TENSORFLOW_PATH} -I${TENSORFLOW_PATH}/tensorflow/lite/tools/make/downloads/flatbuffers/include"
-      CXXFLAGS: "-Werror"
-    steps:
-    - uses: actions/checkout@v2
-    - name: Install backend version
-      run: |
-        tar -C /usr/local -xzf /root/r2inference/backends/tensorflow/v1.15.0/libtensorflow-cpu-linux-x86_64-1.15.0.tar.gz
-        ldconfig
-        cp /root/r2inference/backends/tflite/v2.0.1/binaries/libtensorflow-lite.a /usr/local/lib/
-    - name: Configure the project
-      run: |
-        CPPFLAGS="${{ env.CPPFLAGS }}"
-        CXXFLAGS="${{ env.CXXFLAGS }}"
-        ./autogen.sh --disable-docs --enable-tensorflow --enable-tflite
-    - name: Build library
-      run: make
-    - name: Run tests
-      run:  make check
-    - name: Install library
-      run: |
-        make install
-    - name: Build example
-      env:
-        LD_LIBRARY_PATH: /usr/local/lib/
-      run: |
-        cd examples/external
-        make
-        ./list-backends
   build_tensorflow_meson:
     runs-on: ubuntu-18.04
     strategy:

diff --git a/.gitignore b/.gitignore
@@ -4,35 +4,7 @@
 \#*
 *.orig
 
-# Autotools cruft
-aclocal.m4
-autom4te.cache/
-compile
-config.guess
-config.h
-config.h.in
-config.status
-config.sub
-configure
-install-sh
-missing
-Makefile
-Makefile.in
-depcomp
-libtool
-ltmain.sh
-m4/
-.deps/
-.libs/
-stamp-h*
-r2inference-*.pc
-*.dirstamp
-
 # Build outputs
-.deps/
-.libs/
-*.la
-*.lo
 *.o
 
 # Git conflict files
@@ -41,9 +13,6 @@ r2inference-*.pc
 # Doxygen outputs
 docs/api/out/
 
-# Do not ignore our M4 macros
-!common/m4
-
 # Coverage cruft
 RidgeRun inference library-0.1.0-coverage*
 aminclude_static.am
@@ -77,7 +46,5 @@ cscope.out
 # Examples
 examples/external/list-backends
 examples/r2i/list_parameters
-examples/r2i/ncsdk/inception
-examples/r2i/ncsdk/tinyyolov2
 examples/r2i/tensorflow/inception
 examples/r2i/tensorrt/yolov2
diff --git a/Makefile.am b/Makefile.am
diff --git a/autogen.sh b/autogen.sh
diff --git a/common/autogen.sh b/common/autogen.sh
diff --git a/common/linters/tests.sh b/common/linters/tests.sh
@@ -16,7 +16,7 @@ test_driver="common/rr-test-driver.py"
 
 run_tests()
 {
-    make -s check
+    ninja -C build test
     ret=$?
 
     return $ret