Skip to content

Commit

Permalink
Prepare for 24.12 Release (NVIDIA#256)
Browse files Browse the repository at this point in the history
Co-authored-by: Devin Robison <[email protected]>
Co-authored-by: Edward Kim <[email protected]>
Co-authored-by: nkmcalli <[email protected]>
Co-authored-by: Julio Perez <[email protected]>
Co-authored-by: Ikko Eltociear Ashimine <[email protected]>
Co-authored-by: Deborah Shekinah Jacob <[email protected]>
  • Loading branch information
7 people authored Jan 30, 2025
1 parent 8d02d10 commit 115a256
Show file tree
Hide file tree
Showing 9 changed files with 49 additions and 50 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report_form.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ body:
attributes:
label: Version
description: What version of NVIDIA Ingest are you running?
placeholder: "example: 24.10"
placeholder: "example: 24.12"
validations:
required: true

Expand Down
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ NVIDIA_BUILD_API_KEY=... # Optional, set this is you are using build.nvidia.com
> `sudo nvidia-ctk runtime configure --runtime=docker --set-as-default`
5. Start all services:
`docker compose up`
`docker compose --profile retrieval up`

> [!TIP]
> By default we have [configured log levels to be verbose](docker-compose.yaml).
Expand Down Expand Up @@ -141,13 +141,13 @@ NVIDIA_BUILD_API_KEY=... # Optional, set this is you are using build.nvidia.com
Observe the started containers with `docker ps`:
```
CONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES
0f2f86615ea5 nvcr.io/ohlfw0olaadg/ea-participants/nv-ingest:24.10 "/opt/conda/bin/tini…" 35 seconds ago Up 33 seconds 0.0.0.0:7670->7670/tcp, :::7670->7670/tcp nv-ingest-nv-ingest-ms-runtime-1
0f2f86615ea5 nvcr.io/nvidia/nemo-microservices/nv-ingest:24.12 "/opt/conda/bin/tini…" 35 seconds ago Up 33 seconds 0.0.0.0:7670->7670/tcp, :::7670->7670/tcp nv-ingest-nv-ingest-ms-runtime-1
de44122c6ddc otel/opentelemetry-collector-contrib:0.91.0 "/otelcol-contrib --…" 14 hours ago Up 24 seconds 0.0.0.0:4317-4318->4317-4318/tcp, :::4317-4318->4317-4318/tcp, 0.0.0.0:8888-8889->8888-8889/tcp, :::8888-8889->8888-8889/tcp, 0.0.0.0:13133->13133/tcp, :::13133->13133/tcp, 55678/tcp, 0.0.0.0:32849->9411/tcp, :::32848->9411/tcp, 0.0.0.0:55680->55679/tcp, :::55680->55679/tcp nv-ingest-otel-collector-1
02c9ab8c6901 nvcr.io/ohlfw0olaadg/ea-participants/cached:0.2.0 "/opt/nvidia/nvidia_…" 14 hours ago Up 24 seconds 0.0.0.0:8006->8000/tcp, :::8006->8000/tcp, 0.0.0.0:8007->8001/tcp, :::8007->8001/tcp, 0.0.0.0:8008->8002/tcp, :::8008->8002/tcp nv-ingest-cached-1
02c9ab8c6901 nvcr.io/nvidia/nemo-microservices/cached:0.2.0 "/opt/nvidia/nvidia_…" 14 hours ago Up 24 seconds 0.0.0.0:8006->8000/tcp, :::8006->8000/tcp, 0.0.0.0:8007->8001/tcp, :::8007->8001/tcp, 0.0.0.0:8008->8002/tcp, :::8008->8002/tcp nv-ingest-cached-1
d49369334398 nvcr.io/nim/nvidia/nv-embedqa-e5-v5:1.1.0 "/opt/nvidia/nvidia_…" 14 hours ago Up 33 seconds 0.0.0.0:8012->8000/tcp, :::8012->8000/tcp, 0.0.0.0:8013->8001/tcp, :::8013->8001/tcp, 0.0.0.0:8014->8002/tcp, :::8014->8002/tcp nv-ingest-embedding-1
508715a24998 nvcr.io/ohlfw0olaadg/ea-participants/nv-yolox-structured-images-v1:0.2.0 "/opt/nvidia/nvidia_…" 14 hours ago Up 33 seconds 0.0.0.0:8000-8002->8000-8002/tcp, :::8000-8002->8000-8002/tcp nv-ingest-yolox-1
5b7a174a0a85 nvcr.io/ohlfw0olaadg/ea-participants/deplot:1.0.0 "/opt/nvidia/nvidia_…" 14 hours ago Up 33 seconds 0.0.0.0:8003->8000/tcp, :::8003->8000/tcp, 0.0.0.0:8004->8001/tcp, :::8004->8001/tcp, 0.0.0.0:8005->8002/tcp, :::8005->8002/tcp nv-ingest-deplot-1
430045f98c02 nvcr.io/ohlfw0olaadg/ea-participants/paddleocr:0.2.0 "/opt/nvidia/nvidia_…" 14 hours ago Up 24 seconds 0.0.0.0:8009->8000/tcp, :::8009->8000/tcp, 0.0.0.0:8010->8001/tcp, :::8010->8001/tcp, 0.0.0.0:8011->8002/tcp, :::8011->8002/tcp nv-ingest-paddle-1
508715a24998 nvcr.io/nvidia/nemo-microservices/nv-yolox-structured-images-v1:0.2.0 "/opt/nvidia/nvidia_…" 14 hours ago Up 33 seconds 0.0.0.0:8000-8002->8000-8002/tcp, :::8000-8002->8000-8002/tcp nv-ingest-yolox-1
5b7a174a0a85 nvcr.io/nvidia/nemo-microservices/deplot:1.0.0 "/opt/nvidia/nvidia_…" 14 hours ago Up 33 seconds 0.0.0.0:8003->8000/tcp, :::8003->8000/tcp, 0.0.0.0:8004->8001/tcp, :::8004->8001/tcp, 0.0.0.0:8005->8002/tcp, :::8005->8002/tcp nv-ingest-deplot-1
430045f98c02 nvcr.io/nvidia/nemo-microservices/paddleocr:0.2.0 "/opt/nvidia/nvidia_…" 14 hours ago Up 24 seconds 0.0.0.0:8009->8000/tcp, :::8009->8000/tcp, 0.0.0.0:8010->8001/tcp, :::8010->8001/tcp, 0.0.0.0:8011->8002/tcp, :::8011->8002/tcp nv-ingest-paddle-1
8e587b45821b grafana/grafana "/run.sh" 14 hours ago Up 33 seconds 0.0.0.0:3000->3000/tcp, :::3000->3000/tcp grafana-service
aa2c0ec387e2 redis/redis-stack "/entrypoint.sh" 14 hours ago Up 33 seconds 0.0.0.0:6379->6379/tcp, :::6379->6379/tcp, 8001/tcp nv-ingest-redis-1
bda9a2a9c8b5 openzipkin/zipkin "start-zipkin" 14 hours ago Up 33 seconds (healthy) 9410/tcp, 0.0.0.0:9411->9411/tcp, :::9411->9411/tcp nv-ingest-zipkin-1
Expand Down
2 changes: 1 addition & 1 deletion deploy/pdf-blueprint.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
"[ -d \"nv-ingest\" ] || git clone https://github.com/nvidia/nv-ingest\n",
"\n",
"cd nv-ingest\n",
"git checkout d0a3008c8d933fa322e12fab11a2358e971388fa # will be updated to 24.12 release when ready\n",
"git checkout 24.12\n",
"\n",
"export NGC_API_KEY=<enter-key-here>\n",
"\n",
Expand Down
10 changes: 5 additions & 5 deletions docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ services:
- "6379:6379"

yolox:
image: ${YOLOX_IMAGE:-nvcr.io/ohlfw0olaadg/ea-participants/nv-yolox-page-elements-v1}:${YOLOX_TAG:-1.0.0}
image: ${YOLOX_IMAGE:-nvcr.io/nvidia/nemo-microservices/nv-yolox-page-elements-v1}:${YOLOX_TAG:-1.0.0}
ports:
- "8000:8000"
- "8001:8001"
Expand Down Expand Up @@ -39,7 +39,7 @@ services:
runtime: nvidia

deplot:
image: ${DEPLOT_IMAGE:-nvcr.io/ohlfw0olaadg/ea-participants/deplot}:${DEPLOT_TAG:-1.0.0}
image: ${DEPLOT_IMAGE:-nvcr.io/nvidia/nemo-microservices/deplot}:${DEPLOT_TAG:-1.0.0}
ports:
- "8003:8000"
- "8004:8001"
Expand All @@ -60,7 +60,7 @@ services:
runtime: nvidia

cached:
image: ${CACHED_IMAGE:-nvcr.io/ohlfw0olaadg/ea-participants/cached}:${CACHED_TAG:-0.2.1}
image: ${CACHED_IMAGE:-nvcr.io/nvidia/nemo-microservices/cached}:${CACHED_TAG:-0.2.1}
shm_size: 2gb
ports:
- "8006:8000"
Expand All @@ -82,7 +82,7 @@ services:
runtime: nvidia

paddle:
image: ${PADDLE_IMAGE:-nvcr.io/ohlfw0olaadg/ea-participants/paddleocr}:${PADDLE_TAG:-1.0.0}
image: ${PADDLE_IMAGE:-nvcr.io/nvidia/nemo-microservices/paddleocr}:${PADDLE_TAG:-1.0.0}
shm_size: 2gb
ports:
- "8009:8000"
Expand Down Expand Up @@ -126,7 +126,7 @@ services:
runtime: nvidia

nv-ingest-ms-runtime:
image: nvcr.io/ohlfw0olaadg/ea-participants/nv-ingest:24.10.1
image: nvcr.io/nvidia/nemo-microservices/nv-ingest:24.12
build:
context: ${NV_INGEST_ROOT:-.}
dockerfile: "./Dockerfile"
Expand Down
10 changes: 5 additions & 5 deletions docs/docs/user-guide/getting-started/quickstart-guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -75,13 +75,13 @@ NV_INGEST_ROOT=<PATH_TO_THIS_REPO>
Observe the started containers with `docker ps`:
```
CONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES
0f2f86615ea5 nvcr.io/ohlfw0olaadg/ea-participants/nv-ingest:24.10 "/opt/conda/bin/tini…" 35 seconds ago Up 33 seconds 0.0.0.0:7670->7670/tcp, :::7670->7670/tcp nv-ingest-nv-ingest-ms-runtime-1
0f2f86615ea5 nvcr.io/nvidia/nemo-microservices/nv-ingest:24.12 "/opt/conda/bin/tini…" 35 seconds ago Up 33 seconds 0.0.0.0:7670->7670/tcp, :::7670->7670/tcp nv-ingest-nv-ingest-ms-runtime-1
de44122c6ddc otel/opentelemetry-collector-contrib:0.91.0 "/otelcol-contrib --…" 14 hours ago Up 24 seconds 0.0.0.0:4317-4318->4317-4318/tcp, :::4317-4318->4317-4318/tcp, 0.0.0.0:8888-8889->8888-8889/tcp, :::8888-8889->8888-8889/tcp, 0.0.0.0:13133->13133/tcp, :::13133->13133/tcp, 55678/tcp, 0.0.0.0:32849->9411/tcp, :::32848->9411/tcp, 0.0.0.0:55680->55679/tcp, :::55680->55679/tcp nv-ingest-otel-collector-1
02c9ab8c6901 nvcr.io/ohlfw0olaadg/ea-participants/cached:0.2.0 "/opt/nvidia/nvidia_…" 14 hours ago Up 24 seconds 0.0.0.0:8006->8000/tcp, :::8006->8000/tcp, 0.0.0.0:8007->8001/tcp, :::8007->8001/tcp, 0.0.0.0:8008->8002/tcp, :::8008->8002/tcp nv-ingest-cached-1
02c9ab8c6901 nvcr.io/nvidia/nemo-microservices/cached:0.2.0 "/opt/nvidia/nvidia_…" 14 hours ago Up 24 seconds 0.0.0.0:8006->8000/tcp, :::8006->8000/tcp, 0.0.0.0:8007->8001/tcp, :::8007->8001/tcp, 0.0.0.0:8008->8002/tcp, :::8008->8002/tcp nv-ingest-cached-1
d49369334398 nvcr.io/nim/nvidia/nv-embedqa-e5-v5:1.1.0 "/opt/nvidia/nvidia_…" 14 hours ago Up 33 seconds 0.0.0.0:8012->8000/tcp, :::8012->8000/tcp, 0.0.0.0:8013->8001/tcp, :::8013->8001/tcp, 0.0.0.0:8014->8002/tcp, :::8014->8002/tcp nv-ingest-embedding-1
508715a24998 nvcr.io/ohlfw0olaadg/ea-participants/nv-yolox-structured-images-v1:0.2.0 "/opt/nvidia/nvidia_…" 14 hours ago Up 33 seconds 0.0.0.0:8000-8002->8000-8002/tcp, :::8000-8002->8000-8002/tcp nv-ingest-yolox-1
5b7a174a0a85 nvcr.io/ohlfw0olaadg/ea-participants/deplot:1.0.0 "/opt/nvidia/nvidia_…" 14 hours ago Up 33 seconds 0.0.0.0:8003->8000/tcp, :::8003->8000/tcp, 0.0.0.0:8004->8001/tcp, :::8004->8001/tcp, 0.0.0.0:8005->8002/tcp, :::8005->8002/tcp nv-ingest-deplot-1
430045f98c02 nvcr.io/ohlfw0olaadg/ea-participants/paddleocr:0.2.0 "/opt/nvidia/nvidia_…" 14 hours ago Up 24 seconds 0.0.0.0:8009->8000/tcp, :::8009->8000/tcp, 0.0.0.0:8010->8001/tcp, :::8010->8001/tcp, 0.0.0.0:8011->8002/tcp, :::8011->8002/tcp nv-ingest-paddle-1
508715a24998 nvcr.io/nvidia/nemo-microservices/nv-yolox-structured-images-v1:0.2.0 "/opt/nvidia/nvidia_…" 14 hours ago Up 33 seconds 0.0.0.0:8000-8002->8000-8002/tcp, :::8000-8002->8000-8002/tcp nv-ingest-yolox-1
5b7a174a0a85 nvcr.io/nvidia/nemo-microservices/deplot:1.0.0 "/opt/nvidia/nvidia_…" 14 hours ago Up 33 seconds 0.0.0.0:8003->8000/tcp, :::8003->8000/tcp, 0.0.0.0:8004->8001/tcp, :::8004->8001/tcp, 0.0.0.0:8005->8002/tcp, :::8005->8002/tcp nv-ingest-deplot-1
430045f98c02 nvcr.io/nvidia/nemo-microservices/paddleocr:0.2.0 "/opt/nvidia/nvidia_…" 14 hours ago Up 24 seconds 0.0.0.0:8009->8000/tcp, :::8009->8000/tcp, 0.0.0.0:8010->8001/tcp, :::8010->8001/tcp, 0.0.0.0:8011->8002/tcp, :::8011->8002/tcp nv-ingest-paddle-1
8e587b45821b grafana/grafana "/run.sh" 14 hours ago Up 33 seconds 0.0.0.0:3000->3000/tcp, :::3000->3000/tcp grafana-service
aa2c0ec387e2 redis/redis-stack "/entrypoint.sh" 14 hours ago Up 33 seconds 0.0.0.0:6379->6379/tcp, :::6379->6379/tcp, 8001/tcp nv-ingest-redis-1
bda9a2a9c8b5 openzipkin/zipkin "start-zipkin" 14 hours ago Up 33 seconds (healthy) 9410/tcp, 0.0.0.0:9411->9411/tcp, :::9411->9411/tcp nv-ingest-zipkin-1
Expand Down
16 changes: 8 additions & 8 deletions helm/Chart.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
dependencies:
- name: common
repository: oci://registry-1.docker.io/bitnamicharts
version: 2.26.0
version: 2.29.1
- name: redis
repository: oci://registry-1.docker.io/bitnamicharts
version: 19.1.3
Expand All @@ -12,22 +12,22 @@ dependencies:
repository: https://open-telemetry.github.io/opentelemetry-helm-charts
version: 0.78.1
- name: yolox-nim
repository: https://helm.ngc.nvidia.com/ohlfw0olaadg/ea-participants
repository: https://helm.ngc.nvidia.com/nvidia/nemo-microservices
version: 0.2.0
- name: cached-nim
repository: https://helm.ngc.nvidia.com/ohlfw0olaadg/ea-participants
repository: https://helm.ngc.nvidia.com/nvidia/nemo-microservices
version: 0.2.0
- name: paddleocr-nim
repository: https://helm.ngc.nvidia.com/ohlfw0olaadg/ea-participants
repository: https://helm.ngc.nvidia.com/nvidia/nemo-microservices
version: 0.2.0
- name: deplot-nim
repository: https://helm.ngc.nvidia.com/ohlfw0olaadg/ea-participants
version: 0.1.6
repository: https://helm.ngc.nvidia.com/nvidia/nemo-microservices
version: 0.1.12
- name: text-embedding-nim
repository: https://helm.ngc.nvidia.com/nim/nvidia
version: 1.1.0
- name: milvus
repository: https://zilliztech.github.io/milvus-helm
version: 4.1.11
digest: sha256:02ea2487818069a86a95dbd7edb15cde07928306c8af061a06079de54bc1a895
generated: "2024-10-29T09:52:44.620765083-04:00"
digest: sha256:e185b88c9f0f5bfde2f0bf4195516f0b0f15dc4ec3af1b2ceecbc8a8846e632e
generated: "2025-01-29T15:33:16.951828-05:00"
12 changes: 6 additions & 6 deletions helm/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v2
name: nv-ingest
description: NV-Ingest Microservice
type: application
version: 0.3.8
version: 0.4.0
maintainers:
- name: NVIDIA Corporation
url: https://www.nvidia.com/
Expand All @@ -27,20 +27,20 @@ dependencies:
version: 0.78.1
condition: otelDeployed
- name: yolox-nim
repository: "alias:ngc"
repository: "alias:nemo-microservices"
version: 0.2.0
condition: yoloxDeployed
- name: cached-nim
repository: "alias:ngc"
repository: "alias:nemo-microservices"
version: 0.2.0
condition: cachedDeployed
- name: paddleocr-nim
repository: "alias:ngc"
repository: "alias:nemo-microservices"
version: 0.2.0
condition: paddleocrDeployed
- name: deplot-nim
repository: "alias:ngc"
version: 0.1.6
repository: "alias:nemo-microservices"
version: 0.1.12
condition: deplotDeployed
- name: text-embedding-nim
repository: "alias:nvidia-nim"
Expand Down
Loading

0 comments on commit 115a256

Please sign in to comment.