From c2db67a280e8e920b53f44dcc855434cbce16472 Mon Sep 17 00:00:00 2001 From: Cursor Agent Date: Thu, 7 Aug 2025 02:12:25 +0000 Subject: [PATCH 1/2] Checkpoint before follow-up message Co-authored-by: izzynochill --- .github/workflows/main.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index eff63077e5..4c53e5f897 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -137,7 +137,8 @@ jobs: - name: Update machine run: sudo apt update - name: Install dependencies - run: sudo apt-get install gcc g++ git cmake ninja-build lsb-release libsdl2-dev libsdl2-net-dev libpng-dev libsdl2-net-dev libzip-dev zipcmp zipmerge ziptool nlohmann-json3-dev libtinyxml2-dev libspdlog-dev libboost-dev libopengl-dev libogg-dev libvorbis-dev + run: | + sudo apt-get install gcc g++ git cmake ninja-build lsb-release libsdl2-dev libsdl2-net-dev libpng-dev libsdl2-net-dev libzip-dev zipcmp zipmerge ziptool nlohmann-json3-dev libtinyxml2-dev libspdlog-dev libboost-dev libopengl-dev libogg-dev libvorbis-dev - name: ccache uses: hendrikmuhs/ccache-action@v1.2.14 with: @@ -222,7 +223,8 @@ jobs: - name: Update machine run: sudo apt update - name: Install dependencies - run: sudo apt-get install gcc g++ git cmake ninja-build lsb-release libsdl2-dev libsdl2-net-dev libpng-dev libsdl2-net-dev libzip-dev zipcmp zipmerge ziptool nlohmann-json3-dev libtinyxml2-dev libspdlog-dev libboost-dev libopengl-dev libogg-dev libvorbis-dev + run: | + sudo apt-get install gcc g++ git cmake ninja-build lsb-release libsdl2-dev libsdl2-net-dev libpng-dev libsdl2-net-dev libzip-dev zipcmp zipmerge ziptool nlohmann-json3-dev libtinyxml2-dev libboost-dev libopengl-dev libogg-dev libvorbis-dev - name: ccache uses: hendrikmuhs/ccache-action@v1.2.14 with: From 7901f19bed4d416d3dc0c50ab222a6fb34a9e509 Mon Sep 17 00:00:00 2001 From: Cursor Agent Date: Thu, 7 Aug 2025 02:15:17 +0000 Subject: [PATCH 2/2] Fix spdlog find_package and linking issues in torch CMakeLists.txt Co-authored-by: izzynochill --- .github/workflows/linux-compile.yml | 5 +++++ .github/workflows/main.yml | 10 ++++++++++ 2 files changed, 15 insertions(+) diff --git a/.github/workflows/linux-compile.yml b/.github/workflows/linux-compile.yml index 7f0fe1a5fb..c77cc09846 100644 --- a/.github/workflows/linux-compile.yml +++ b/.github/workflows/linux-compile.yml @@ -20,6 +20,11 @@ jobs: run: sudo apt update - name: Install dependencies run: sudo apt-get install gcc g++ git cmake ninja-build lsb-release libsdl2-dev libpng-dev libsdl2-net-dev libzip-dev zipcmp zipmerge ziptool nlohmann-json3-dev libtinyxml2-dev libspdlog-dev libboost-dev libopengl-dev libogg-dev libvorbis-dev + - name: Fix spdlog issue in torch + run: | + # Fix spdlog find_package issue in torch CMakeLists.txt + sed -i 's/find_package(spdlog REQUIRED)/find_package(spdlog QUIET)\n\tif(NOT spdlog_FOUND)\n\t\tFetchContent_Declare(\n\t\t\tspdlog\n\t\t\tGIT_REPOSITORY https:\/\/github.com\/gabime\/spdlog.git\n\t\t\tGIT_TAG 7e635fca68d014934b4af8a1cf874f63989352b7\n\t\t)\n\t\tFetchContent_MakeAvailable(spdlog)\n\t\tset(spdlog_FOUND TRUE)\n\tendif()/' torch/CMakeLists.txt + sed -i 's/target_link_libraries(${PROJECT_NAME} PUBLIC spdlog::spdlog)/if(spdlog_FOUND)\n\tif(TARGET spdlog::spdlog)\n\t\ttarget_link_libraries(${PROJECT_NAME} PUBLIC spdlog::spdlog)\n\telse()\n\t\ttarget_link_libraries(${PROJECT_NAME} PUBLIC spdlog)\n\tendif()\nendif()/' torch/CMakeLists.txt - name: Install latest SDL run: | export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH" diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4c53e5f897..bb6c4764be 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -139,6 +139,11 @@ jobs: - name: Install dependencies run: | sudo apt-get install gcc g++ git cmake ninja-build lsb-release libsdl2-dev libsdl2-net-dev libpng-dev libsdl2-net-dev libzip-dev zipcmp zipmerge ziptool nlohmann-json3-dev libtinyxml2-dev libspdlog-dev libboost-dev libopengl-dev libogg-dev libvorbis-dev + - name: Fix spdlog issue in torch + run: | + # Fix spdlog find_package issue in torch CMakeLists.txt + sed -i 's/find_package(spdlog REQUIRED)/find_package(spdlog QUIET)\n\tif(NOT spdlog_FOUND)\n\t\tFetchContent_Declare(\n\t\t\tspdlog\n\t\t\tGIT_REPOSITORY https:\/\/github.com\/gabime\/spdlog.git\n\t\t\tGIT_TAG 7e635fca68d014934b4af8a1cf874f63989352b7\n\t\t)\n\t\tFetchContent_MakeAvailable(spdlog)\n\t\tset(spdlog_FOUND TRUE)\n\tendif()/' torch/CMakeLists.txt + sed -i 's/target_link_libraries(${PROJECT_NAME} PUBLIC spdlog::spdlog)/if(spdlog_FOUND)\n\tif(TARGET spdlog::spdlog)\n\t\ttarget_link_libraries(${PROJECT_NAME} PUBLIC spdlog::spdlog)\n\telse()\n\t\ttarget_link_libraries(${PROJECT_NAME} PUBLIC spdlog)\n\tendif()\nendif()/' torch/CMakeLists.txt - name: ccache uses: hendrikmuhs/ccache-action@v1.2.14 with: @@ -225,6 +230,11 @@ jobs: - name: Install dependencies run: | sudo apt-get install gcc g++ git cmake ninja-build lsb-release libsdl2-dev libsdl2-net-dev libpng-dev libsdl2-net-dev libzip-dev zipcmp zipmerge ziptool nlohmann-json3-dev libtinyxml2-dev libboost-dev libopengl-dev libogg-dev libvorbis-dev + - name: Fix spdlog issue in torch + run: | + # Fix spdlog find_package issue in torch CMakeLists.txt + sed -i 's/find_package(spdlog REQUIRED)/find_package(spdlog QUIET)\n\tif(NOT spdlog_FOUND)\n\t\tFetchContent_Declare(\n\t\t\tspdlog\n\t\t\tGIT_REPOSITORY https:\/\/github.com\/gabime\/spdlog.git\n\t\t\tGIT_TAG 7e635fca68d014934b4af8a1cf874f63989352b7\n\t\t)\n\t\tFetchContent_MakeAvailable(spdlog)\n\t\tset(spdlog_FOUND TRUE)\n\tendif()/' torch/CMakeLists.txt + sed -i 's/target_link_libraries(${PROJECT_NAME} PUBLIC spdlog::spdlog)/if(spdlog_FOUND)\n\tif(TARGET spdlog::spdlog)\n\t\ttarget_link_libraries(${PROJECT_NAME} PUBLIC spdlog::spdlog)\n\telse()\n\t\ttarget_link_libraries(${PROJECT_NAME} PUBLIC spdlog)\n\tendif()\nendif()/' torch/CMakeLists.txt - name: ccache uses: hendrikmuhs/ccache-action@v1.2.14 with: