Skip to content

Commit

Permalink
Merge pull request #232 from JdeRobot/revert-231-dph/v2
Browse files Browse the repository at this point in the history
Revert "DetectionMetrics v2"
  • Loading branch information
dpascualhe authored Nov 21, 2024
2 parents dfe0dfe + 4f4ab11 commit d77688a
Show file tree
Hide file tree
Showing 429 changed files with 28,144 additions and 9,411 deletions.
36 changes: 36 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
# This is a basic workflow to help you get started with Actions

name: Publish Docker image

# Controls when the action will run. Triggers the workflow on push or pull request
# events but only for the noetic-devel branch
on:
push:
branches: [ master ]
pull_request:
branches: [ master ]

# A workflow run is made up of one or more jobs that can run sequentially or in parallel
jobs:
push_to_registry:
name: Push Docker image to Docker Hub
runs-on: ubuntu-latest
steps:
- name: Check out the repo
uses: actions/checkout@v2
- name: Set up QEMU
uses: docker/setup-qemu-action@v1
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1
- name: Login to DockerHub
uses: docker/login-action@v1
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
- name: Push to Docker Hub
uses: docker/build-push-action@v2
with:
push: true
tags: jderobot/detection-metrics:noetic
context: DetectionMetrics/Dockerfile/
file: DetectionMetrics/Dockerfile/Dockerfile
12 changes: 3 additions & 9 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,10 +1,4 @@
.vscode
.clang_complete

.mypy_cache
__pycache__

.venv
dist
poetry.lock

