Merge pull request #47 from shiguredo/feature/goodbye-lyra

Lyra を削除する
shiguredo · Mar 7, 2024 · b2d3fd6 · b2d3fd6
2 parents d446733 + 2ccecf8
commit b2d3fd6
Show file tree

Hide file tree

Showing 35 changed files with 35 additions and 306 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -29,7 +29,6 @@ jobs:
           cp _build\${{ matrix.name }}\release\sdl_sample\Release\sdl_sample.exe ${{ matrix.name }}
           cp _build\${{ matrix.name }}\release\sumomo\Release\sumomo.exe ${{ matrix.name }}
           cp _build\${{ matrix.name }}\release\messaging_recvonly_sample\Release\messaging_recvonly_sample.exe ${{ matrix.name }}
-          cp -Recurse _install\${{ matrix.name }}\release\lyra\share\model_coeffs ${{ matrix.name }}\model_coeffs
       - name: Upload Artifact
         uses: actions/upload-artifact@v3
         with:
@@ -54,7 +53,6 @@ jobs:
           cp _build/${{ matrix.name }}/release/sdl_sample/sdl_sample ${{ matrix.name }}
           cp _build/${{ matrix.name }}/release/sumomo/sumomo ${{ matrix.name }}
           cp _build/${{ matrix.name }}/release/messaging_recvonly_sample/messaging_recvonly_sample ${{ matrix.name }}
-          cp -r _install/${{ matrix.name }}/release/lyra/share/model_coeffs ${{ matrix.name }}/model_coeffs
       - name: Upload Artifact
         uses: actions/upload-artifact@v3
         with:
@@ -92,7 +90,6 @@ jobs:
           cp _build/${{ matrix.name }}/release/sdl_sample/sdl_sample ${{ matrix.name }}
           cp _build/${{ matrix.name }}/release/sumomo/sumomo ${{ matrix.name }}
           cp _build/${{ matrix.name }}/release/messaging_recvonly_sample/messaging_recvonly_sample ${{ matrix.name }}
-          cp -r _install/${{ matrix.name }}/release/lyra/share/model_coeffs ${{ matrix.name }}/model_coeffs
       - name: Upload Artifact
         uses: actions/upload-artifact@v3
         with:
@@ -122,7 +119,6 @@ jobs:
           cp _build/${{ matrix.name }}/release/sdl_sample/sdl_sample ${{ matrix.name }}
           cp _build/${{ matrix.name }}/release/sumomo/sumomo ${{ matrix.name }}
           cp _build/${{ matrix.name }}/release/messaging_recvonly_sample/messaging_recvonly_sample ${{ matrix.name }}
-          cp -r _install/${{ matrix.name }}/release/lyra/share/model_coeffs ${{ matrix.name }}/model_coeffs
       - name: Upload Artifact
         uses: actions/upload-artifact@v3
         with:

diff --git a/CHANGES.md b/CHANGES.md
@@ -9,11 +9,19 @@
 - FIX
   - バグ修正
 
+## develop
+
+- [CHANGE] Lyra を削除する
+  - @enm10k
+- [UPDATE] VERSION のライブラリをアップデートする
+  - SORA_CPP_SDK_VERSION を 2024.3.0 にあげる
+  - @enm10k
+
 ## sora-cpp-sdk-2024.2.0
 
 - [CHANGE] momo_sample を sumomo にリネームする
   - @enm10k
-- [UPDATE] VERSIONS のライブラリをアップデートする
+- [UPDATE] VERSION のライブラリをアップデートする
   - SORA_CPP_SDK_VERSION を 2024.2.0 にあげる
   - WEBRTC_BUILD_VERSION を m121.6167.3.0 にあげる
   - BOOST_VERSION を 1.84.0 にあげる
@@ -34,13 +42,13 @@
   - JetPack 5.1.1, 5.1.2 で動作を確認
   - JetPack 5.1 では、互換性の問題で JetsonJpegDecoder がエラーになることを確認
   - @enm10k
-- [UPDATE] VERSIONS のライブラリをアップデートする
+- [UPDATE] VERSION のライブラリをアップデートする
   - SORA_CPP_SDK_VERSION を 2024.1.0 にあげる
   - @miosakuma
 
 ## sora-cpp-sdk-2023.17.0
 
-- [UPDATE] VERSIONS のライブラリをアップデートする
+- [UPDATE] VERSION のライブラリをアップデートする
   - SORA_CPP_SDK_VERSION を 2023.17.0 にあげる
   - WEBRTC_BUILD_VERSION を m120.6099.1.2 にあげる
   - @miosakuma
@@ -53,22 +61,22 @@
 - [UPDATE]
   - momo_sample に --hw-mjpeg-decoder オプションを追加する
   - @enm10k
-- [UPDATE] VERSIONS のライブラリをアップデートする
+- [UPDATE] VERSION のライブラリをアップデートする
   - SORA_CPP_SDK_VERSION を 2023.15.1 にあげる
   - WEBRTC_BUILD_VERSION を m119.6045.2.1 にあげる
   - CMake を 3.27.7 に上げる
   - @miosakuma
 
 ## sora-cpp-sdk-2023.14.0
 
-- [UPDATE] VERSIONS のライブラリをアップデートする
+- [UPDATE] VERSION のライブラリをアップデートする
   - SORA_CPP_SDK_VERSION を 2023.14.0 にあげる
   - WEBRTC_BUILD_VERSION を m117.5938.2.0 にあげる
   - @torikizi
 
 ## sora-cpp-sdk-2023.13.0
 
-- [UPDATE] VERSIONS のライブラリをアップデートする
+- [UPDATE] VERSION のライブラリをアップデートする
   - SORA_CPP_SDK_VERSION を 2023.13.0 にあげる
   - WEBRTC_BUILD_VERSION を m116.5845.6.1 にあげる
   - @torikizi
@@ -84,7 +92,7 @@
 
 ## sora-cpp-sdk-2023.7.0
 
-- [UPDATE] VERSIONS のライブラリをアップデートする
+- [UPDATE] VERSION のライブラリをアップデートする
   - SORA_CPP_SDK_VERSION を 2023.7.0 にあげる
   - CMAKE_VERSION を 3.26.4 にあげる
   - @torikizi
@@ -109,7 +117,7 @@
   - @melpon
 - [UPDATE] JetPack 5.1 に対応する
   - @melpon
-- [UPDATE] VERSIONS のライブラリをアップデートする
+- [UPDATE] VERSION のライブラリをアップデートする
   - SORA_CPP_SDK_VERSION を 2023.5.0 にあげる
   - WEBRTC_BUILD_VERSION を m114.5735.0.1 にあげる
   - BOOST_VERSION を 1.82.0 にあげる

diff --git a/VERSION b/VERSION
@@ -1,7 +1,6 @@
-SORA_CPP_SDK_VERSION=2024.2.0
+SORA_CPP_SDK_VERSION=2024.3.0
 WEBRTC_BUILD_VERSION=m121.6167.3.0
 BOOST_VERSION=1.84.0
-LYRA_VERSION=1.3.2
 CMAKE_VERSION=3.28.1
 SDL2_VERSION=2.30.0
 CLI11_VERSION=v2.4.1
