deepdetect
deepdetect copied to clipboard
Dlib version update and regression fixes
Update to fix some dlib regressions, and update the dlib version (which also fixes one new issue with opencv4).
This should be merged after https://github.com/jolibrain/deepdetect/pull/1448.
:warning: The sha of the head commit of this PR conflicts with #1448. Mergify cannot evaluate rules on this PR. :warning:
:warning: The sha of the head commit of this PR conflicts with #1448. Mergify cannot evaluate rules on this PR. :warning:
@mergifyio rebase
rebase
❌ Base branch update has failed
Git reported the following error:
Rebasing (1/8)
error: could not apply 8c11341... Added bool param to service creation for torch to optionally disable applying a softmax to the model output (default enabled)
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 8c11341... Added bool param to service creation for torch to optionally disable applying a softmax to the model output (default enabled)
Auto-merging src/dto/mllib.hpp
CONFLICT (content): Merge conflict in src/dto/mllib.hpp
Auto-merging src/backends/torch/torchlib.cc
CONFLICT (content): Merge conflict in src/backends/torch/torchlib.cc
Auto-merging docs/api.md
CONFLICT (content): Merge conflict in docs/api.md
err-code: 2506B
Hi
I just pushed some code formatting and rebasing
@cchadowitz-pf Hello, let's squash the commits and rebase !
@cchadowitz-pf Hello, let's squash the commits and rebase !
@beniz I'm not sure if I did the squash+rebase right.....I suspect not based on what github is showing under 'files changed' for this PR.....
@cchadowitz-pf I rebased your branch
If you want to add modifications you should override your local branch first with
git pull --rebase -Xtheirs
(if it does not work immediatly, delete your local branch and fetch it again)
Thanks @Bycob ! That looks great to me. I don't have any further changes for this dlib PR. I can't see what the GPU build error is but if it has to do with these changes please let me know and I'll take a look.
@Bycob not sure if you changed something but seems like all the checks have now passed?