diff --git a/.gitmodules b/.gitmodules index a705d0f9..cc7d3266 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,6 @@ [submodule "isaac_msgs"] path = communications/isaac_msgs url = https://github.com/nasa/isaac_msgs.git -[submodule "parseq"] - path = anomaly/str/parseq - url = git@github.com:baudm/parseq.git [submodule "craft"] path = anomaly/str/craft url = git@github.com:clovaai/CRAFT-pytorch.git diff --git a/anomaly/image_str/scripts/image_str/readme.md b/anomaly/image_str/readme.md similarity index 90% rename from anomaly/image_str/scripts/image_str/readme.md rename to anomaly/image_str/readme.md index 1ba8efe8..09db0d75 100644 --- a/anomaly/image_str/scripts/image_str/readme.md +++ b/anomaly/image_str/readme.md @@ -18,11 +18,11 @@ libraries and build them as Python packages. CRAFT-Pytorch - https://github.com/clovaai/CRAFT-pytorch + pip install https://github.com/marinagmoreira/CRAFT-pytorch.git#egg=craft PARSeq - https://github.com/baudm/parseq + pip install https://github.com/marinagmoreira/parseq.git@focal#egg=parseq The Image STR package also contains a requirements file with all the other necessary Python packages. diff --git a/anomaly/image_str/scripts/image_str/requirements.txt b/anomaly/image_str/requirements.txt similarity index 100% rename from anomaly/image_str/scripts/image_str/requirements.txt rename to anomaly/image_str/requirements.txt diff --git a/anomaly/image_str/scripts/image_str/parse_img.py b/anomaly/image_str/scripts/image_str/parse_img.py index 9b87827a..07446a3a 100755 --- a/anomaly/image_str/scripts/image_str/parse_img.py +++ b/anomaly/image_str/scripts/image_str/parse_img.py @@ -29,8 +29,8 @@ from craft.craft import CRAFT from IPython.display import HTML from IPython.display import display as idisplay -from parseq.strhub.data.module import SceneTextDataModule from PIL import Image +from strhub.data.module import SceneTextDataModule from torch.autograd import Variable from tqdm import tqdm diff --git a/anomaly/image_str/setup.py b/anomaly/image_str/setup.py index dcc2ce1b..6b805276 100644 --- a/anomaly/image_str/setup.py +++ b/anomaly/image_str/setup.py @@ -3,11 +3,23 @@ from catkin_pkg.python_setup import generate_distutils_setup d = generate_distutils_setup( - packages=["image_str", "craft", "parseq"], + packages=["image_str"], package_dir={"": "scripts"}, install_requires=[ - "CRAFT-pytorch @ git+ssh://git@github.com/clovaai/CRAFT-pytorch.git", - "parseq @ git+ssh://git@github.com/baudm/parseq.git", + "strhub>=4.7.1", + "craft>=4.7.1", + "gdown>=4.7.1", + "ipython>=8.12.2", + "ipywidgets>=8.0.7", + "jellyfish>=1.0.0", + "matplotlib>=3.7.2", + "numpy>=1.24.4", + "opencv_python>=4.8.0.74", + "pandas>=2.0.3", + "Pillow>=10.0.0", + "skimage>=0.0", + "torch>=2.0.1", + "tqdm>=4.65.0", ], )