Added vietocr.vietocr

bmd1905 · Jan 20, 2023 · 9ba1195 · 9ba1195
1 parent e666d3b
commit 9ba1195
Show file tree

Hide file tree

Showing 11 changed files with 30 additions and 30 deletions.
diff --git a/__init__.py b/__init__.py
diff --git a/vietocr/loader/dataloader_v1.py b/vietocr/loader/dataloader_v1.py
@@ -2,8 +2,8 @@
 import numpy as np
 from PIL import Image
 import random
-from vietocr.model.vocab import Vocab
-from vietocr.tool.translate import process_image
+from vietocr.vietocr.model.vocab import Vocab
+from vietocr.vietocr.tool.translate import process_image
 import os
 from collections import defaultdict
 import math

diff --git a/vietocr/model/backbone/cnn.py b/vietocr/model/backbone/cnn.py
@@ -1,8 +1,8 @@
 import torch
 from torch import nn
 
-import vietocr.model.backbone.vgg as vgg
-from vietocr.model.backbone.resnet import Resnet50
+import vietocr.vietocr.model.backbone.vgg as vgg
+from vietocr.vietocr.model.backbone.resnet import Resnet50
 
 class CNN(nn.Module):
     def __init__(self, backbone, **kwargs):

diff --git a/vietocr/model/trainer.py b/vietocr/model/trainer.py
@@ -1,24 +1,24 @@
-from vietocr.optim.optim import ScheduledOptim
-from vietocr.optim.labelsmoothingloss import LabelSmoothingLoss
+from vietocr.vietocr.optim.optim import ScheduledOptim
+from vietocr.vietocr.optim.labelsmoothingloss import LabelSmoothingLoss
 from torch.optim import Adam, SGD, AdamW
 from torch import nn
-from vietocr.tool.translate import build_model
-from vietocr.tool.translate import translate, batch_translate_beam_search
-from vietocr.tool.utils import download_weights
-from vietocr.tool.logger import Logger
-from vietocr.loader.aug import ImgAugTransform
+from vietocr.vietocr.tool.translate import build_model
+from vietocr.vietocr.tool.translate import translate, batch_translate_beam_search
+from vietocr.vietocr.tool.utils import download_weights
+from vietocr.vietocr.tool.logger import Logger
+from vietocr.vietocr.loader.aug import ImgAugTransform
 
 import yaml
 import torch
-from vietocr.loader.dataloader_v1 import DataGen
-from vietocr.loader.dataloader import OCRDataset, ClusterRandomSampler, Collator
+from vietocr.vietocr.loader.dataloader_v1 import DataGen
+from vietocr.vietocr.loader.dataloader import OCRDataset, ClusterRandomSampler, Collator
 from torch.utils.data import DataLoader
 from einops import rearrange
 from torch.optim.lr_scheduler import CosineAnnealingLR, CyclicLR, OneCycleLR
 
 import torchvision 
 
-from vietocr.tool.utils import compute_accuracy
+from vietocr.vietocr.tool.utils import compute_accuracy
 from PIL import Image
 import numpy as np
 import os

diff --git a/vietocr/model/transformerocr.py b/vietocr/model/transformerocr.py
@@ -1,7 +1,7 @@
-from vietocr.model.backbone.cnn import CNN
-from vietocr.model.seqmodel.transformer import LanguageTransformer
-from vietocr.model.seqmodel.seq2seq import Seq2Seq
-from vietocr.model.seqmodel.convseq2seq import ConvSeq2Seq
+from vietocr.vietocr.model.backbone.cnn import CNN
+from vietocr.vietocr.model.seqmodel.transformer import LanguageTransformer
+from vietocr.vietocr.model.seqmodel.seq2seq import Seq2Seq
+from vietocr.vietocr.model.seqmodel.convseq2seq import ConvSeq2Seq
 from torch import nn
 
 class VietOCR(nn.Module):

diff --git a/vietocr/predict.py b/vietocr/predict.py
@@ -1,8 +1,8 @@
 import argparse
 from PIL import Image
 
-from vietocr.tool.predictor import Predictor
-from vietocr.tool.config import Cfg
+from vietocr.vietocr.tool.predictor import Predictor
+from vietocr.vietocr.tool.config import Cfg
 
 def main():
     parser = argparse.ArgumentParser()

diff --git a/vietocr/tests/utest.py b/vietocr/tests/utest.py
@@ -1,5 +1,5 @@
-from vietocr.loader.dataloader_v1 import DataGen
-from vietocr.model.vocab import Vocab
+from vietocr.vietocr.loader.dataloader_v1 import DataGen
+from vietocr.vietocr.model.vocab import Vocab
 
 def test_loader():
     chars = 'aAàÀảẢãÃáÁạẠăĂằẰẳẲẵẴắẮặẶâÂầẦẩẨẫẪấẤậẬbBcCdDđĐeEèÈẻẺẽẼéÉẹẸêÊềỀểỂễỄếẾệỆfFgGhHiIìÌỉỈĩĨíÍịỊjJkKlLmMnNoOòÒỏỎõÕóÓọỌôÔồỒổỔỗỖốỐộỘơƠờỜởỞỡỠớỚợỢpPqQrRsStTuUùÙủỦũŨúÚụỤưƯừỪửỬữỮứỨựỰvVwWxXyYỳỲỷỶỹỸýÝỵỴzZ0123456789!"#$%&\'()*+,-./:;<=>?@[\\]^_`{|}~ '

diff --git a/vietocr/tool/config.py b/vietocr/tool/config.py
@@ -1,5 +1,5 @@
 import yaml
-from vietocr.tool.utils import download_config
+from vietocr.vietocr.tool.utils import download_config
 
 url_config = {
         'vgg_transformer':'vgg-transformer.yml',

diff --git a/vietocr/tool/predictor.py b/vietocr/tool/predictor.py
@@ -1,5 +1,5 @@
-from vietocr.tool.translate import build_model, translate, translate_beam_search, process_input, predict
-from vietocr.tool.utils import download_weights
+from vietocr.vietocr.tool.translate import build_model, translate, translate_beam_search, process_input, predict
+from vietocr.vietocr.tool.utils import download_weights
 
 import torch
 from collections import defaultdict

diff --git a/vietocr/tool/translate.py b/vietocr/tool/translate.py
@@ -4,9 +4,9 @@
 from PIL import Image
 from torch.nn.functional import log_softmax, softmax
 
-from vietocr.model.transformerocr import VietOCR
-from vietocr.model.vocab import Vocab
-from vietocr.model.beam import Beam
+from vietocr.vietocr.model.transformerocr import VietOCR
+from vietocr.vietocr.model.vocab import Vocab
+from vietocr.vietocr.model.beam import Beam
 
 def batch_translate_beam_search(img, model, beam_size=4, candidates=1, max_seq_length=128, sos_token=1, eos_token=2):
     # img: NxCxHxW

diff --git a/vietocr/train.py b/vietocr/train.py
@@ -1,7 +1,7 @@
 import argparse
 
-from vietocr.model.trainer import Trainer
-from vietocr.tool.config import Cfg
+from vietocr.vietocr.model.trainer import Trainer
+from vietocr.vietocr.tool.config import Cfg
 
 def main():
     parser = argparse.ArgumentParser()