From 76bb3e9b60ff084335a19361a975af43383fe272 Mon Sep 17 00:00:00 2001 From: yamachu Date: Mon, 27 May 2024 19:54:30 +0900 Subject: [PATCH 1/8] Update submodule --- binding/voicevox_core | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/binding/voicevox_core b/binding/voicevox_core index 52bc1d6..4cd19cc 160000 --- a/binding/voicevox_core +++ b/binding/voicevox_core @@ -1 +1 @@ -Subproject commit 52bc1d657e9529b288c8da7966f5242463d6580b +Subproject commit 4cd19cce53ae2e0ee14adeb93180f3c6e530ba3a From 47b60df851405267888c1d4ddf28c8d8eda5df0d Mon Sep 17 00:00:00 2001 From: yamachu Date: Mon, 27 May 2024 20:15:12 +0900 Subject: [PATCH 2/8] make generate and add definitions --- .../Runtime/Script/Enum/ResultCode.cs | 6 ++++++ .../Runtime/Script/Native/CoreUnsafe.g.cs | 11 ++++++----- .../Runtime/Script/VoiceModel.cs | 2 +- src/VoicevoxCoreSharp.Core/Enum/ResultCode.cs | 6 ++++++ src/VoicevoxCoreSharp.Core/Native/CoreUnsafe.g.cs | 11 ++++++----- src/VoicevoxCoreSharp.Core/VoiceModel.cs | 2 +- .../VoicevoxCoreSharp.Core.Metas.props | 2 +- 7 files changed, 27 insertions(+), 13 deletions(-) diff --git a/src/VoicevoxCoreSharp.Core.Unity/Packages/VoicevoxCoreSharp.Core.Unity/Runtime/Script/Enum/ResultCode.cs b/src/VoicevoxCoreSharp.Core.Unity/Packages/VoicevoxCoreSharp.Core.Unity/Runtime/Script/Enum/ResultCode.cs index 3a54563..1b063eb 100644 --- a/src/VoicevoxCoreSharp.Core.Unity/Packages/VoicevoxCoreSharp.Core.Unity/Runtime/Script/Enum/ResultCode.cs +++ b/src/VoicevoxCoreSharp.Core.Unity/Packages/VoicevoxCoreSharp.Core.Unity/Runtime/Script/Enum/ResultCode.cs @@ -65,6 +65,10 @@ public enum ResultCode : int /// RESULT_READ_ZIP_ENTRY_ERROR = 17, /// + /// モデルの形式が不正 + /// + RESULT_INVALID_MODEL_HEADER_ERROR = 28, + /// /// すでに読み込まれている音声モデルを読み込もうとした /// RESULT_MODEL_ALREADY_LOADED_ERROR = 18, @@ -122,6 +126,7 @@ internal static ResultCode FromNative(this VoicevoxResultCode code) VoicevoxResultCode.VOICEVOX_RESULT_INVALID_ACCENT_PHRASE_ERROR => ResultCode.RESULT_INVALID_ACCENT_PHRASE_ERROR, VoicevoxResultCode.VOICEVOX_RESULT_OPEN_ZIP_FILE_ERROR => ResultCode.RESULT_OPEN_ZIP_FILE_ERROR, VoicevoxResultCode.VOICEVOX_RESULT_READ_ZIP_ENTRY_ERROR => ResultCode.RESULT_READ_ZIP_ENTRY_ERROR, + VoicevoxResultCode.VOICEVOX_RESULT_INVALID_MODEL_HEADER_ERROR => ResultCode.RESULT_INVALID_MODEL_HEADER_ERROR, VoicevoxResultCode.VOICEVOX_RESULT_MODEL_ALREADY_LOADED_ERROR => ResultCode.RESULT_MODEL_ALREADY_LOADED_ERROR, VoicevoxResultCode.VOICEVOX_RESULT_STYLE_ALREADY_LOADED_ERROR => ResultCode.RESULT_STYLE_ALREADY_LOADED_ERROR, VoicevoxResultCode.VOICEVOX_RESULT_INVALID_MODEL_DATA_ERROR => ResultCode.RESULT_INVALID_MODEL_DATA_ERROR, @@ -153,6 +158,7 @@ internal static VoicevoxResultCode ToNative(this ResultCode code) ResultCode.RESULT_INVALID_ACCENT_PHRASE_ERROR => VoicevoxResultCode.VOICEVOX_RESULT_INVALID_ACCENT_PHRASE_ERROR, ResultCode.RESULT_OPEN_ZIP_FILE_ERROR => VoicevoxResultCode.VOICEVOX_RESULT_OPEN_ZIP_FILE_ERROR, ResultCode.RESULT_READ_ZIP_ENTRY_ERROR => VoicevoxResultCode.VOICEVOX_RESULT_READ_ZIP_ENTRY_ERROR, + ResultCode.RESULT_INVALID_MODEL_HEADER_ERROR => VoicevoxResultCode.VOICEVOX_RESULT_INVALID_MODEL_HEADER_ERROR, ResultCode.RESULT_MODEL_ALREADY_LOADED_ERROR => VoicevoxResultCode.VOICEVOX_RESULT_MODEL_ALREADY_LOADED_ERROR, ResultCode.RESULT_STYLE_ALREADY_LOADED_ERROR => VoicevoxResultCode.VOICEVOX_RESULT_STYLE_ALREADY_LOADED_ERROR, ResultCode.RESULT_INVALID_MODEL_DATA_ERROR => VoicevoxResultCode.VOICEVOX_RESULT_INVALID_MODEL_DATA_ERROR, diff --git a/src/VoicevoxCoreSharp.Core.Unity/Packages/VoicevoxCoreSharp.Core.Unity/Runtime/Script/Native/CoreUnsafe.g.cs b/src/VoicevoxCoreSharp.Core.Unity/Packages/VoicevoxCoreSharp.Core.Unity/Runtime/Script/Native/CoreUnsafe.g.cs index 51f2321..06d3a32 100644 --- a/src/VoicevoxCoreSharp.Core.Unity/Packages/VoicevoxCoreSharp.Core.Unity/Runtime/Script/Native/CoreUnsafe.g.cs +++ b/src/VoicevoxCoreSharp.Core.Unity/Packages/VoicevoxCoreSharp.Core.Unity/Runtime/Script/Native/CoreUnsafe.g.cs @@ -47,7 +47,7 @@ internal static unsafe partial class CoreUnsafe /// ::VoicevoxVoiceModel からIDを取得する。 @param [in] model 音声モデル @returns 音声モデルID \\safety{ - `model`は ::voicevox_voice_model_new_from_path で得たものでなければならず、また ::voicevox_voice_model_delete で解放されていてはいけない。 } [DllImport(__DllName, EntryPoint = "voicevox_voice_model_id", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)] - public static extern byte* voicevox_voice_model_id(VoicevoxVoiceModel* model); + public static extern void/* byte[] */* voicevox_voice_model_id(VoicevoxVoiceModel* model); /// ::VoicevoxVoiceModel からメタ情報を取得する。 @param [in] model 音声モデル @returns メタ情報のJSON文字列 \\safety{ - `model`は ::voicevox_voice_model_new_from_path で得たものでなければならず、また ::voicevox_voice_model_delete で解放されていてはいけない。 - 戻り値の文字列の<b>生存期間</b>(_lifetime_)は次にこの関数が呼ばれるか、`model`が破棄されるまでである。この生存期間を越えて文字列にアクセスしてはならない。 } [DllImport(__DllName, EntryPoint = "voicevox_voice_model_get_metas_json", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)] @@ -69,19 +69,19 @@ internal static unsafe partial class CoreUnsafe [DllImport(__DllName, EntryPoint = "voicevox_synthesizer_load_voice_model", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)] public static extern VoicevoxResultCode voicevox_synthesizer_load_voice_model(VoicevoxSynthesizer* synthesizer, VoicevoxVoiceModel* model); - /// 音声モデルの読み込みを解除する。 @param [in] synthesizer 音声シンセサイザ @param [in] model_id 音声モデルID @returns 結果コード \\safety{ - `synthesizer`は ::voicevox_synthesizer_new で得たものでなければならず、また ::voicevox_synthesizer_delete で解放されていてはいけない。 - `model_id`はヌル終端文字列を指し、かつ<a href=\"#voicevox-core-safety\">読み込みについて有効</a>でなければならない。 } + /// 音声モデルの読み込みを解除する。 @param [in] synthesizer 音声シンセサイザ @param [in] model_id 音声モデルID @returns 結果コード \\safety{ - `synthesizer`は ::voicevox_synthesizer_new で得たものでなければならず、また ::voicevox_synthesizer_delete で解放されていてはいけない。 - `model_id`は<a href=\"#voicevox-core-safety\">読み込みについて有効</a>でなければならない。 } [DllImport(__DllName, EntryPoint = "voicevox_synthesizer_unload_voice_model", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)] - public static extern VoicevoxResultCode voicevox_synthesizer_unload_voice_model(VoicevoxSynthesizer* synthesizer, byte* model_id); + public static extern VoicevoxResultCode voicevox_synthesizer_unload_voice_model(VoicevoxSynthesizer* synthesizer, void/* byte[] */* model_id); /// ハードウェアアクセラレーションがGPUモードか判定する。 @param [in] synthesizer 音声シンセサイザ @returns GPUモードかどうか \\safety{ - `synthesizer`は ::voicevox_synthesizer_new で得たものでなければならず、また ::voicevox_synthesizer_delete で解放されていてはいけない。 } [DllImport(__DllName, EntryPoint = "voicevox_synthesizer_is_gpu_mode", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)] [return: MarshalAs(UnmanagedType.U1)] public static extern bool voicevox_synthesizer_is_gpu_mode(VoicevoxSynthesizer* synthesizer); - /// 指定したIDの音声モデルが読み込まれているか判定する。 @param [in] synthesizer 音声シンセサイザ @param [in] model_id 音声モデルID @returns モデルが読み込まれているかどうか \\safety{ - `synthesizer`は ::voicevox_synthesizer_new で得たものでなければならず、また ::voicevox_synthesizer_delete で解放されていてはいけない。 - `model_id`はヌル終端文字列を指し、かつ<a href=\"#voicevox-core-safety\">読み込みについて有効</a>でなければならない。 } + /// 指定したIDの音声モデルが読み込まれているか判定する。 @param [in] synthesizer 音声シンセサイザ @param [in] model_id 音声モデルID @returns モデルが読み込まれているかどうか \\safety{ - `synthesizer`は ::voicevox_synthesizer_new で得たものでなければならず、また ::voicevox_synthesizer_delete で解放されていてはいけない。 - `model_id`は<a href=\"#voicevox-core-safety\">読み込みについて有効</a>でなければならない。 } [DllImport(__DllName, EntryPoint = "voicevox_synthesizer_is_loaded_voice_model", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)] [return: MarshalAs(UnmanagedType.U1)] - public static extern bool voicevox_synthesizer_is_loaded_voice_model(VoicevoxSynthesizer* synthesizer, byte* model_id); + public static extern bool voicevox_synthesizer_is_loaded_voice_model(VoicevoxSynthesizer* synthesizer, void/* byte[] */* model_id); /// 今読み込んでいる音声モデルのメタ情報を、JSONで取得する。 JSONの解放は ::voicevox_json_free で行う。 @param [in] synthesizer 音声シンセサイザ @return メタ情報のJSON文字列 \\safety{ - `synthesizer`は ::voicevox_synthesizer_new で得たものでなければならず、また ::voicevox_synthesizer_delete で解放されていてはいけない。 } [DllImport(__DllName, EntryPoint = "voicevox_synthesizer_create_metas_json", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)] @@ -260,6 +260,7 @@ internal enum VoicevoxResultCode : int VOICEVOX_RESULT_INVALID_ACCENT_PHRASE_ERROR = 15, VOICEVOX_RESULT_OPEN_ZIP_FILE_ERROR = 16, VOICEVOX_RESULT_READ_ZIP_ENTRY_ERROR = 17, + VOICEVOX_RESULT_INVALID_MODEL_HEADER_ERROR = 28, VOICEVOX_RESULT_MODEL_ALREADY_LOADED_ERROR = 18, VOICEVOX_RESULT_STYLE_ALREADY_LOADED_ERROR = 26, VOICEVOX_RESULT_INVALID_MODEL_DATA_ERROR = 27, diff --git a/src/VoicevoxCoreSharp.Core.Unity/Packages/VoicevoxCoreSharp.Core.Unity/Runtime/Script/VoiceModel.cs b/src/VoicevoxCoreSharp.Core.Unity/Packages/VoicevoxCoreSharp.Core.Unity/Runtime/Script/VoiceModel.cs index 33832eb..c47ba99 100644 --- a/src/VoicevoxCoreSharp.Core.Unity/Packages/VoicevoxCoreSharp.Core.Unity/Runtime/Script/VoiceModel.cs +++ b/src/VoicevoxCoreSharp.Core.Unity/Packages/VoicevoxCoreSharp.Core.Unity/Runtime/Script/VoiceModel.cs @@ -68,7 +68,7 @@ public string Id unsafe { var ptr = CoreUnsafe.voicevox_voice_model_id((VoicevoxVoiceModel*)Handle); - return StringConvertCompat.ToUTF8String(ptr); + return StringConvertCompat.ToUTF8String((byte*)ptr); } } } diff --git a/src/VoicevoxCoreSharp.Core/Enum/ResultCode.cs b/src/VoicevoxCoreSharp.Core/Enum/ResultCode.cs index 3a54563..1b063eb 100644 --- a/src/VoicevoxCoreSharp.Core/Enum/ResultCode.cs +++ b/src/VoicevoxCoreSharp.Core/Enum/ResultCode.cs @@ -65,6 +65,10 @@ public enum ResultCode : int /// RESULT_READ_ZIP_ENTRY_ERROR = 17, /// + /// モデルの形式が不正 + /// + RESULT_INVALID_MODEL_HEADER_ERROR = 28, + /// /// すでに読み込まれている音声モデルを読み込もうとした /// RESULT_MODEL_ALREADY_LOADED_ERROR = 18, @@ -122,6 +126,7 @@ internal static ResultCode FromNative(this VoicevoxResultCode code) VoicevoxResultCode.VOICEVOX_RESULT_INVALID_ACCENT_PHRASE_ERROR => ResultCode.RESULT_INVALID_ACCENT_PHRASE_ERROR, VoicevoxResultCode.VOICEVOX_RESULT_OPEN_ZIP_FILE_ERROR => ResultCode.RESULT_OPEN_ZIP_FILE_ERROR, VoicevoxResultCode.VOICEVOX_RESULT_READ_ZIP_ENTRY_ERROR => ResultCode.RESULT_READ_ZIP_ENTRY_ERROR, + VoicevoxResultCode.VOICEVOX_RESULT_INVALID_MODEL_HEADER_ERROR => ResultCode.RESULT_INVALID_MODEL_HEADER_ERROR, VoicevoxResultCode.VOICEVOX_RESULT_MODEL_ALREADY_LOADED_ERROR => ResultCode.RESULT_MODEL_ALREADY_LOADED_ERROR, VoicevoxResultCode.VOICEVOX_RESULT_STYLE_ALREADY_LOADED_ERROR => ResultCode.RESULT_STYLE_ALREADY_LOADED_ERROR, VoicevoxResultCode.VOICEVOX_RESULT_INVALID_MODEL_DATA_ERROR => ResultCode.RESULT_INVALID_MODEL_DATA_ERROR, @@ -153,6 +158,7 @@ internal static VoicevoxResultCode ToNative(this ResultCode code) ResultCode.RESULT_INVALID_ACCENT_PHRASE_ERROR => VoicevoxResultCode.VOICEVOX_RESULT_INVALID_ACCENT_PHRASE_ERROR, ResultCode.RESULT_OPEN_ZIP_FILE_ERROR => VoicevoxResultCode.VOICEVOX_RESULT_OPEN_ZIP_FILE_ERROR, ResultCode.RESULT_READ_ZIP_ENTRY_ERROR => VoicevoxResultCode.VOICEVOX_RESULT_READ_ZIP_ENTRY_ERROR, + ResultCode.RESULT_INVALID_MODEL_HEADER_ERROR => VoicevoxResultCode.VOICEVOX_RESULT_INVALID_MODEL_HEADER_ERROR, ResultCode.RESULT_MODEL_ALREADY_LOADED_ERROR => VoicevoxResultCode.VOICEVOX_RESULT_MODEL_ALREADY_LOADED_ERROR, ResultCode.RESULT_STYLE_ALREADY_LOADED_ERROR => VoicevoxResultCode.VOICEVOX_RESULT_STYLE_ALREADY_LOADED_ERROR, ResultCode.RESULT_INVALID_MODEL_DATA_ERROR => VoicevoxResultCode.VOICEVOX_RESULT_INVALID_MODEL_DATA_ERROR, diff --git a/src/VoicevoxCoreSharp.Core/Native/CoreUnsafe.g.cs b/src/VoicevoxCoreSharp.Core/Native/CoreUnsafe.g.cs index 51f2321..06d3a32 100644 --- a/src/VoicevoxCoreSharp.Core/Native/CoreUnsafe.g.cs +++ b/src/VoicevoxCoreSharp.Core/Native/CoreUnsafe.g.cs @@ -47,7 +47,7 @@ internal static unsafe partial class CoreUnsafe /// ::VoicevoxVoiceModel からIDを取得する。 @param [in] model 音声モデル @returns 音声モデルID \\safety{ - `model`は ::voicevox_voice_model_new_from_path で得たものでなければならず、また ::voicevox_voice_model_delete で解放されていてはいけない。 } [DllImport(__DllName, EntryPoint = "voicevox_voice_model_id", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)] - public static extern byte* voicevox_voice_model_id(VoicevoxVoiceModel* model); + public static extern void/* byte[] */* voicevox_voice_model_id(VoicevoxVoiceModel* model); /// ::VoicevoxVoiceModel からメタ情報を取得する。 @param [in] model 音声モデル @returns メタ情報のJSON文字列 \\safety{ - `model`は ::voicevox_voice_model_new_from_path で得たものでなければならず、また ::voicevox_voice_model_delete で解放されていてはいけない。 - 戻り値の文字列の<b>生存期間</b>(_lifetime_)は次にこの関数が呼ばれるか、`model`が破棄されるまでである。この生存期間を越えて文字列にアクセスしてはならない。 } [DllImport(__DllName, EntryPoint = "voicevox_voice_model_get_metas_json", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)] @@ -69,19 +69,19 @@ internal static unsafe partial class CoreUnsafe [DllImport(__DllName, EntryPoint = "voicevox_synthesizer_load_voice_model", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)] public static extern VoicevoxResultCode voicevox_synthesizer_load_voice_model(VoicevoxSynthesizer* synthesizer, VoicevoxVoiceModel* model); - /// 音声モデルの読み込みを解除する。 @param [in] synthesizer 音声シンセサイザ @param [in] model_id 音声モデルID @returns 結果コード \\safety{ - `synthesizer`は ::voicevox_synthesizer_new で得たものでなければならず、また ::voicevox_synthesizer_delete で解放されていてはいけない。 - `model_id`はヌル終端文字列を指し、かつ<a href=\"#voicevox-core-safety\">読み込みについて有効</a>でなければならない。 } + /// 音声モデルの読み込みを解除する。 @param [in] synthesizer 音声シンセサイザ @param [in] model_id 音声モデルID @returns 結果コード \\safety{ - `synthesizer`は ::voicevox_synthesizer_new で得たものでなければならず、また ::voicevox_synthesizer_delete で解放されていてはいけない。 - `model_id`は<a href=\"#voicevox-core-safety\">読み込みについて有効</a>でなければならない。 } [DllImport(__DllName, EntryPoint = "voicevox_synthesizer_unload_voice_model", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)] - public static extern VoicevoxResultCode voicevox_synthesizer_unload_voice_model(VoicevoxSynthesizer* synthesizer, byte* model_id); + public static extern VoicevoxResultCode voicevox_synthesizer_unload_voice_model(VoicevoxSynthesizer* synthesizer, void/* byte[] */* model_id); /// ハードウェアアクセラレーションがGPUモードか判定する。 @param [in] synthesizer 音声シンセサイザ @returns GPUモードかどうか \\safety{ - `synthesizer`は ::voicevox_synthesizer_new で得たものでなければならず、また ::voicevox_synthesizer_delete で解放されていてはいけない。 } [DllImport(__DllName, EntryPoint = "voicevox_synthesizer_is_gpu_mode", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)] [return: MarshalAs(UnmanagedType.U1)] public static extern bool voicevox_synthesizer_is_gpu_mode(VoicevoxSynthesizer* synthesizer); - /// 指定したIDの音声モデルが読み込まれているか判定する。 @param [in] synthesizer 音声シンセサイザ @param [in] model_id 音声モデルID @returns モデルが読み込まれているかどうか \\safety{ - `synthesizer`は ::voicevox_synthesizer_new で得たものでなければならず、また ::voicevox_synthesizer_delete で解放されていてはいけない。 - `model_id`はヌル終端文字列を指し、かつ<a href=\"#voicevox-core-safety\">読み込みについて有効</a>でなければならない。 } + /// 指定したIDの音声モデルが読み込まれているか判定する。 @param [in] synthesizer 音声シンセサイザ @param [in] model_id 音声モデルID @returns モデルが読み込まれているかどうか \\safety{ - `synthesizer`は ::voicevox_synthesizer_new で得たものでなければならず、また ::voicevox_synthesizer_delete で解放されていてはいけない。 - `model_id`は<a href=\"#voicevox-core-safety\">読み込みについて有効</a>でなければならない。 } [DllImport(__DllName, EntryPoint = "voicevox_synthesizer_is_loaded_voice_model", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)] [return: MarshalAs(UnmanagedType.U1)] - public static extern bool voicevox_synthesizer_is_loaded_voice_model(VoicevoxSynthesizer* synthesizer, byte* model_id); + public static extern bool voicevox_synthesizer_is_loaded_voice_model(VoicevoxSynthesizer* synthesizer, void/* byte[] */* model_id); /// 今読み込んでいる音声モデルのメタ情報を、JSONで取得する。 JSONの解放は ::voicevox_json_free で行う。 @param [in] synthesizer 音声シンセサイザ @return メタ情報のJSON文字列 \\safety{ - `synthesizer`は ::voicevox_synthesizer_new で得たものでなければならず、また ::voicevox_synthesizer_delete で解放されていてはいけない。 } [DllImport(__DllName, EntryPoint = "voicevox_synthesizer_create_metas_json", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)] @@ -260,6 +260,7 @@ internal enum VoicevoxResultCode : int VOICEVOX_RESULT_INVALID_ACCENT_PHRASE_ERROR = 15, VOICEVOX_RESULT_OPEN_ZIP_FILE_ERROR = 16, VOICEVOX_RESULT_READ_ZIP_ENTRY_ERROR = 17, + VOICEVOX_RESULT_INVALID_MODEL_HEADER_ERROR = 28, VOICEVOX_RESULT_MODEL_ALREADY_LOADED_ERROR = 18, VOICEVOX_RESULT_STYLE_ALREADY_LOADED_ERROR = 26, VOICEVOX_RESULT_INVALID_MODEL_DATA_ERROR = 27, diff --git a/src/VoicevoxCoreSharp.Core/VoiceModel.cs b/src/VoicevoxCoreSharp.Core/VoiceModel.cs index 33832eb..c47ba99 100644 --- a/src/VoicevoxCoreSharp.Core/VoiceModel.cs +++ b/src/VoicevoxCoreSharp.Core/VoiceModel.cs @@ -68,7 +68,7 @@ public string Id unsafe { var ptr = CoreUnsafe.voicevox_voice_model_id((VoicevoxVoiceModel*)Handle); - return StringConvertCompat.ToUTF8String(ptr); + return StringConvertCompat.ToUTF8String((byte*)ptr); } } } diff --git a/src/VoicevoxCoreSharp.Core/VoicevoxCoreSharp.Core.Metas.props b/src/VoicevoxCoreSharp.Core/VoicevoxCoreSharp.Core.Metas.props index 9d4ba17..aba10a0 100644 --- a/src/VoicevoxCoreSharp.Core/VoicevoxCoreSharp.Core.Metas.props +++ b/src/VoicevoxCoreSharp.Core/VoicevoxCoreSharp.Core.Metas.props @@ -1,6 +1,6 @@ 1.14.0 - 52bc1d657e9529b288c8da7966f5242463d6580b + 4cd19cce53ae2e0ee14adeb93180f3c6e530ba3a From 62377e563d9c8a08c428e6288ad77c0efbfd7ec6 Mon Sep 17 00:00:00 2001 From: yamachu Date: Mon, 27 May 2024 20:59:41 +0900 Subject: [PATCH 3/8] Upgrade OnnxRuntime --- src/VoicevoxCoreSharp.Core/VoicevoxCoreSharp.Core.Metas.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/VoicevoxCoreSharp.Core/VoicevoxCoreSharp.Core.Metas.props b/src/VoicevoxCoreSharp.Core/VoicevoxCoreSharp.Core.Metas.props index aba10a0..cf34085 100644 --- a/src/VoicevoxCoreSharp.Core/VoicevoxCoreSharp.Core.Metas.props +++ b/src/VoicevoxCoreSharp.Core/VoicevoxCoreSharp.Core.Metas.props @@ -1,6 +1,6 @@ - 1.14.0 + 1.17.3 4cd19cce53ae2e0ee14adeb93180f3c6e530ba3a From fa6d46eea3d62246d386490b20f3db8f38446a9f Mon Sep 17 00:00:00 2001 From: yamachu Date: Mon, 27 May 2024 20:59:57 +0900 Subject: [PATCH 4/8] =?UTF-8?q?runtime=20identifier=E3=81=8C=E5=A4=89?= =?UTF-8?q?=E3=82=8F=E3=81=A3=E3=81=9F=E3=81=AE=E3=81=A7=E3=81=9D=E3=82=8C?= =?UTF-8?q?=E3=81=AB=E8=BF=BD=E5=BE=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../VoicevoxCoreSharp.Core.Tests.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/VoicevoxCoreSharp.Core.Tests/VoicevoxCoreSharp.Core.Tests.csproj b/tests/VoicevoxCoreSharp.Core.Tests/VoicevoxCoreSharp.Core.Tests.csproj index 31c43ea..a660e11 100644 --- a/tests/VoicevoxCoreSharp.Core.Tests/VoicevoxCoreSharp.Core.Tests.csproj +++ b/tests/VoicevoxCoreSharp.Core.Tests/VoicevoxCoreSharp.Core.Tests.csproj @@ -28,12 +28,12 @@ - <_MyRuntimeIdentifier>osx.10.14-arm64 + <_MyRuntimeIdentifier>osx-arm64 - <_MyRuntimeIdentifier>osx.10.14-x64 + <_MyRuntimeIdentifier>osx-x64 From a0089271c8ddd5d14524613c1a08c7dfa907d179 Mon Sep 17 00:00:00 2001 From: yamachu Date: Mon, 27 May 2024 21:08:54 +0900 Subject: [PATCH 5/8] chore: Add zip command to create sample.vvm.zip in tests/VoicevoxCoreSharp.Core.Tests/resources --- .github/workflows/csharp_test.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/csharp_test.yml b/.github/workflows/csharp_test.yml index 37d2b2d..f34d0ed 100644 --- a/.github/workflows/csharp_test.yml +++ b/.github/workflows/csharp_test.yml @@ -50,7 +50,8 @@ jobs: - run: | cp open_jtalk_dic_utf_8-1.11.tar.gz ./tests/VoicevoxCoreSharp.Core.Tests/resources tar zxf ./tests/VoicevoxCoreSharp.Core.Tests/resources/open_jtalk_dic_utf_8-1.11.tar.gz -C tests/VoicevoxCoreSharp.Core.Tests/resources/ - - run: cp -r binding/voicevox_core/model ./tests/VoicevoxCoreSharp.Core.Tests/resources + - name: sample.vvmを自前でzipコマンドで作成する + run: cd binding/voicevox_core/model/sample.vvm; zip -r ../../../../tests/VoicevoxCoreSharp.Core.Tests/resources/sample.vvm.zip . - run: dotnet test VoicevoxCoreSharp-without-exmaples.slnf run-dotnet-cli-example: From a8f7ba5621ad3f280ed6a5f84550000c5121d40d Mon Sep 17 00:00:00 2001 From: yamachu Date: Mon, 27 May 2024 21:14:41 +0900 Subject: [PATCH 6/8] =?UTF-8?q?.zip=E3=81=AF=E3=81=84=E3=82=89=E3=82=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/csharp_test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/csharp_test.yml b/.github/workflows/csharp_test.yml index f34d0ed..ce4795a 100644 --- a/.github/workflows/csharp_test.yml +++ b/.github/workflows/csharp_test.yml @@ -51,7 +51,7 @@ jobs: cp open_jtalk_dic_utf_8-1.11.tar.gz ./tests/VoicevoxCoreSharp.Core.Tests/resources tar zxf ./tests/VoicevoxCoreSharp.Core.Tests/resources/open_jtalk_dic_utf_8-1.11.tar.gz -C tests/VoicevoxCoreSharp.Core.Tests/resources/ - name: sample.vvmを自前でzipコマンドで作成する - run: cd binding/voicevox_core/model/sample.vvm; zip -r ../../../../tests/VoicevoxCoreSharp.Core.Tests/resources/sample.vvm.zip . + run: cd binding/voicevox_core/model/sample.vvm; zip -r ../../../../tests/VoicevoxCoreSharp.Core.Tests/resources/sample.vvm . - run: dotnet test VoicevoxCoreSharp-without-exmaples.slnf run-dotnet-cli-example: From 2961b881c1a9000ead9fa671e1dbba2ee744c656 Mon Sep 17 00:00:00 2001 From: yamachu Date: Mon, 27 May 2024 21:17:53 +0900 Subject: [PATCH 7/8] =?UTF-8?q?=E3=83=87=E3=82=A3=E3=83=AC=E3=82=AF?= =?UTF-8?q?=E3=83=88=E3=83=AA=E3=81=8C=E9=81=95=E3=81=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/csharp_test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/csharp_test.yml b/.github/workflows/csharp_test.yml index ce4795a..b2e6553 100644 --- a/.github/workflows/csharp_test.yml +++ b/.github/workflows/csharp_test.yml @@ -51,7 +51,7 @@ jobs: cp open_jtalk_dic_utf_8-1.11.tar.gz ./tests/VoicevoxCoreSharp.Core.Tests/resources tar zxf ./tests/VoicevoxCoreSharp.Core.Tests/resources/open_jtalk_dic_utf_8-1.11.tar.gz -C tests/VoicevoxCoreSharp.Core.Tests/resources/ - name: sample.vvmを自前でzipコマンドで作成する - run: cd binding/voicevox_core/model/sample.vvm; zip -r ../../../../tests/VoicevoxCoreSharp.Core.Tests/resources/sample.vvm . + run: cd binding/voicevox_core/model/sample.vvm; zip -r ../../../../tests/VoicevoxCoreSharp.Core.Tests/resources/model/sample.vvm . - run: dotnet test VoicevoxCoreSharp-without-exmaples.slnf run-dotnet-cli-example: From a809e1111de48e996b749366945c9c1db16d7c42 Mon Sep 17 00:00:00 2001 From: yamachu Date: Mon, 27 May 2024 21:22:18 +0900 Subject: [PATCH 8/8] mkdir... --- .github/workflows/csharp_test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/csharp_test.yml b/.github/workflows/csharp_test.yml index b2e6553..3a13f6d 100644 --- a/.github/workflows/csharp_test.yml +++ b/.github/workflows/csharp_test.yml @@ -51,7 +51,7 @@ jobs: cp open_jtalk_dic_utf_8-1.11.tar.gz ./tests/VoicevoxCoreSharp.Core.Tests/resources tar zxf ./tests/VoicevoxCoreSharp.Core.Tests/resources/open_jtalk_dic_utf_8-1.11.tar.gz -C tests/VoicevoxCoreSharp.Core.Tests/resources/ - name: sample.vvmを自前でzipコマンドで作成する - run: cd binding/voicevox_core/model/sample.vvm; zip -r ../../../../tests/VoicevoxCoreSharp.Core.Tests/resources/model/sample.vvm . + run: mkdir -p tests/VoicevoxCoreSharp.Core.Tests/resources/model; cd binding/voicevox_core/model/sample.vvm; zip -r ../../../../tests/VoicevoxCoreSharp.Core.Tests/resources/model/sample.vvm . - run: dotnet test VoicevoxCoreSharp-without-exmaples.slnf run-dotnet-cli-example: