Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bazel updates for Harmonic #397

Merged
merged 26 commits into from
Apr 5, 2024
Merged
Changes from 1 commit
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
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
Prev Previous commit
Next Next commit
Merge branch 'mjcarroll/port/9_to_10' into mjcarroll/bazel_harmonic
Signed-off-by: Michael Carroll <mjcarroll@intrinsic.ai>
  • Loading branch information
mjcarroll committed Mar 11, 2024
commit 3df1f8338f6b3734f6a8cf5ab6312423093f962d
4 changes: 2 additions & 2 deletions core/src/DynamicFactory.cc
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,9 @@ void DynamicFactory::LoadDescriptors(const std::string &_paths)

auto loadDescFile = [this](const std::string &descFile)
{
// Ignore files without the correct extensions.
// Ignore files without the .desc extension.
if (descFile.rfind(".desc") == std::string::npos &&
descFile.rfind(".gz_desc") == std::string::npos &&
descFile.rfind(".proto") == std::string::npos &&
descFile.rfind(".proto.bin") == std::string::npos)
return;
Expand Down Expand Up @@ -132,7 +133,6 @@ void DynamicFactory::LoadDescriptors(const std::string &_paths)
}
};


for (const std::string &descDir : descDirs)
{
if (!std::filesystem::is_directory(descDir))
Expand Down
Loading
You are viewing a condensed version of this merge commit. You can view the full changes here.