Skip to content

Commit

Permalink
Misc fixes for oss (facebookresearch#134)
Browse files Browse the repository at this point in the history
Summary:
Pull Request resolved: facebookresearch#134

X-link: facebookresearch/vrs#168

- fmt::join has been moved in the fmt library from one header to another. We need to include both location to be sure to build in all context and in open source with older and newer versions of fmt.
- make sure the vrs hash is current
- remove some fb-only includes
- remove annotations from oss
- fix license linter

Reviewed By: finik

Differential Revision: D66797878
  • Loading branch information
Georges Berenger authored and facebook-github-bot committed Dec 5, 2024
1 parent baaef19 commit 0b6b06d
Show file tree
Hide file tree
Showing 5 changed files with 2 additions and 123 deletions.
1 change: 1 addition & 0 deletions csrc/reader/MultiVRSReader.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
#include <string>

#include <fmt/format.h>
#include <fmt/ranges.h>

#include <pybind11/attr.h>
#include <pybind11/cast.h>
Expand Down
2 changes: 1 addition & 1 deletion csrc/vrs
Submodule vrs updated from 6add55 to e021ba
17 changes: 0 additions & 17 deletions csrc/writer/VRSWriter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -35,16 +35,11 @@
#define DEFAULT_LOG_CHANNEL "VRSWriter"
#include <logging/Log.h>

#include <vrs/gaia/GaiaClient.h>
#include <vrs/gaia/GaiaUploader.h>
#include <vrs/gaia/UploadMetadata.h>

#include "../VrsBindings.h"
#include "../utils/PyUtils.h"
#include "StreamFactory.h"

// Open source DataLayout definitions
#include "datalayouts/Annotations.h"
#include "datalayouts/SampleDataLayout.h"

namespace py = pybind11;
Expand Down Expand Up @@ -79,18 +74,6 @@ void VRSWriter::init() {
"sample_with_image", createSampleStreamWithImage);
StreamFactory::getInstance().registerStreamCreationFunction(
"sample_with_multiple_data_layout", createSampleStreamWithMultipleDataLayout);
StreamFactory::getInstance().registerStreamCreationFunction(
"full_annotation", createFullAnnotationStream);
StreamFactory::getInstance().registerStreamCreationFunction(
"label_annotation", createLabelAnnotationStream);
StreamFactory::getInstance().registerStreamCreationFunction(
"time_segment_annotation", createTimeSegmentAnnotationStream);
StreamFactory::getInstance().registerStreamCreationFunction(
"frame_annotation", createFrameAnnotationStream);
StreamFactory::getInstance().registerStreamCreationFunction(
"bounding_box_annotation", createBoundingBoxAnnotationStream);
StreamFactory::getInstance().registerStreamCreationFunction(
"key_points_annotation", createKeyPointsAnnotationStream);
/// Register open source stream writers (end)

#if IS_VRS_FB_INTERNAL()
Expand Down
66 changes: 0 additions & 66 deletions csrc/writer/datalayouts/Annotations.cpp

This file was deleted.

39 changes: 0 additions & 39 deletions csrc/writer/datalayouts/Annotations.h

This file was deleted.

0 comments on commit 0b6b06d

Please sign in to comment.