diff --git a/recipes/Dockerfile b/recipes/Dockerfile index fdcebcc1f8328141840fbfaef6256e83b6f8938b..ed7f7b02c4c0e3a462ccbf037a34bafaa80c48f0 100644 --- a/recipes/Dockerfile +++ b/recipes/Dockerfile @@ -37,12 +37,13 @@ ARG PROJECT_DIR=/app ARG BRANCH=main ARG BACKEND -RUN if [ "$BACKEND" = "MaggotUBA/20221005" ]; then \ +RUN if [ "$BACKEND" = "MaggotUBA/20221005-1" ]; then \ cd $PROJECT_DIR \ && julia -e "using Pkg; Pkg.add(url=\"https://gitlab.pasteur.fr/nyx/TaggingBackends\", rev=\"$BRANCH\")" \ && git clone --depth 1 --no-tags --single-branch -b 20221005 https://gitlab.pasteur.fr/nyx/MaggotUBA-adapter MaggotUBA \ && cd MaggotUBA \ && rm -rf .git \ + && rm -rf models/20221005 \ && poetry install --only main \ && poetry add "pynvml==11.4.1" \ && rm -rf ~/.cache; \ diff --git a/scripts/larvatagger.sh b/scripts/larvatagger.sh index 6ae2da797ad078c0b187db98602a2b8700204e5c..bf6a51c646cae9836b4b00b2f7fbc75cc3031ed9 100755 --- a/scripts/larvatagger.sh +++ b/scripts/larvatagger.sh @@ -28,7 +28,7 @@ while ! [ -z "$1" ]; do if [ "$1" = "--dev" -o "$1" = "--stable" ]; then BUILD=$1; shift elif [ "$1" = "--get-backend" -o "$1" = "--with-default-backend" ]; then -DOCKER_ARGS="--build-arg BACKEND=MaggotUBA/20221005 $DOCKER_ARGS"; shift +DOCKER_ARGS="--build-arg BACKEND=MaggotUBA/20221005-1 $DOCKER_ARGS"; shift TARGET=backend elif [ "$1" = "--with-backend" ]; then DOCKER_ARGS="--build-arg BACKEND=$2 $DOCKER_ARGS"; shift 2 @@ -186,7 +186,7 @@ docker pull flaur/larvatagger:latest *) -echo "usage: $0 build [--stable] [--get-backend]" +echo "usage: $0 build [--stable] [--with-default-backend]" echo " $0 open <filepath>" echo " $0 import <filepath> [<outputfilename>] [--id=<runid>] [--framerate=<fps>]" echo " $0 train <datarepository> <taggername> [--backend <name>]" @@ -194,6 +194,8 @@ echo " [--rm] [--cpus <c>] [--gpus <g>] [--memory < echo " $0 predict <datafile> [--backend <name>] [--model-instance <taggername>]" echo " [--rm] [--cpus <c>] [--gpus <g>] [--memory <m>]" echo " $0 --more-help" +echo " $0 --version" +echo " $0 --update" ;; esac