Skip to content

Commit d77688a

Browse files
dpascualhedpascualhe
authored
Merge pull request #232 from JdeRobot/revert-231-dph/v2
Revert "DetectionMetrics v2"
2 parents dfe0dfe + 4f4ab11 commit d77688a

File tree

429 files changed

+28144
-9411
lines changed

Some content is hidden

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

429 files changed

+28144
-9411
lines changed

‎.github/workflows/main.yml

+36
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
# This is a basic workflow to help you get started with Actions
2+
3+
name: Publish Docker image
4+
5+
# Controls when the action will run. Triggers the workflow on push or pull request
6+
# events but only for the noetic-devel branch
7+
on:
8+
push:
9+
branches: [ master ]
10+
pull_request:
11+
branches: [ master ]
12+
13+
# A workflow run is made up of one or more jobs that can run sequentially or in parallel
14+
jobs:
15+
push_to_registry:
16+
name: Push Docker image to Docker Hub
17+
runs-on: ubuntu-latest
18+
steps:
19+
- name: Check out the repo
20+
uses: actions/checkout@v2
21+
- name: Set up QEMU
22+
uses: docker/setup-qemu-action@v1
23+
- name: Set up Docker Buildx
24+
uses: docker/setup-buildx-action@v1
25+
- name: Login to DockerHub
26+
uses: docker/login-action@v1
27+
with:
28+
username: ${{ secrets.DOCKER_USERNAME }}
29+
password: ${{ secrets.DOCKER_PASSWORD }}
30+
- name: Push to Docker Hub
31+
uses: docker/build-push-action@v2
32+
with:
33+
push: true
34+
tags: jderobot/detection-metrics:noetic
35+
context: DetectionMetrics/Dockerfile/
36+
file: DetectionMetrics/Dockerfile/Dockerfile

‎.gitignore

+3-9
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,4 @@
1-
.vscode
1+
.clang_complete
22

3-
.mypy_cache
4-
__pycache__
5-
6-
.venv
7-
dist
8-
poetry.lock
9-
10-
local/*
3+
# Py byte files
4+
*.py[cod]

‎.travis.yml

+99
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,99 @@
1+
language: cpp
2+
3+
os:
4+
- linux
5+
- osx
6+
7+
sudo: required
8+
dist: xenial
9+
10+
compiler:
11+
- gcc
12+
- clang
13+
14+
cache:
15+
pip: true
16+
directories:
17+
- $HOME/opencv/
18+
- $HOME/darknet/
19+
20+
matrix:
21+
include:
22+
- env: TO_TEST=WITH_ROS_AND_ICE
23+
24+
addons:
25+
apt:
26+
sources:
27+
- sourceline: "deb http://packages.ros.org/ros/ubuntu $(lsb_release -sc) main"
28+
key_url: "http://keyserver.ubuntu.com/pks/lookup?op=get&search=0x421C365BD9FF1F717815A3895523BAEEB01FA116"
29+
- sourceline: "deb http://zeroc.com/download/Ice/3.6/ubuntu16.04 stable main"
30+
key_url: "http://keyserver.ubuntu.com/pks/lookup?search=0x5E6DA83306132997&fingerprint=on&hash=on&op=get"
31+
packages:
32+
- rapidjson-dev
33+
- libssl-dev
34+
- libboost-dev
35+
- libboost-filesystem-dev
36+
- libboost-system-dev
37+
- libboost-program-options-dev
38+
- libgoogle-glog-dev
39+
- libyaml-cpp-dev
40+
- qt5-default
41+
- libqt5svg5-dev
42+
- libqt5opengl5-dev
43+
- ros-kinetic-roscpp
44+
- ros-kinetic-cv-bridge
45+
- ros-kinetic-image-transport
46+
- zeroc-ice-all-runtime
47+
- zeroc-ice-all-dev
48+
- doxygen
49+
- doxygen-doc
50+
- doxygen-latex
51+
- doxygen-gui
52+
- graphviz
53+
54+
homebrew:
55+
update: true
56+
brewfile: true
57+
58+
before_install:
59+
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export PATH="/usr/local/opt/qt/bin:$PATH" ; fi
60+
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then wget https://www.python.org/ftp/python/2.7.15/python-2.7.15-macosx10.6.pkg ; fi
61+
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then sudo installer -pkg python-2.7.15-macosx10.6.pkg -target / ; fi
62+
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export PATH="/Library/Frameworks/Python.framework/Versions/2.7/bin:${PATH}" ; fi
63+
- if [[ ( "$TRAVIS_OS_NAME" == "linux" ) && ( "$TO_TEST" == "WITH_ROS_AND_ICE" ) ]]; then source /opt/ros/kinetic/setup.bash ; fi
64+
- sudo pip install numpy
65+
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then bash -x install_opencv.sh ; fi
66+
- ./install_darknet.sh
67+
68+
before_script:
69+
- cd DetectionMetrics
70+
- mkdir build
71+
- cd build
72+
- cmake ..
73+
74+
script: make -j2
75+
76+
after_success:
77+
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then travis_wait bash ../package.sh ; fi # To run the script in the same shell so as to setup environment variables
78+
- ls -lh out/* # Assuming you have some files in out/ that you would like to upload
79+
- wget -c https://github.com/probonopd/uploadtool/raw/master/upload.sh
80+
- travis_wait bash upload.sh out/*
81+
- cd $TRAVIS_BUILD_DIR && rm -rf DetectionMetrics/build
82+
- wget https://jderobot.org/resources/assets/jderobot.png
83+
- doxygen
84+
- echo "" > html/.nojekyll
85+
86+
deploy:
87+
provider: pages
88+
skip-cleanup: true
89+
local_dir: $TRAVIS_BUILD_DIR/html
90+
github-token: $GITHUB_TOKEN # Set in the settings page of your repository, as a secure variable
91+
on:
92+
branch: master
93+
condition: ( "$TO_TEST" == "WITH_ROS_AND_ICE" ) # Publish only in the 4th job
94+
95+
branches:
96+
except:
97+
- # Do not build tags that we create when we upload to GitHub Releases
98+
- /^(?i:continuous)$/
99+
- gh-pages

‎Brewfile

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
tap "homebrew/bundle"
2+
brew "boost"
3+
brew "boost-python"
4+
brew "cmake"
5+
brew "gcc"
6+
brew "glog"
7+
brew "libyaml"
8+
brew "qt"
9+
brew "rapidjson"
10+
brew "opencv"
11+
brew "yaml-cpp"

‎CONTRIBUTING.md

+5-7
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
Thanks for your interest on contributing!
44

5-
This file contains a set of rules to contributing to the project and the
5+
This file contains a set of rules to contributing to the project and the
66
rest of the projects developed by JdeRobot.
77
If you have any doubt about how to contribute contact one of the maintainers
88
of the project. They will be pleased to tell you how you can contribute with your
@@ -19,7 +19,7 @@ Please report any unacceptable behavior to any of [the maintainers](#i-have-a-qu
1919

2020
<a name="#prerequisites"></a>
2121
## Prerequisites before contributing
22-
In order to contribute to JdeRobot projects, please read carefully the project README.md/webpage (if available) before
22+
In order to contribute to JdeRobot projects, please read carefully the project README.md/webpage (if available) before
2323
starting contributing to understand the purpose of the project and where you can contribute.
2424

2525
<a name="#how-to-contribute"></a>
@@ -40,24 +40,22 @@ The two following points are different depending on the permissions you have to
4040
write a good description of the changes made and refer to the issue solved to make things easier to the maintainers. Include any additional resource that would be interesting (references, screenshots...). Link the PR with the issue
4141

4242
* **Testing and merging pull requests**
43-
Your pull request will be automatically tested by Travis CI. If any jobs have failed, you should fix them.
43+
Your pull request will be automatically tested by Travis CI. If any jobs have failed, you should fix them.
4444
To rerun the automatic builds just push changes to your branch on GitHub. No need to close that pull request and open a new one!
4545
Once all the builders are "green", one of DetectionMetrics's developers will review your code. Reviewer could ask you to modify your pull request.
4646
Please provide timely response for reviewers (within weeks, not months), otherwise you submission could be postponed or even rejected.
47-
47+
4848
* **[If you have write permission] Don't accept your own pull requests:** Wait for a project maintainer to accept the changes you made. They will probably comment the pull request with some feedback and will consider if it can be merge to the master branch.
4949
Be proactive and kind!
5050

5151
<a name="#contact"></a>
5252
## I have a question
5353
If you have any question related to how to contribute to the project or anything related to the organization,
54-
you can contact the main project maintainers sending them an email. Indicate the project you are talking about in the
54+
you can contact the main project maintainers sending them an email. Indicate the project you are talking about in the
5555
subject of the email, please.
5656

5757
Emails:
5858

59-
<d.pascualhe@gmail.com>
60-
6159
<sergiopaniegoblanco@gmail.com>
6260

6361
<vinay0410sharma@gmail.com>

‎DetectionMetrics/CMakeLists.txt

+75
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
cmake_minimum_required(VERSION 2.8)
2+
3+
project(samplerGenerator C CXX)
4+
5+
6+
#check compiller
7+
8+
include(CheckCXXCompilerFlag)
9+
CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11)
10+
11+
message ("-- version: ${CMAKE_CXX_COMPILER_VERSION}")
12+
if(COMPILER_SUPPORTS_CXX11)
13+
set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} -std=c++11)
14+
MESSAGE("-- C++11 support enabled")
15+
else()
16+
message(FATAL_ERROR "The compiler ${CMAKE_CXX_COMPILER} has no C++11 support.")
17+
endif()
18+
19+
IF (NOT CMAKE_BUILD_TYPE)
20+
MESSAGE("-- SETTING BUILD TYPE TO RELEASE")
21+
SET(CMAKE_BUILD_TYPE RELEASE)
22+
ENDIF()
23+
24+
25+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated -fPIC")
26+
set(CMAKE_MACOSX_RPATH 1)
27+
28+
#automated opencv
29+
include(FindPkgConfig)
30+
31+
## FIND_PACKAGE(JdeRobot REQUIRED)
32+
33+
include(Deps/glog/CMakeLists.txt)
34+
include(Deps/ice/CMakeLists.txt)
35+
include(Deps/numpy/CMakeLists.txt)
36+
include(Deps/yaml-cpp/CMakeLists.txt)
37+
include(Deps/ros/CMakeLists.txt)
38+
include(Deps/opencv/CMakeLists.txt)
39+
include(Deps/qt/CMakeLists.txt)
40+
41+
FIND_PACKAGE(Boost REQUIRED program_options filesystem)
42+
43+
set(DetectionMetrics_INCLUDE_DIR ${CMAKE_CURRENT_LIST_DIR}/DetectionMetricsLib)
44+
SET( INTERFACES_CPP_DIR ${CMAKE_CURRENT_BINARY_DIR}/libs/interfaces/cpp/jderobot ${CMAKE_CURRENT_BINARY_DIR}/libs/interfaces/cpp)
45+
46+
if(ZeroCIce_FOUND)
47+
add_definitions(-DICE)
48+
endif()
49+
if(roscpp_FOUND)
50+
add_definitions(-DJDERROS)
51+
endif()
52+
if(OpenCV_FOUND)
53+
SET(ENABLE_DNN_CAFFE ON)
54+
add_definitions(-DENABLE_DNN_CAFFE)
55+
endif(OpenCV_FOUND)
56+
57+
add_subdirectory(libs)
58+
if (QT_FOUND)
59+
add_subdirectory(DetectionMetricsLib)
60+
add_subdirectory(DatasetEvaluationApp)
61+
endif(QT_FOUND)
62+
add_subdirectory(SampleGenerationApp)
63+
add_subdirectory(Tools)
64+
65+
if(roscpp_FOUND)
66+
add_subdirectory(DetectionMetricsROS)
67+
endif()
68+
file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/ClassMappingHierarchy.xml
69+
DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
70+
file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/ClassMappingHierarchy.xml
71+
DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/Tools)
72+
73+
IF (BUILD_TEST)
74+
add_subdirectory(test)
75+
ENDIF()

‎DetectionMetrics/ClassMappingHierarchy.xml

+99
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,99 @@
1+
<mappings>
2+
3+
<class>
4+
<name>flying vehicle</name>
5+
<children>
6+
<class>
7+
<name>airplane</name>
8+
9+
</class>
10+
<class>
11+
<name>plane</name>
12+
13+
</class>
14+
<class>
15+
<name>aircraft</name>
16+
17+
</class>
18+
<class>
19+
<name>aeroplane</name>
20+
21+
</class>
22+
</children>
23+
</class>
24+
<class>
25+
<name>table</name>
26+
<children>
27+
<class>
28+
<name>dining table</name>
29+
30+
</class>
31+
<class>
32+
<name>diningtable</name>
33+
34+
</class>
35+
36+
</children>
37+
</class>
38+
<class>
39+
<name>plant</name>
40+
<children>
41+
<class>
42+
<name>pottedplant</name>
43+
</class>
44+
<class>
45+
<name>potted plant</name>
46+
</class>
47+
</children>
48+
</class>
49+
50+
<class>
51+
<name>appliance</name>
52+
<children>
53+
<class>
54+
<name>tv</name>
55+
</class>
56+
<class>
57+
<name>tvmonitor</name>
58+
</class>
59+
<class>
60+
<name>tv monitor</name>
61+
</class>
62+
<class>
63+
<name>television</name>
64+
</class>
65+
</children>
66+
</class>
67+
<class>
68+
<name>vehicle</name>
69+
<children>
70+
<class>
71+
<name>motorbike</name>
72+
</class>
73+
<class>
74+
<name>motorcycle</name>
75+
</class>
76+
<class>
77+
<name>bike</name>
78+
</class>
79+
<class>
80+
<name>motor bike</name>
81+
</class>
82+
<class>
83+
<name>motor cycle</name>
84+
</class>
85+
</children>
86+
</class>
87+
<class>
88+
<name>furniture</name>
89+
<children>
90+
<class>
91+
<name>sofa</name>
92+
</class>
93+
<class>
94+
<name>couch</name>
95+
</class>
96+
</children>
97+
</class>
98+
99+
</mappings>

0 commit comments

Comments
 (0)