From 81f055d696958e1ee7285293cff6b6716f387022 Mon Sep 17 00:00:00 2001 From: Georges Berenger Date: Thu, 20 Nov 2025 14:25:54 -0800 Subject: [PATCH 1/2] Fix oss build (#309) Summary: Fix pyvrs oss build. Differential Revision: D87478397 --- cmake/LibrariesSetup.cmake | 3 ++- csrc/Pybind11.cpp | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/cmake/LibrariesSetup.cmake b/cmake/LibrariesSetup.cmake index 271a8cd..79d8c72 100644 --- a/cmake/LibrariesSetup.cmake +++ b/cmake/LibrariesSetup.cmake @@ -17,13 +17,14 @@ if (EXISTS "$ENV{HOME}/homebrew") list(APPEND CMAKE_FIND_ROOT_PATH "$ENV{HOME}/homebrew") endif() -find_package(Boost REQUIRED +find_package(Boost COMPONENTS filesystem chrono date_time system thread + REQUIRED ) find_package(Eigen REQUIRED) find_package(FmtLib REQUIRED) diff --git a/csrc/Pybind11.cpp b/csrc/Pybind11.cpp index 447a165..63b7d4f 100644 --- a/csrc/Pybind11.cpp +++ b/csrc/Pybind11.cpp @@ -22,13 +22,13 @@ #include "VrsBindings.h" #include "reader/Reader.h" #include "utils/Utils.h" +#include "writer/Writer.h" #if IS_VRS_FB_INTERNAL() #include "archive/Archive.h" #include "fb/FbInternal.h" #include "fb/dataset_snapshot/PyDatasetSnapshot.h" #include "filter/Filter.h" // Disable filter internally until AsyncImageFilter is reworked. -#include "writer/Writer.h" #endif #ifndef PYBIND_MODULE_NAME @@ -59,9 +59,9 @@ PYBIND11_MODULE(PYBIND_MODULE_NAME, m) { pyvrs::pybind_fbinternal(m); #endif pyvrs::pybind_reader(m); + pyvrs::pybind_writer(m); #if IS_VRS_FB_INTERNAL() pyvrs::pybind_filter(m); // Disable filter internally until AsyncImageFilter is reworked. - pyvrs::pybind_writer(m); pyvrs::pybind_archive(m); pyvrs::pybind_dataset_snapshot(m); #endif From cf1acf19171e10bf611cb68bfc046acbfe1135b0 Mon Sep 17 00:00:00 2001 From: Georges Berenger Date: Thu, 20 Nov 2025 14:25:54 -0800 Subject: [PATCH 2/2] remove boost Differential Revision: D87585429 Privacy Context Container: L1396930 --- .github/workflows/build-and-test.yml | 2 -- .readthedocs.yaml | 5 ----- cmake/LibrariesSetup.cmake | 9 --------- pixi.toml | 1 - scripts/build-macos-arm64-package.sh | 2 +- scripts/install-macos-deps.sh | 2 +- scripts/install-manylinux-deps.sh | 6 ------ 7 files changed, 2 insertions(+), 25 deletions(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index ad1631b..4c59d00 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -33,7 +33,6 @@ jobs: cmake git ninja-build libgtest-dev libfmt-dev \ libjpeg-dev libturbojpeg-dev libpng-dev \ liblz4-dev libzstd-dev libxxhash-dev \ - libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-date-time-dev \ portaudio19-dev libopus-dev python -m pip install -U pip python -m pip install pybind11[global] @@ -42,7 +41,6 @@ jobs: brew install cmake git ninja googletest glog fmt \ jpeg-turbo libpng \ lz4 zstd xxhash \ - boost \ portaudio opus pybind11 else diff --git a/.readthedocs.yaml b/.readthedocs.yaml index 05c27f0..f635c5d 100644 --- a/.readthedocs.yaml +++ b/.readthedocs.yaml @@ -24,11 +24,6 @@ build: - liblz4-dev - libzstd-dev - libxxhash-dev - - libboost-system-dev - - libboost-filesystem-dev - - libboost-thread-dev - - libboost-chrono-dev - - libboost-date-time-dev - portaudio19-dev tools: diff --git a/cmake/LibrariesSetup.cmake b/cmake/LibrariesSetup.cmake index 79d8c72..dd84d2c 100644 --- a/cmake/LibrariesSetup.cmake +++ b/cmake/LibrariesSetup.cmake @@ -17,15 +17,6 @@ if (EXISTS "$ENV{HOME}/homebrew") list(APPEND CMAKE_FIND_ROOT_PATH "$ENV{HOME}/homebrew") endif() -find_package(Boost - COMPONENTS - filesystem - chrono - date_time - system - thread - REQUIRED -) find_package(Eigen REQUIRED) find_package(FmtLib REQUIRED) find_package(RapidjsonLib REQUIRED) diff --git a/pixi.toml b/pixi.toml index 16dd874..c56c405 100644 --- a/pixi.toml +++ b/pixi.toml @@ -18,7 +18,6 @@ ninja = "1.11.1" [dependencies] gtest = "1.14.0" -boost = "1.84.0" fmt = "10.1.1" libjpeg-turbo = "2.1.4.*" libpng = "1.6.39.*" diff --git a/scripts/build-macos-arm64-package.sh b/scripts/build-macos-arm64-package.sh index 91d9150..4e0adb8 100644 --- a/scripts/build-macos-arm64-package.sh +++ b/scripts/build-macos-arm64-package.sh @@ -47,7 +47,7 @@ export CIBW_OUTPUT_DIR="dist" export CIBW_ARCHS="arm64" export CIBW_BUILD_VERBOSITY="3" export CIBW_BUILD="cp39-*64 cp310-*64 cp311-*64 cp312-*64" -export CIBW_BEFORE_BUILD_MACOS="arch -arm64 brew install boost cmake fmt glog jpeg-turbo libpng lz4 xxhash zstd opus" +export CIBW_BEFORE_BUILD_MACOS="arch -arm64 brew install cmake fmt glog jpeg-turbo libpng lz4 xxhash zstd opus" export CIBW_SKIP="*-manylinux_i686 *musllinux*" # Build wheels for all specified versions diff --git a/scripts/install-macos-deps.sh b/scripts/install-macos-deps.sh index 61dcb00..ac64fef 100644 --- a/scripts/install-macos-deps.sh +++ b/scripts/install-macos-deps.sh @@ -15,4 +15,4 @@ brew install cmake git ninja googletest glog fmt \ jpeg-turbo libpng \ - lz4 zstd xxhash boost opus + lz4 zstd xxhash opus diff --git a/scripts/install-manylinux-deps.sh b/scripts/install-manylinux-deps.sh index c963dbe..8f0fd8d 100644 --- a/scripts/install-manylinux-deps.sh +++ b/scripts/install-manylinux-deps.sh @@ -36,9 +36,3 @@ cd /tmp && git clone https://github.com/fmtlib/fmt.git -b 8.1.1 \ cd /tmp && git clone https://github.com/libjpeg-turbo/libjpeg-turbo.git -b 2.1.4 \ && cd libjpeg-turbo \ && cmake -DCMAKE_BUILD_TYPE=Release -DWITH_JPEG8=1 -DCMAKE_INSTALL_DEFAULT_PREFIX=/usr .;make -j4 install; rm -rf /tmp/libjpeg-turbo; - -cd /tmp && git clone --recursive https://github.com/boostorg/boost.git -b boost-1.81.0 \ - && cd boost \ - && ./bootstrap.sh \ - && ./b2 install \ - && rm -rf /tmp/boost;