Skip to content

change ocrd-anybaseocr-layout-analysis model #819

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.

Sign up for GitHub

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

Merged
kba merged 2 commits into from
Mar 20, 2022
Merged

change ocrd-anybaseocr-layout-analysis model #819

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c354663
change ocrd-anybaseocr-layout-analysis model
kba Mar 16, 2022
072294b
resmgr: updated ocrd-anybaseocr-tiseg model
kba Mar 20, 2022
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
16 changes: 10 additions & 6 deletions ocrd/ocrd/resource_list.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,19 +133,23 @@ ocrd-anybaseocr-block-segmentation:
description: block segmentation model for anybaseocr
size: 256139800
ocrd-anybaseocr-layout-analysis:
- url: https://ocr-d-repo.scc.kit.edu/models/dfki/layoutAnalysis/structure_analysis.h5
name: structure_analysis.h5
- url: https://ocr-d.kba.cloud/structure_analysis.tar.gz
name: structure_analysis
description: structure analysis model for anybaseocr
size: 31477056
type: tarball
path_in_archive: 'structure_analysis'
size: 29002514
- url: https://ocr-d-repo.scc.kit.edu/models/dfki/layoutAnalysis/mapping_densenet.pickle
name: mapping_densenet.pickle
description: mapping model for anybaseocr
size: 374
ocrd-anybaseocr-tiseg:
- url: https://ocr-d-repo.scc.kit.edu/models/dfki/tiseg/seg_model.hdf5
name: seg_model.hdf5
- url: https://ocr-d.kba.cloud/seg_model.tar.gz
name: seg_model
description: text image segmentation model for anybaseocr
size: 66080688
type: tarball
path_in_archive: 'seg_model'
size: 61388872
ocrd-kraken-segment:
- url: https://github.com/mittagessen/kraken/raw/master/kraken/blla.mlmodel
description: Pretrained baseline segmentation model
Expand Down
6 changes: 3 additions & 3 deletions ocrd/ocrd/resource_manager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,17 +249,17 @@ def download(
else:
self._copy_impl(url, fpath, progress_cb)
elif resource_type == 'tarball':
with pushd_popd(tempdir=True):
with pushd_popd(tempdir=True) as tempdir:
if is_url:
self._download_impl(url, 'download.tar.xx', progress_cb, size)
else:
self._copy_impl(url, 'download.tar.xx', progress_cb)
Path('out').mkdir()
with pushd_popd('out'):
log.info("Extracting tarball")
log.info("Extracting tarball to %s/out" % tempdir)
with open_tarfile('../download.tar.xx', 'r:*') as tar:
tar.extractall()
log.info("Copying '%s' from tarball to %s" % (path_in_archive, fpath))
log.info("Copying '%s' from extracted tarball %s/out to %s" % (path_in_archive, tempdir, fpath))
copytree(path_in_archive, str(fpath))
# TODO
# elif resource_type == 'github-dir':
Expand Down