Skip to content

Commit

Permalink
whisper_msgs -> whisper_idl
Browse files Browse the repository at this point in the history
  • Loading branch information
mhubii committed Jul 1, 2024
1 parent be3921c commit cf3b15b
Show file tree
Hide file tree
Showing 16 changed files with 21 additions and 21 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion audio_listener/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>audio_listener</name>
<version>1.3.0</version>
<version>1.3.1</version>
<description>Audio common replica.</description>
<maintainer email="[email protected]">mhubii</maintainer>
<license>MIT</license>
Expand Down
2 changes: 1 addition & 1 deletion audio_listener/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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]),
Expand Down
4 changes: 2 additions & 2 deletions whisper_bringup/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>whisper_bringup</name>
<version>1.3.0</version>
<version>1.3.1</version>
<description>TODO: Package description</description>
<maintainer email="[email protected]">mhubii</maintainer>
<license>MIT</license>
Expand All @@ -11,7 +11,7 @@

<exec_depend>rclcpp_components</exec_depend>
<exec_depend>whisper_cpp_vendor</exec_depend>
<exec_depend>whisper_msgs</exec_depend>
<exec_depend>whisper_idl</exec_depend>
<exec_depend>whisper_server</exec_depend>
<exec_depend>whisper_util</exec_depend>

Expand Down
2 changes: 1 addition & 1 deletion whisper_cpp_vendor/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>whisper_cpp_vendor</name>
<version>1.3.0</version>
<version>1.3.1</version>
<description>Vendor package for whisper.cpp.</description>
<maintainer email="[email protected]">mhubii</maintainer>
<license>MIT</license>
Expand Down
4 changes: 2 additions & 2 deletions whisper_demos/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>whisper_demos</name>
<version>1.3.0</version>
<version>1.3.1</version>
<description>Demos for using the ROS 2 whisper package.</description>
<maintainer email="[email protected]">mhubii</maintainer>
<license>MIT</license>

<exec_depend>audio_listener</exec_depend>
<exec_depend>builtin_interfaces</exec_depend>
<exec_depend>rclpy</exec_depend>
<exec_depend>whisper_idl</exec_depend>
<exec_depend>whisper_server</exec_depend>
<exec_depend>whisper_msgs</exec_depend>

<test_depend>ament_copyright</test_depend>
<test_depend>ament_flake8</test_depend>
Expand Down
2 changes: 1 addition & 1 deletion whisper_demos/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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]),
Expand Down
4 changes: 2 additions & 2 deletions whisper_demos/whisper_demos/whisper_on_key.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
2 changes: 1 addition & 1 deletion whisper_msgs/CMakeLists.txt → whisper_idl/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions whisper_msgs/package.xml → whisper_idl/package.xml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0"?>
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>whisper_msgs</name>
<version>1.3.0</version>
<name>whisper_idl</name>
<version>1.3.1</version>
<description>Messages for the ROS 2 whisper package</description>
<maintainer email="[email protected]">mhubii</maintainer>
<license>MIT</license>
Expand Down
2 changes: 1 addition & 1 deletion whisper_server/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ set(WHISPER_NODES_DEPENDENCIES
rclcpp_action
std_msgs
std_srvs
whisper_msgs
whisper_idl
whisper_util
)

Expand Down
4 changes: 2 additions & 2 deletions whisper_server/include/whisper_server/inference_node.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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<Inference>;

public:
Expand Down
4 changes: 2 additions & 2 deletions whisper_server/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>whisper_server</name>
<version>1.3.0</version>
<version>1.3.1</version>
<description>ROS 2 whisper.cpp inference server.</description>
<maintainer email="[email protected]">mhubii</maintainer>
<license>MIT</license>
Expand All @@ -16,7 +16,7 @@
<depend>rclcpp_components</depend>
<depend>std_msgs</depend>
<depend>std_srvs</depend>
<depend>whisper_msgs</depend>
<depend>whisper_idl</depend>
<depend>whisper_util</depend>

<test_depend>ament_lint_auto</test_depend>
Expand Down
2 changes: 1 addition & 1 deletion whisper_util/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>whisper_util</name>
<version>1.3.0</version>
<version>1.3.1</version>
<description>ROS 2 wrapper for whisper.cpp.</description>
<maintainer email="[email protected]">mhubii</maintainer>
<license>MIT</license>
Expand Down

0 comments on commit cf3b15b

Please sign in to comment.