Hub cleanup, token storage, readme

.github/workflows/publish.yaml

@@ -20,7 +20,6 @@ permissions:
 
 env:
   GAR_LOCATION: us-central1
-  DOCKERFILE: docker/${{ inputs.package }}/Dockerfile
   PACKAGE: ${{ inputs.package }}
   NAME: luxonis/modelconverter-${{ inputs.package }}
   STEM: modelconverter-${{ inputs.package }}
@@ -80,6 +79,10 @@ jobs:
 
     - name: Build image
       run: |
+        DOCKERFILE="docker/${PACKAGE}/Dockerfile"
+        if [ $PACKAGE = "hailo" ]; then
+            DOCKERFILE="${DOCKERFILE}.internal"
+        fi
         docker build -f "${DOCKERFILE}" -t "${LOCAL_NAME}" . --build-arg VERSION="${VERSION}"
 
     - name: GHCR publish latest

docker/hailo/Dockerfile

@@ -1,41 +1,68 @@
-# This Dockerfile is intended for internal use only.
-# If you want to build the Model Converter Docker image,
-# please use the Dockerfile.public file instead.
+FROM hailo_ai_sw_suite_2024-07:1
+USER root
 
-ARG VERSION=2.23.0
+RUN rm -rf \
+    /local/workspace/tappas \
+    /opt/google \
+    /local/workspace/doc \
+    /local/workspace/hailort_examples \
+    /usr/share \
+    /usr/bin/docker* \
+    /usr/bin/containerd* \
+    /local/workspace/hailo_virtualenv/lib/python3.8/site-packages/hailo_tutorials
 
-FROM ghcr.io/luxonis/modelconverter-hailo:${VERSION}-base
-
-ENV IN_DOCKER=
-ENV VERSION=${VERSION}
-
-COPY requirements.txt requirements.txt
+COPY requirements.txt .
 
 RUN <<EOF
 
     set -e
 
     pip install --upgrade pip
     pip install -r requirements.txt
+    pip install --extra-index-url
+        https://developer.download.nvidia.com/compute/redist \
+        nvidia-dali-cuda110
+    pip install --extra-index-url \
+        https://developer.download.nvidia.com/compute/redist \
+        nvidia-dali-tf-plugin-cuda110
+
+EOF
+
+RUN <<EOF
+
+    set -e
+
+    pip install pip-autoremove
+
+    pip-autoremove -y \
+        torch         \
+        jupyter       \
+        plotly        \
+        matplotlib    \
+        ipython       \
+        tensorboard   \
+        pip-autoremove
+
+    pip install psutil
+    rm -rf ~/.cache
 
 EOF
 
 WORKDIR /app
 
-COPY --link docker/hailo/entrypoint.sh /app/entrypoint.sh
+COPY docker/hailo/entrypoint.sh /app/entrypoint.sh
 COPY --link modelconverter /app/modelconverter/
 COPY --link pyproject.toml /app/pyproject.toml
 
 RUN <<EOF
 
     set -e
 
-    echo "export SSL_CERT_FILE=$(python -m certifi)" \
-        > /etc/profile.d/certifi.sh
-
     pip install -e . --no-deps --no-cache-dir
+    echo "export SSL_CERT_FILE=$(python -m certifi)" > /etc/profile.d/certifi.sh
     chmod +x /app/entrypoint.sh
 
 EOF
 
+
 ENTRYPOINT ["/app/entrypoint.sh"]

docker/hailo/Dockerfile.internal

@@ -0,0 +1,41 @@
+# This Dockerfile is intended for internal use only.
+# If you want to build the Model Converter Docker image,
+# please use the Dockerfile.public file instead.
+
+ARG VERSION=2.23.0
+
+FROM ghcr.io/luxonis/modelconverter-hailo:${VERSION}-base
+
+ENV IN_DOCKER=
+ENV VERSION=${VERSION}
+
+COPY requirements.txt requirements.txt
+
+RUN <<EOF
+
+    set -e
+
+    pip install --upgrade pip
+    pip install -r requirements.txt
+
+EOF
+
+WORKDIR /app
+
+COPY --link docker/hailo/entrypoint.sh /app/entrypoint.sh
+COPY --link modelconverter /app/modelconverter/
+COPY --link pyproject.toml /app/pyproject.toml
+
+RUN <<EOF
+
+    set -e
+
+    echo "export SSL_CERT_FILE=$(python -m certifi)" \
+        > /etc/profile.d/certifi.sh
+
+    pip install -e . --no-deps --no-cache-dir
+    chmod +x /app/entrypoint.sh
+
+EOF
+
+ENTRYPOINT ["/app/entrypoint.sh"]

modelconverter/__main__.py

@@ -247,7 +247,7 @@ def convert(
         logger = logging.getLogger(__name__)
         try:
             init_dirs()
-            cfg, archive_cfg, _main_stage = get_configs(str(path), opts)
+            cfg, archive_cfg, _main_stage = get_configs(path, opts)
             main_stage = main_stage or _main_stage
             is_multistage = len(cfg.stages) > 1
             if is_multistage and main_stage is None:
@@ -360,7 +360,7 @@ def convert(
         if output_dir is not None:
             args.extend(["--output-dir", output_dir])
         if path is not None:
-            args.extend(["--path", str(path)])
+            args.extend(["--path", path])
         if opts is not None:
             args.extend(opts)
         docker_exec(