deepdetect icon indicating copy to clipboard operation
deepdetect copied to clipboard

Dlib version update and regression fixes

Open cchadowitz opened this issue 2 years ago • 1 comments

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.

cchadowitz avatar Aug 08 '22 14:08 cchadowitz

:warning: The sha of the head commit of this PR conflicts with #1448. Mergify cannot evaluate rules on this PR. :warning:

mergify[bot] avatar Aug 08 '22 14:08 mergify[bot]

:warning: The sha of the head commit of this PR conflicts with #1448. Mergify cannot evaluate rules on this PR. :warning:

mergify[bot] avatar Aug 10 '22 16:08 mergify[bot]

@mergifyio rebase

fantes avatar Aug 12 '22 15:08 fantes

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

mergify[bot] avatar Aug 12 '22 15:08 mergify[bot]

Hi

I just pushed some code formatting and rebasing

fantes avatar Aug 12 '22 15:08 fantes

@cchadowitz-pf Hello, let's squash the commits and rebase !

beniz avatar Aug 16 '22 09:08 beniz

@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 avatar Aug 16 '22 14:08 cchadowitz

@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)

Bycob avatar Aug 23 '22 09:08 Bycob

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.

cchadowitz avatar Aug 23 '22 16:08 cchadowitz

@Bycob not sure if you changed something but seems like all the checks have now passed?

cchadowitz avatar Aug 24 '22 20:08 cchadowitz