Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand All @@ -42,7 +41,6 @@ jobs:
brew install cmake git ninja googletest glog fmt \
jpeg-turbo libpng \
lz4 zstd xxhash \
boost \
portaudio opus pybind11

else
Expand Down
5 changes: 0 additions & 5 deletions .readthedocs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
8 changes: 0 additions & 8 deletions cmake/LibrariesSetup.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,6 @@ if (EXISTS "$ENV{HOME}/homebrew")
list(APPEND CMAKE_FIND_ROOT_PATH "$ENV{HOME}/homebrew")
endif()

find_package(Boost REQUIRED
COMPONENTS
filesystem
chrono
date_time
system
thread
)
find_package(Eigen REQUIRED)
find_package(FmtLib REQUIRED)
find_package(RapidjsonLib REQUIRED)
Expand Down
4 changes: 2 additions & 2 deletions csrc/Pybind11.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion pixi.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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.*"
Expand Down
2 changes: 1 addition & 1 deletion scripts/build-macos-arm64-package.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion scripts/install-macos-deps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@

brew install cmake git ninja googletest glog fmt \
jpeg-turbo libpng \
lz4 zstd xxhash boost opus
lz4 zstd xxhash opus
6 changes: 0 additions & 6 deletions scripts/install-manylinux-deps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Loading