local/*
# Py byte files
*.py[cod]
99 changes: 99 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,99 @@
language: cpp

os:
- linux
- osx

sudo: required
dist: xenial

compiler:
- gcc
- clang

cache:
pip: true
directories:
- $HOME/opencv/
- $HOME/darknet/

matrix:
include:
- env: TO_TEST=WITH_ROS_AND_ICE

addons:
apt:
sources:
- sourceline: "deb http://packages.ros.org/ros/ubuntu $(lsb_release -sc) main"
key_url: "http://keyserver.ubuntu.com/pks/lookup?op=get&search=0x421C365BD9FF1F717815A3895523BAEEB01FA116"
- sourceline: "deb http://zeroc.com/download/Ice/3.6/ubuntu16.04 stable main"
key_url: "http://keyserver.ubuntu.com/pks/lookup?search=0x5E6DA83306132997&fingerprint=on&hash=on&op=get"
packages:
- rapidjson-dev
- libssl-dev
- libboost-dev
- libboost-filesystem-dev
- libboost-system-dev
- libboost-program-options-dev
- libgoogle-glog-dev
- libyaml-cpp-dev
- qt5-default
- libqt5svg5-dev
- libqt5opengl5-dev
- ros-kinetic-roscpp
- ros-kinetic-cv-bridge
- ros-kinetic-image-transport
- zeroc-ice-all-runtime
- zeroc-ice-all-dev
- doxygen
- doxygen-doc
- doxygen-latex
- doxygen-gui
- graphviz

homebrew:
update: true
brewfile: true

before_install:
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export PATH="/usr/local/opt/qt/bin:$PATH" ; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then wget https://www.python.org/ftp/python/2.7.15/python-2.7.15-macosx10.6.pkg ; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then sudo installer -pkg python-2.7.15-macosx10.6.pkg -target / ; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export PATH="/Library/Frameworks/Python.framework/Versions/2.7/bin:${PATH}" ; fi
- if [[ ( "$TRAVIS_OS_NAME" == "linux" ) && ( "$TO_TEST" == "WITH_ROS_AND_ICE" ) ]]; then source /opt/ros/kinetic/setup.bash ; fi
- sudo pip install numpy
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then bash -x install_opencv.sh ; fi
- ./install_darknet.sh

before_script:
- cd DetectionMetrics
- mkdir build
- cd build
- cmake ..

script: make -j2

after_success:
- 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
- ls -lh out/* # Assuming you have some files in out/ that you would like to upload
- wget -c https://github.com/probonopd/uploadtool/raw/master/upload.sh
- travis_wait bash upload.sh out/*
- cd $TRAVIS_BUILD_DIR && rm -rf DetectionMetrics/build
- wget https://jderobot.org/resources/assets/jderobot.png
- doxygen
- echo "" > html/.nojekyll

deploy:
provider: pages
skip-cleanup: true
local_dir: $TRAVIS_BUILD_DIR/html
github-token: $GITHUB_TOKEN # Set in the settings page of your repository, as a secure variable
on:
branch: master
condition: ( "$TO_TEST" == "WITH_ROS_AND_ICE" ) # Publish only in the 4th job

branches:
except:
- # Do not build tags that we create when we upload to GitHub Releases
- /^(?i:continuous)$/
- gh-pages
11 changes: 11 additions & 0 deletions Brewfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
tap "homebrew/bundle"
brew "boost"
brew "boost-python"
brew "cmake"
brew "gcc"
brew "glog"
brew "libyaml"
brew "qt"
brew "rapidjson"
brew "opencv"
brew "yaml-cpp"
12 changes: 5 additions & 7 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

Thanks for your interest on contributing!

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

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

<a name="#how-to-contribute"></a>
Expand All @@ -40,24 +40,22 @@ The two following points are different depending on the permissions you have to
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

* **Testing and merging pull requests**
Your pull request will be automatically tested by Travis CI. If any jobs have failed, you should fix them.
Your pull request will be automatically tested by Travis CI. If any jobs have failed, you should fix them.
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!
Once all the builders are "green", one of DetectionMetrics's developers will review your code. Reviewer could ask you to modify your pull request.
Please provide timely response for reviewers (within weeks, not months), otherwise you submission could be postponed or even rejected.

* **[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.
Be proactive and kind!

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

Emails:

<d.pascualhe@gmail.com>

<sergiopaniegoblanco@gmail.com>

<vinay0410sharma@gmail.com>
Expand Down
75 changes: 75 additions & 0 deletions DetectionMetrics/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
cmake_minimum_required(VERSION 2.8)

project(samplerGenerator C CXX)


#check compiller

include(CheckCXXCompilerFlag)
CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11)

message ("-- version: ${CMAKE_CXX_COMPILER_VERSION}")
if(COMPILER_SUPPORTS_CXX11)
set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} -std=c++11)
MESSAGE("-- C++11 support enabled")
else()
message(FATAL_ERROR "The compiler ${CMAKE_CXX_COMPILER} has no C++11 support.")
endif()

IF (NOT CMAKE_BUILD_TYPE)
MESSAGE("-- SETTING BUILD TYPE TO RELEASE")
SET(CMAKE_BUILD_TYPE RELEASE)
ENDIF()


set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated -fPIC")
set(CMAKE_MACOSX_RPATH 1)

#automated opencv
include(FindPkgConfig)

## FIND_PACKAGE(JdeRobot REQUIRED)

include(Deps/glog/CMakeLists.txt)
include(Deps/ice/CMakeLists.txt)
include(Deps/numpy/CMakeLists.txt)
include(Deps/yaml-cpp/CMakeLists.txt)
include(Deps/ros/CMakeLists.txt)
include(Deps/opencv/CMakeLists.txt)
include(Deps/qt/CMakeLists.txt)

FIND_PACKAGE(Boost REQUIRED program_options filesystem)

set(DetectionMetrics_INCLUDE_DIR ${CMAKE_CURRENT_LIST_DIR}/DetectionMetricsLib)
SET( INTERFACES_CPP_DIR ${CMAKE_CURRENT_BINARY_DIR}/libs/interfaces/cpp/jderobot ${CMAKE_CURRENT_BINARY_DIR}/libs/interfaces/cpp)

if(ZeroCIce_FOUND)
add_definitions(-DICE)
endif()
if(roscpp_FOUND)
add_definitions(-DJDERROS)
endif()
if(OpenCV_FOUND)
SET(ENABLE_DNN_CAFFE ON)
add_definitions(-DENABLE_DNN_CAFFE)
endif(OpenCV_FOUND)

add_subdirectory(libs)
if (QT_FOUND)
add_subdirectory(DetectionMetricsLib)
add_subdirectory(DatasetEvaluationApp)
endif(QT_FOUND)
add_subdirectory(SampleGenerationApp)
add_subdirectory(Tools)

if(roscpp_FOUND)
add_subdirectory(DetectionMetricsROS)
endif()
file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/ClassMappingHierarchy.xml
DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/ClassMappingHierarchy.xml
DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/Tools)

IF (BUILD_TEST)
add_subdirectory(test)
ENDIF()
99 changes: 99 additions & 0 deletions DetectionMetrics/ClassMappingHierarchy.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,99 @@
<mappings>

<class>
<name>flying vehicle</name>
<children>
<class>
<name>airplane</name>

</class>
<class>
<name>plane</name>

</class>
<class>
<name>aircraft</name>

</class>
<class>
<name>aeroplane</name>

</class>
</children>
</class>
<class>
<name>table</name>
<children>
<class>
<name>dining table</name>

</class>
<class>
<name>diningtable</name>

</class>

</children>
</class>
<class>
<name>plant</name>
<children>
<class>
<name>pottedplant</name>
</class>
<class>
<name>potted plant</name>
</class>
</children>
</class>

<class>
<name>appliance</name>
<children>
<class>
<name>tv</name>
</class>
<class>
<name>tvmonitor</name>
</class>
<class>
<name>tv monitor</name>
</class>
<class>
<name>television</name>
</class>
</children>
</class>
<class>
<name>vehicle</name>
<children>
<class>
<name>motorbike</name>
</class>
<class>
<name>motorcycle</name>
</class>
<class>
<name>bike</name>
</class>
<class>
<name>motor bike</name>
</class>
<class>
<name>motor cycle</name>
</class>
</children>
</class>
<class>
<name>furniture</name>
<children>
<class>
<name>sofa</name>
</class>
<class>
<name>couch</name>
</class>
</children>
</class>

</mappings>
Loading

0 comments on commit d77688a

Please sign in to comment.