Fix oss build (#309)

Summary:

Add a number of OSS issues that accumulated over time:
- extractAudio was added, but can't be used in oss from its location (linkage issues). Disabling in pyvrs/oss for now.
- properly exposed writer functionality in oss
- back-ported cmake install workaround from the vrs/oss repo

Differential Revision: D87478397

Author: Georges Berenger

.github/workflows/build-and-test.yml

@@ -39,7 +39,9 @@ jobs:
             python -m pip install pybind11[global]
 
           elif [ "$RUNNER_OS" == "macOS" ]; then
-              brew install cmake git ninja googletest glog fmt \
+              # Update or install cmake
+              brew upgrade cmake || brew install cmake
+              brew install git ninja googletest glog fmt \
                   jpeg-turbo libpng \
                   lz4 zstd xxhash \
                   boost \

cmake/LibrariesSetup.cmake

@@ -17,13 +17,15 @@ 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
+  CONFIG
+  REQUIRED
 )
 find_package(Eigen REQUIRED)
 find_package(FmtLib REQUIRED)

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

csrc/reader/Reader.cpp

@@ -18,7 +18,10 @@
 
 #include <vrs/os/Platform.h>
 #include <vrs/utils/AudioTrackExtractor.h>
+
+#if IS_VRS_FB_INTERNAL()
 #include <vrs/utils/cli/DataExtraction.h>
+#endif
 
 #include "AsyncVRSReader.h"
 #include "FilteredFileReader.h"
@@ -33,10 +36,12 @@ string extractAudioTrack(pyvrs::FilteredFileReader& filteredReader, const string
   return vrs::utils::extractAudioTrack(filteredReader.getFilteredReader(), wavFilePath);
 }
 
+#if IS_VRS_FB_INTERNAL()
 int extractAudio(const string& path, pyvrs::FilteredFileReader& filteredReader) {
   initVrsBindings();
   return vrs::utils::extractAudio(path, filteredReader.getFilteredReader());
 }
+#endif
 
 void pybind_reader(py::module& m) {
   py::enum_<pyvrs::ImageConversion>(m, "ImageConversion")
@@ -54,13 +59,12 @@ void pybind_reader(py::module& m) {
 
 #if IS_VRS_FB_INTERNAL()
   pybind_filtered_filereader(m);
+  m.def("extract_audio", &extractAudio, "Extract all audio tracks from given FilteredFileReader");
 #endif
 
   m.def(
       "extract_audio_track",
       &extractAudioTrack,
       "Extract audio track from given FilteredFileReader");
-
-  m.def("extract_audio", &extractAudio, "Extract all audio tracks from given FilteredFileReader");
 }
 } // namespace pyvrs