diff --git a/base.py b/base.py
@@ -399,7 +399,6 @@ def get_webrtc_info(webrtcbuild: bool, source_dir: str, build_dir: str, install_
 class SoraInfo(NamedTuple):
     sora_install_dir: str
     boost_install_dir: str
-    lyra_install_dir: str
 
 
 def install_sora_and_deps(platform: str, source_dir:str, build_dir:str, install_dir: str):
@@ -416,17 +415,6 @@ def install_sora_and_deps(platform: str, source_dir:str, build_dir:str, install_
     }
     install_boost(**install_boost_args)
 
-    # Lyra
-    install_lyra_args = {
-        'version': version['LYRA_VERSION'],
-        'version_file': os.path.join(install_dir, 'lyra.version'),
-        'source_dir': source_dir,
-        'install_dir': install_dir,
-        'sora_version': version['SORA_CPP_SDK_VERSION'],
-        'platform': platform,
-    }
-    install_lyra(**install_lyra_args)
-
     # Sora C++ SDK
     install_sora_args = {
         'version': version['SORA_CPP_SDK_VERSION'],
@@ -467,8 +455,7 @@ def get_sora_info(install_dir: str, sora_dir: Optional[str], platform: str, debu
 
     return SoraInfo(
         sora_install_dir = os.path.join(install_dir, 'sora'),
-        boost_install_dir = os.path.join(install_dir, 'boost'),
-        lyra_install_dir = os.path.join(install_dir, 'lyra'),
+        boost_install_dir = os.path.join(install_dir, 'boost')
     )
 
 
@@ -509,18 +496,6 @@ def install_boost(version, source_dir, install_dir, sora_version, platform: str)
     extract(archive, output_dir=install_dir, output_dirname='boost')
 
 
-@versioned
-def install_lyra(version, source_dir, install_dir, sora_version, platform: str):
-    win = platform.startswith("windows_")
-    filename = f'lyra-{version}_sora-cpp-sdk-{sora_version}_{platform}.{"zip" if win else "tar.gz"}'
-    rm_rf(os.path.join(source_dir, filename))
-    archive = download(
-        f'https://github.com/shiguredo/sora-cpp-sdk/releases/download/{sora_version}/{filename}',
-        output_dir=source_dir)
-    rm_rf(os.path.join(install_dir, 'lyra'))
-    extract(archive, output_dir=install_dir, output_dirname='lyra')
-
-
 def cmake_path(path: str) -> str:
     return path.replace('\\', '/')
 

diff --git a/messaging_recvonly_sample/macos_arm64/CMakeLists.txt b/messaging_recvonly_sample/macos_arm64/CMakeLists.txt
@@ -20,7 +20,6 @@ list(APPEND CMAKE_MODULE_PATH ${SORA_DIR}/share/cmake)
 set(Boost_USE_STATIC_LIBS ON)
 
 find_package(Boost REQUIRED COMPONENTS json filesystem)
-find_package(Lyra REQUIRED)
 find_package(WebRTC REQUIRED)
 find_package(Sora REQUIRED)
 find_package(Threads REQUIRED)
@@ -34,17 +33,3 @@ target_sources(messaging_recvonly_sample PRIVATE ../src/messaging_recvonly_sampl
 target_include_directories(messaging_recvonly_sample PRIVATE ${CLI11_DIR}/include)
 target_link_libraries(messaging_recvonly_sample PRIVATE Sora::sora)
 target_compile_definitions(messaging_recvonly_sample PRIVATE CLI11_HAS_FILESYSTEM=0)
-
-# Lyra ファイルのコピー
-add_custom_command(
-  TARGET messaging_recvonly_sample POST_BUILD
-  COMMAND
-    ${CMAKE_COMMAND} -E copy_directory
-    ${LYRA_DIR}/share/model_coeffs/
-    ${CMAKE_CURRENT_BINARY_DIR}/model_coeffs/
-  DEPENDS
-    ${LYRA_DIR}/share/model_coeffs/lyra_config.binarypb
-    ${LYRA_DIR}/share/model_coeffs/lyragan.tflite
-    ${LYRA_DIR}/share/model_coeffs/quantizer.tflite
-    ${LYRA_DIR}/share/model_coeffs/soundstream_encoder.tflite
-)
diff --git a/messaging_recvonly_sample/macos_arm64/run.py b/messaging_recvonly_sample/macos_arm64/run.py
@@ -41,7 +41,7 @@ def install_deps(source_dir, build_dir, install_dir, debug, sora_dir: Optional[s
         }
         install_webrtc(**install_webrtc_args)
 
-        # Sora C++ SDK, Boost, Lyra
+        # Sora C++ SDK, Boost
         if sora_dir is None:
             install_sora_and_deps('macos_arm64', source_dir, build_dir, install_dir)
         else:
@@ -97,7 +97,6 @@ def main():
         cmake_args = []
         cmake_args.append(f'-DCMAKE_BUILD_TYPE={configuration}')
         cmake_args.append(f"-DBOOST_ROOT={cmake_path(sora_info.boost_install_dir)}")
-        cmake_args.append(f"-DLYRA_DIR={cmake_path(sora_info.lyra_install_dir)}")
         cmake_args.append(f"-DWEBRTC_INCLUDE_DIR={cmake_path(webrtc_info.webrtc_include_dir)}")
         cmake_args.append(f"-DWEBRTC_LIBRARY_DIR={cmake_path(webrtc_info.webrtc_library_dir)}")
         cmake_args.append(f"-DSORA_DIR={cmake_path(sora_info.sora_install_dir)}")

diff --git a/messaging_recvonly_sample/ubuntu-20.04_armv8_jetson/CMakeLists.txt b/messaging_recvonly_sample/ubuntu-20.04_armv8_jetson/CMakeLists.txt
@@ -20,7 +20,6 @@ list(APPEND CMAKE_MODULE_PATH ${SORA_DIR}/share/cmake)
 set(Boost_USE_STATIC_LIBS ON)
 
 find_package(Boost REQUIRED COMPONENTS json filesystem)
-find_package(Lyra REQUIRED)
 find_package(WebRTC REQUIRED)
 find_package(Sora REQUIRED)
 find_package(Threads REQUIRED)
@@ -39,17 +38,3 @@ target_include_directories(messaging_recvonly_sample PRIVATE ${CLI11_DIR}/includ
 target_link_libraries(messaging_recvonly_sample PRIVATE Sora::sora)
 target_link_directories(messaging_recvonly_sample PRIVATE ${CMAKE_SYSROOT}/usr/lib/aarch64-linux-gnu/tegra)
 target_compile_definitions(messaging_recvonly_sample PRIVATE CLI11_HAS_FILESYSTEM=0)
-
-# Lyra ファイルのコピー
-add_custom_command(
-  TARGET messaging_recvonly_sample POST_BUILD
-  COMMAND
-    ${CMAKE_COMMAND} -E copy_directory
-    ${LYRA_DIR}/share/model_coeffs/
-    ${CMAKE_CURRENT_BINARY_DIR}/model_coeffs/
-  DEPENDS
-    ${LYRA_DIR}/share/model_coeffs/lyra_config.binarypb
-    ${LYRA_DIR}/share/model_coeffs/lyragan.tflite
-    ${LYRA_DIR}/share/model_coeffs/quantizer.tflite
-    ${LYRA_DIR}/share/model_coeffs/soundstream_encoder.tflite
-)
diff --git a/messaging_recvonly_sample/ubuntu-20.04_armv8_jetson/run.py b/messaging_recvonly_sample/ubuntu-20.04_armv8_jetson/run.py
@@ -81,7 +81,7 @@ def install_deps(source_dir, build_dir, install_dir, debug, sora_dir: Optional[s
         }
         install_llvm(**install_llvm_args)
 
-        # Sora C++ SDK, Boost, Lyra
+        # Sora C++ SDK, Boost
         if sora_dir is None:
             install_sora_and_deps('ubuntu-20.04_armv8_jetson', source_dir, build_dir, install_dir)
         else:
@@ -137,7 +137,6 @@ def main():
         cmake_args = []
         cmake_args.append(f'-DCMAKE_BUILD_TYPE={configuration}')
         cmake_args.append(f"-DBOOST_ROOT={cmake_path(sora_info.boost_install_dir)}")
-        cmake_args.append(f"-DLYRA_DIR={cmake_path(sora_info.lyra_install_dir)}")
         cmake_args.append(f"-DWEBRTC_INCLUDE_DIR={cmake_path(webrtc_info.webrtc_include_dir)}")
         cmake_args.append(f"-DWEBRTC_LIBRARY_DIR={cmake_path(webrtc_info.webrtc_library_dir)}")
         cmake_args.append(f"-DSORA_DIR={cmake_path(sora_info.sora_install_dir)}")

diff --git a/messaging_recvonly_sample/ubuntu-20.04_x86_64/CMakeLists.txt b/messaging_recvonly_sample/ubuntu-20.04_x86_64/CMakeLists.txt
@@ -20,7 +20,6 @@ list(APPEND CMAKE_MODULE_PATH ${SORA_DIR}/share/cmake)
 set(Boost_USE_STATIC_LIBS ON)
 
 find_package(Boost REQUIRED COMPONENTS json filesystem)
-find_package(Lyra REQUIRED)
 find_package(WebRTC REQUIRED)
 find_package(Sora REQUIRED)
 find_package(Threads REQUIRED)
@@ -40,17 +39,3 @@ target_compile_options(messaging_recvonly_sample
 target_include_directories(messaging_recvonly_sample PRIVATE ${CLI11_DIR}/include)
 target_link_libraries(messaging_recvonly_sample PRIVATE Sora::sora)
 target_compile_definitions(messaging_recvonly_sample PRIVATE CLI11_HAS_FILESYSTEM=0)
-
-# Lyra ファイルのコピー
-add_custom_command(
-  TARGET messaging_recvonly_sample POST_BUILD
-  COMMAND
-    ${CMAKE_COMMAND} -E copy_directory
-    ${LYRA_DIR}/share/model_coeffs/
-    ${CMAKE_CURRENT_BINARY_DIR}/model_coeffs/
-  DEPENDS
-    ${LYRA_DIR}/share/model_coeffs/lyra_config.binarypb
-    ${LYRA_DIR}/share/model_coeffs/lyragan.tflite
-    ${LYRA_DIR}/share/model_coeffs/quantizer.tflite
-    ${LYRA_DIR}/share/model_coeffs/soundstream_encoder.tflite
-)
diff --git a/messaging_recvonly_sample/ubuntu-20.04_x86_64/run.py b/messaging_recvonly_sample/ubuntu-20.04_x86_64/run.py
@@ -22,7 +22,6 @@
     build_sora,
     install_sora_and_deps,
     install_cmake,
-    install_sora,
     install_cli11,
     add_sora_arguments,
 )
@@ -123,7 +122,6 @@ def main():
         cmake_args = []
         cmake_args.append(f'-DCMAKE_BUILD_TYPE={configuration}')
         cmake_args.append(f"-DBOOST_ROOT={cmake_path(sora_info.boost_install_dir)}")
-        cmake_args.append(f"-DLYRA_DIR={cmake_path(sora_info.lyra_install_dir)}")
         cmake_args.append(f"-DWEBRTC_INCLUDE_DIR={cmake_path(webrtc_info.webrtc_include_dir)}")
         cmake_args.append(f"-DWEBRTC_LIBRARY_DIR={cmake_path(webrtc_info.webrtc_library_dir)}")
         cmake_args.append(f"-DSORA_DIR={cmake_path(sora_info.sora_install_dir)}")

diff --git a/messaging_recvonly_sample/ubuntu-22.04_x86_64/CMakeLists.txt b/messaging_recvonly_sample/ubuntu-22.04_x86_64/CMakeLists.txt
@@ -20,7 +20,6 @@ list(APPEND CMAKE_MODULE_PATH ${SORA_DIR}/share/cmake)
 set(Boost_USE_STATIC_LIBS ON)
 
 find_package(Boost REQUIRED COMPONENTS json filesystem)
-find_package(Lyra REQUIRED)
 find_package(WebRTC REQUIRED)
 find_package(Sora REQUIRED)
 find_package(Threads REQUIRED)
@@ -40,17 +39,3 @@ target_compile_options(messaging_recvonly_sample
 target_include_directories(messaging_recvonly_sample PRIVATE ${CLI11_DIR}/include)
 target_link_libraries(messaging_recvonly_sample PRIVATE Sora::sora)
 target_compile_definitions(messaging_recvonly_sample PRIVATE CLI11_HAS_FILESYSTEM=0)
-
-# Lyra ファイルのコピー
-add_custom_command(
-  TARGET messaging_recvonly_sample POST_BUILD
-  COMMAND
-    ${CMAKE_COMMAND} -E copy_directory
-    ${LYRA_DIR}/share/model_coeffs/
-    ${CMAKE_CURRENT_BINARY_DIR}/model_coeffs/
-  DEPENDS
-    ${LYRA_DIR}/share/model_coeffs/lyra_config.binarypb
-    ${LYRA_DIR}/share/model_coeffs/lyragan.tflite
-    ${LYRA_DIR}/share/model_coeffs/quantizer.tflite
-    ${LYRA_DIR}/share/model_coeffs/soundstream_encoder.tflite
-)
diff --git a/messaging_recvonly_sample/ubuntu-22.04_x86_64/run.py b/messaging_recvonly_sample/ubuntu-22.04_x86_64/run.py
@@ -67,7 +67,7 @@ def install_deps(source_dir, build_dir, install_dir, debug, sora_dir: Optional[s
         }
         install_llvm(**install_llvm_args)
 
-       # Sora C++ SDK, Boost, Lyra
+       # Sora C++ SDK, Boost
         if sora_dir is None:
             install_sora_and_deps('ubuntu-22.04_x86_64', source_dir, build_dir, install_dir)
         else:
@@ -123,7 +123,6 @@ def main():
         cmake_args = []
         cmake_args.append(f'-DCMAKE_BUILD_TYPE={configuration}')
         cmake_args.append(f"-DBOOST_ROOT={cmake_path(sora_info.boost_install_dir)}")
-        cmake_args.append(f"-DLYRA_DIR={cmake_path(sora_info.lyra_install_dir)}")
         cmake_args.append(f"-DWEBRTC_INCLUDE_DIR={cmake_path(webrtc_info.webrtc_include_dir)}")
         cmake_args.append(f"-DWEBRTC_LIBRARY_DIR={cmake_path(webrtc_info.webrtc_library_dir)}")
         cmake_args.append(f"-DSORA_DIR={cmake_path(sora_info.sora_install_dir)}")

diff --git a/messaging_recvonly_sample/windows_x86_64/CMakeLists.txt b/messaging_recvonly_sample/windows_x86_64/CMakeLists.txt
@@ -21,7 +21,6 @@ set(Boost_USE_STATIC_LIBS ON)
 set(Boost_USE_STATIC_RUNTIME ON)
 
 find_package(Boost REQUIRED COMPONENTS json filesystem)
-find_package(Lyra REQUIRED)
 find_package(WebRTC REQUIRED)
 find_package(Sora REQUIRED)
 
@@ -41,20 +40,6 @@ set_target_properties(messaging_recvonly_sample
     MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>"
 )
 
-# Lyra ファイルのコピー
-add_custom_command(
-  TARGET messaging_recvonly_sample POST_BUILD
-  COMMAND
-    ${CMAKE_COMMAND} -E copy_directory
-    ${LYRA_DIR}/share/model_coeffs/
-    ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/model_coeffs/
-  DEPENDS
-    ${LYRA_DIR}/share/model_coeffs/lyra_config.binarypb
-    ${LYRA_DIR}/share/model_coeffs/lyragan.tflite
-    ${LYRA_DIR}/share/model_coeffs/quantizer.tflite
-    ${LYRA_DIR}/share/model_coeffs/soundstream_encoder.tflite
-)
-
 target_compile_definitions(messaging_recvonly_sample
   PRIVATE
     _CONSOLE

diff --git a/messaging_recvonly_sample/windows_x86_64/run.py b/messaging_recvonly_sample/windows_x86_64/run.py
@@ -41,7 +41,7 @@ def install_deps(source_dir, build_dir, install_dir, debug, sora_dir: Optional[s
 
         install_webrtc(**install_webrtc_args)
 
-        # Sora C++ SDK, Boost, Lyra
+        # Sora C++ SDK, Boost
         if sora_dir is None:
             install_sora_and_deps('windows_x86_64', source_dir, build_dir, install_dir)
         else:
@@ -98,7 +98,6 @@ def main():
         cmake_args = []
         cmake_args.append(f'-DCMAKE_BUILD_TYPE={configuration}')
         cmake_args.append(f"-DBOOST_ROOT={cmake_path(sora_info.boost_install_dir)}")
-        cmake_args.append(f"-DLYRA_DIR={cmake_path(sora_info.lyra_install_dir)}")
         cmake_args.append(f"-DWEBRTC_INCLUDE_DIR={cmake_path(webrtc_info.webrtc_include_dir)}")
         cmake_args.append(f"-DWEBRTC_LIBRARY_DIR={cmake_path(webrtc_info.webrtc_library_dir)}")
         cmake_args.append(f"-DSORA_DIR={cmake_path(sora_info.sora_install_dir)}")