Skip to content

Conversation

@stweil
Copy link
Contributor

@stweil stweil commented Mar 26, 2022

Fixes: cbf2ca4 ("build with proper pix2pixhd pkg")
Signed-off-by: Stefan Weil sw@weilnetz.de

Comment on lines +27 to +30
from pix2pixhd.options.test_options import TestOptions
from pix2pixhd.models.models import create_model
from pix2pixhd.data.base_dataset import BaseDataset, get_params, get_transform
from pix2pixhd.util.util import tensor2im
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sry, forgot to update these – strange I did not notice via tests (I guess it must have been an old copy in my venv).

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

CI shows the failure ...

@stweil
Copy link
Contributor Author

stweil commented Mar 28, 2022

If you think that pix2pixhd should be kept as a submodule, we could add it to ocrd_all instead of ocrd_anybaseocr.

Fixes: cbf2ca4 ("build with proper pix2pixhd pkg")
Signed-off-by: Stefan Weil <sw@weilnetz.de>
@stweil
Copy link
Contributor Author

stweil commented Mar 28, 2022

@bertsky, I updated the commit to fix only the build breakage. It no longer removes the pix2pixhd submodule.

@stweil stweil changed the title Remove submodule pix2pixhd and fix build Fix build Mar 28, 2022
@bertsky
Copy link
Collaborator

bertsky commented Mar 28, 2022

If you think that pix2pixhd should be kept as a submodule, we could add it to ocrd_all instead of ocrd_anybaseocr.

No, that would be a misfit – we only did this for modules which had broken dependencies (neither pip nor submodule workable).

Copy link
Collaborator

@bertsky bertsky left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks.

@stweil
Copy link
Contributor Author

stweil commented Mar 30, 2022

@kba (or whoever has the rights), please merge this pull request and update ocrd_all to get the fix.

@kba kba merged commit abbeea6 into OCR-D:master Mar 30, 2022
@stweil stweil deleted the fix branch March 30, 2022 17:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants