From cf3b15b7cf2cb7ac36df8cfb2f19942332717b22 Mon Sep 17 00:00:00 2001 From: mhubii Date: Mon, 1 Jul 2024 14:49:07 +0100 Subject: [PATCH] whisper_msgs -> whisper_idl --- README.md | 4 ++-- audio_listener/package.xml | 2 +- audio_listener/setup.py | 2 +- whisper_bringup/package.xml | 4 ++-- whisper_cpp_vendor/package.xml | 2 +- whisper_demos/package.xml | 4 ++-- whisper_demos/setup.py | 2 +- whisper_demos/whisper_demos/whisper_on_key.py | 4 ++-- {whisper_msgs => whisper_idl}/CMakeLists.txt | 2 +- {whisper_msgs => whisper_idl}/LICENSE | 0 {whisper_msgs => whisper_idl}/action/Inference.action | 0 {whisper_msgs => whisper_idl}/package.xml | 4 ++-- whisper_server/CMakeLists.txt | 2 +- whisper_server/include/whisper_server/inference_node.hpp | 4 ++-- whisper_server/package.xml | 4 ++-- whisper_util/package.xml | 2 +- 16 files changed, 21 insertions(+), 21 deletions(-) rename {whisper_msgs => whisper_idl}/CMakeLists.txt (95%) rename {whisper_msgs => whisper_idl}/LICENSE (100%) rename {whisper_msgs => whisper_idl}/action/Inference.action (100%) rename {whisper_msgs => whisper_idl}/package.xml (93%) diff --git a/README.md b/README.md index 09e019b..d2ae80c 100644 --- a/README.md +++ b/README.md @@ -20,10 +20,10 @@ Run a client node (activated on space bar press): ros2 run whisper_demos whisper_on_key ``` -Configure `whisper` parameters in [whisper.yaml](whisper_server/config//whisper.yaml). +Configure `whisper` parameters in [whisper.yaml](whisper_server/config/whisper.yaml). ## Available Actions -Action server under topic `inference` of type [Inference.action](whisper_msgs/action/Inference.action). +Action server under topic `inference` of type [Inference.action](whisper_idl/action/Inference.action). ## Troubleshoot - Encoder inference time: https://github.com/ggerganov/whisper.cpp/issues/10#issuecomment-1302462960 diff --git a/audio_listener/package.xml b/audio_listener/package.xml index 99fe7d9..d830bf3 100644 --- a/audio_listener/package.xml +++ b/audio_listener/package.xml @@ -2,7 +2,7 @@ audio_listener - 1.3.0 + 1.3.1 Audio common replica. mhubii MIT diff --git a/audio_listener/setup.py b/audio_listener/setup.py index dd0ddcf..37cc54d 100644 --- a/audio_listener/setup.py +++ b/audio_listener/setup.py @@ -4,7 +4,7 @@ setup( name=package_name, - version="1.3.0", + version="1.3.1", packages=find_packages(exclude=["test"]), data_files=[ ("share/ament_index/resource_index/packages", ["resource/" + package_name]), diff --git a/whisper_bringup/package.xml b/whisper_bringup/package.xml index 3ba7e34..2d9d12f 100644 --- a/whisper_bringup/package.xml +++ b/whisper_bringup/package.xml @@ -2,7 +2,7 @@ whisper_bringup - 1.3.0 + 1.3.1 TODO: Package description mhubii MIT @@ -11,7 +11,7 @@ rclcpp_components whisper_cpp_vendor - whisper_msgs + whisper_idl whisper_server whisper_util diff --git a/whisper_cpp_vendor/package.xml b/whisper_cpp_vendor/package.xml index 53f56b1..b5d90b2 100644 --- a/whisper_cpp_vendor/package.xml +++ b/whisper_cpp_vendor/package.xml @@ -2,7 +2,7 @@ whisper_cpp_vendor - 1.3.0 + 1.3.1 Vendor package for whisper.cpp. mhubii MIT diff --git a/whisper_demos/package.xml b/whisper_demos/package.xml index b789c1e..aa8b19e 100644 --- a/whisper_demos/package.xml +++ b/whisper_demos/package.xml @@ -2,7 +2,7 @@ whisper_demos - 1.3.0 + 1.3.1 Demos for using the ROS 2 whisper package. mhubii MIT @@ -10,8 +10,8 @@ audio_listener builtin_interfaces rclpy + whisper_idl whisper_server - whisper_msgs ament_copyright ament_flake8 diff --git a/whisper_demos/setup.py b/whisper_demos/setup.py index 9b8b458..5b59fb3 100644 --- a/whisper_demos/setup.py +++ b/whisper_demos/setup.py @@ -4,7 +4,7 @@ setup( name=package_name, - version="1.3.0", + version="1.3.1", packages=find_packages(exclude=["test"]), data_files=[ ("share/ament_index/resource_index/packages", ["resource/" + package_name]), diff --git a/whisper_demos/whisper_demos/whisper_on_key.py b/whisper_demos/whisper_demos/whisper_on_key.py index f1849d3..5dfaf1a 100644 --- a/whisper_demos/whisper_demos/whisper_on_key.py +++ b/whisper_demos/whisper_demos/whisper_on_key.py @@ -6,9 +6,9 @@ from rclpy.action import ActionClient from rclpy.node import Node from rclpy.task import Future -from whisper_msgs.action._inference import Inference_FeedbackMessage +from whisper_idl.action._inference import Inference_FeedbackMessage -from whisper_msgs.action import Inference +from whisper_idl.action import Inference class WhisperOnKey(Node): diff --git a/whisper_msgs/CMakeLists.txt b/whisper_idl/CMakeLists.txt similarity index 95% rename from whisper_msgs/CMakeLists.txt rename to whisper_idl/CMakeLists.txt index 46708f5..0a2c1af 100644 --- a/whisper_msgs/CMakeLists.txt +++ b/whisper_idl/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.8) -project(whisper_msgs) +project(whisper_idl) if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang") add_compile_options(-Wall -Wextra -Wpedantic) diff --git a/whisper_msgs/LICENSE b/whisper_idl/LICENSE similarity index 100% rename from whisper_msgs/LICENSE rename to whisper_idl/LICENSE diff --git a/whisper_msgs/action/Inference.action b/whisper_idl/action/Inference.action similarity index 100% rename from whisper_msgs/action/Inference.action rename to whisper_idl/action/Inference.action diff --git a/whisper_msgs/package.xml b/whisper_idl/package.xml similarity index 93% rename from whisper_msgs/package.xml rename to whisper_idl/package.xml index 40b0031..79a0331 100644 --- a/whisper_msgs/package.xml +++ b/whisper_idl/package.xml @@ -1,8 +1,8 @@ - whisper_msgs - 1.3.0 + whisper_idl + 1.3.1 Messages for the ROS 2 whisper package mhubii MIT diff --git a/whisper_server/CMakeLists.txt b/whisper_server/CMakeLists.txt index 3ea8592..15928bc 100644 --- a/whisper_server/CMakeLists.txt +++ b/whisper_server/CMakeLists.txt @@ -20,7 +20,7 @@ set(WHISPER_NODES_DEPENDENCIES rclcpp_action std_msgs std_srvs - whisper_msgs + whisper_idl whisper_util ) diff --git a/whisper_server/include/whisper_server/inference_node.hpp b/whisper_server/include/whisper_server/inference_node.hpp index 5d1594a..36a0819 100644 --- a/whisper_server/include/whisper_server/inference_node.hpp +++ b/whisper_server/include/whisper_server/inference_node.hpp @@ -12,14 +12,14 @@ #include "rclcpp_action/rclcpp_action.hpp" #include "std_msgs/msg/int16_multi_array.hpp" -#include "whisper_msgs/action/inference.hpp" +#include "whisper_idl/action/inference.hpp" #include "whisper_util/audio_buffers.hpp" #include "whisper_util/model_manager.hpp" #include "whisper_util/whisper.hpp" namespace whisper { class InferenceNode { - using Inference = whisper_msgs::action::Inference; + using Inference = whisper_idl::action::Inference; using GoalHandleInference = rclcpp_action::ServerGoalHandle; public: diff --git a/whisper_server/package.xml b/whisper_server/package.xml index 8c08a8d..27fdefa 100644 --- a/whisper_server/package.xml +++ b/whisper_server/package.xml @@ -2,7 +2,7 @@ whisper_server - 1.3.0 + 1.3.1 ROS 2 whisper.cpp inference server. mhubii MIT @@ -16,7 +16,7 @@ rclcpp_components std_msgs std_srvs - whisper_msgs + whisper_idl whisper_util ament_lint_auto diff --git a/whisper_util/package.xml b/whisper_util/package.xml index ccc6cfb..bb5d697 100644 --- a/whisper_util/package.xml +++ b/whisper_util/package.xml @@ -2,7 +2,7 @@ whisper_util - 1.3.0 + 1.3.1 ROS 2 wrapper for whisper.cpp. mhubii MIT