Skip to content

Commit

Permalink
change pkg name
Browse files Browse the repository at this point in the history
  • Loading branch information
Sayter99 committed Mar 6, 2020
1 parent 5fd8628 commit 6a8f4fc
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
8 changes: 4 additions & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 2.8.3)
project(compressed_image_viewer)
project(face_recognition_ultra_light)

add_compile_options(-std=c++14)

Expand Down Expand Up @@ -54,7 +54,7 @@ find_package(OpenCV 4 REQUIRED)
## DEPENDS: system dependencies of this project that dependent projects also need
catkin_package(
# INCLUDE_DIRS include
# LIBRARIES compressed_image_viewer
# LIBRARIES face_recognition_ultra_light
# CATKIN_DEPENDS cv_bridge image_transport roscpp rospy sensor_msgs std_msgs
# DEPENDS system_lib
)
Expand All @@ -73,7 +73,7 @@ include_directories(

## Declare a C++ library
# add_library(${PROJECT_NAME}
# src/${PROJECT_NAME}/compressed_image_viewer.cpp
# src/${PROJECT_NAME}/face_recognition_ultra_light.cpp
# )

## Add cmake target dependencies of the library
Expand All @@ -93,7 +93,7 @@ target_link_libraries(compressed_image_viewer
#############

## Add gtest based cpp test target and link libraries
# catkin_add_gtest(${PROJECT_NAME}-test test/test_compressed_image_viewer.cpp)
# catkin_add_gtest(${PROJECT_NAME}-test test/test_face_recognition_ultra_light.cpp)
# if(TARGET ${PROJECT_NAME}-test)
# target_link_libraries(${PROJECT_NAME}-test ${PROJECT_NAME})
# endif()
Expand Down
6 changes: 3 additions & 3 deletions package.xml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0"?>
<package format="2">
<name>compressed_image_viewer</name>
<name>face_recognition_ultra_light</name>
<version>0.0.0</version>
<description>The compressed_image_viewer package</description>
<description>The face_recognition_ultra_light package</description>

<!-- One maintainer tag required, multiple allowed, one person per tag -->
<!-- Example: -->
Expand All @@ -19,7 +19,7 @@
<!-- Url tags are optional, but multiple are allowed, one per tag -->
<!-- Optional attribute type can be: website, bugtracker, or repository -->
<!-- Example: -->
<!-- <url type="website">http://wiki.ros.org/compressed_image_viewer</url> -->
<!-- <url type="website">http://wiki.ros.org/face_recognition_ultra_light</url> -->


<!-- Author tags are optional, multiple are allowed, one per tag -->
Expand Down
2 changes: 1 addition & 1 deletion scripts/face_detection.py
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ def predict(width, height, confidences, boxes, prob_threshold, iou_threshold=0.5
class face_detection():
def __init__(self):
rospy.init_node('face_detection', anonymous=True)
pkg_path = rospkg.RosPack().get_path('compressed_image_viewer')
pkg_path = rospkg.RosPack().get_path('face_recognition_ultra_light')
self.onnx_path = pkg_path + '/onnx/ultra_light_640.onnx'
self.onnx_model = onnx.load(self.onnx_path)
# onnx.checker.check_model(self.onnx_model)
Expand Down

0 comments on commit 6a8f4fc

Please sign in to comment.