From c76bff1fd9a93f73dc8bac63d62f54266f730f24 Mon Sep 17 00:00:00 2001 From: Grzegorz Bugaj Date: Thu, 3 Oct 2024 15:54:10 -0500 Subject: [PATCH] wip: fixed bugs --- Dockerfiles/gpu-310.Dockerfile | 2 +- README-GB.md | 2 +- README.md | 1 + extra-requirements.txt | 1 + marie/pipe/extract_pipeline.py | 2 ++ marie/resources/extra-requirements.txt | 3 ++- marie/serve/runtimes/worker/batch_queue.py | 2 +- tools/export.py | 0 8 files changed, 9 insertions(+), 4 deletions(-) create mode 100644 tools/export.py diff --git a/Dockerfiles/gpu-310.Dockerfile b/Dockerfiles/gpu-310.Dockerfile index 7c1a4ec0..982d8935 100644 --- a/Dockerfiles/gpu-310.Dockerfile +++ b/Dockerfiles/gpu-310.Dockerfile @@ -92,7 +92,7 @@ COPY requirements.txt extra-requirements.txt setup.py /tmp/ RUN python3.10 -m venv /opt/venv ENV PATH="/opt/venv/bin:${PATH}" RUN python3 -m pip install --no-cache-dir -U pip==22.0.4 setuptools==53.0.0 wheel==0.36.2 -RUN python3 -m pip install --no-cache-dir install --upgrade setuptools +RUN python3 -m pip install --no-cache-dir --upgrade setuptools RUN python3 -m pip install "pybind11[global]" # This prevents "ModuleNotFoundError: No module named 'pybind11'" RUN python3 -m pip install intel-openmp diff --git a/README-GB.md b/README-GB.md index 07bdc698..4cbea856 100644 --- a/README-GB.md +++ b/README-GB.md @@ -186,7 +186,7 @@ Overwrite the container `ENTRYPOINT` by using `--entrypoint` from command line a `nvidia-smi` ```sh -docker run -it --rm --gpus all --entrypoint /bin/bash marieai/marie:3.0.22-cuda +docker run -it --rm --gpus all --entrypoint /bin/bash marieai/marie:3.0.31-cuda ``` Remove dangling containers diff --git a/README.md b/README.md index cfe938a5..3fc896aa 100644 --- a/README.md +++ b/README.md @@ -134,6 +134,7 @@ aws s3 rm s3://marie --recursive --profile marie --endpoint-url http://localhos + # Production setup diff --git a/extra-requirements.txt b/extra-requirements.txt index eb9fedfb..812466ff 100644 --- a/extra-requirements.txt +++ b/extra-requirements.txt @@ -168,3 +168,4 @@ seaborn: standard,core textual: standard,core textual_textarea: standard,core textual_fastdatatable: standard,core +etcd3: standard,core diff --git a/marie/pipe/extract_pipeline.py b/marie/pipe/extract_pipeline.py index 7c2fa876..94ce16df 100644 --- a/marie/pipe/extract_pipeline.py +++ b/marie/pipe/extract_pipeline.py @@ -318,6 +318,7 @@ def execute_frames_pipeline( "ref_id": ref_id, "ref_type": ref_type, "job_id": job_id, + "work_dir": root_asset_dir, "pipeline": self.pipeline_name, "pages": f"{len(frames)}", } @@ -437,6 +438,7 @@ def execute_regions_pipeline( "ref_id": ref_id, "ref_type": ref_type, "job_id": job_id, + "work_dir": root_asset_dir, "pages": f"{len(frames)}", "ocr": results, } diff --git a/marie/resources/extra-requirements.txt b/marie/resources/extra-requirements.txt index 614073b8..328db01b 100644 --- a/marie/resources/extra-requirements.txt +++ b/marie/resources/extra-requirements.txt @@ -167,4 +167,5 @@ efficientnet-pytorch: standard,core seaborn: standard,core textual: standard,core textual_textarea: standard,core -textual_fastdatatable: standard,core \ No newline at end of file +textual_fastdatatable: standard,core +etcd3: standard,core \ No newline at end of file diff --git a/marie/serve/runtimes/worker/batch_queue.py b/marie/serve/runtimes/worker/batch_queue.py index 357af64a..fae276ed 100644 --- a/marie/serve/runtimes/worker/batch_queue.py +++ b/marie/serve/runtimes/worker/batch_queue.py @@ -3,7 +3,7 @@ from asyncio import Event, Task from typing import TYPE_CHECKING, Callable, Dict, List, Optional, Union -from jina._docarray import docarray_v2 +from marie._docarray import docarray_v2 if not docarray_v2: from docarray import DocumentArray diff --git a/tools/export.py b/tools/export.py new file mode 100644 index 00000000..e69de29b