Skip to content
Snippets Groups Projects
Commit bcc85a04 authored by François  LAURENT's avatar François LAURENT
Browse files

reintroducing system image to get around with executable stack issues

parent 1f6c46d9
Branches
No related tags found
1 merge request!5Various WebUI bug fixes
Pipeline #105853 passed
FROM julia:1.9.0-bullseye AS base FROM julia:1.9.1-bookworm AS base
ARG PROJECT_DIR=/app ARG PROJECT_DIR=/app
ARG BRANCH=main ARG BRANCH=main
...@@ -12,11 +12,14 @@ RUN apt-get update \ ...@@ -12,11 +12,14 @@ RUN apt-get update \
&& git clone --depth 1 --no-tags --single-branch -b $BRANCH https://gitlab.pasteur.fr/nyx/larvatagger.jl "$JULIA_PROJECT" \ && git clone --depth 1 --no-tags --single-branch -b $BRANCH https://gitlab.pasteur.fr/nyx/larvatagger.jl "$JULIA_PROJECT" \
&& rm -rf "$JULIA_PROJECT/.git" \ && rm -rf "$JULIA_PROJECT/.git" \
&& julia -e 'using Pkg; try Pkg.rm("TaggingBackends"); catch end; Pkg.instantiate()' \ && julia -e 'using Pkg; try Pkg.rm("TaggingBackends"); catch end; Pkg.instantiate()' \
&& ln -s "$JULIA_PROJECT/scripts/larvatagger.jl" /bin \ && ln -s "$JULIA_PROJECT/scripts/larvatagger" /bin \
&& mkdir -p "$JULIA_DEPOT_PATH/logs" && rm -f "$JULIA_DEPOT_PATH/logs/manifest_usage.toml" && ln -s /dev/null "$JULIA_DEPOT_PATH/logs/manifest_usage.toml" && mkdir -p "$JULIA_DEPOT_PATH/logs" && rm -f "$JULIA_DEPOT_PATH/logs/manifest_usage.toml" && ln -s /dev/null "$JULIA_DEPOT_PATH/logs/manifest_usage.toml"
ENTRYPOINT ["larvatagger.jl"] RUN $JULIA_PROJECT/test/precompile.sh --shallow \
#, "-J/lib/larvatagger.so"] && mv larvatagger.so /lib/ \
&& rm -rf $JULIA_PROJECT/test/data
ENTRYPOINT ["larvatagger", "-J/lib/larvatagger.so"]
FROM base AS prebuild FROM base AS prebuild
...@@ -24,7 +27,7 @@ FROM base AS prebuild ...@@ -24,7 +27,7 @@ FROM base AS prebuild
ENV PIP_DISABLE_PIP_VERSION_CHECK=1 \ ENV PIP_DISABLE_PIP_VERSION_CHECK=1 \
PIP_NO_CACHE_DIR=1 \ PIP_NO_CACHE_DIR=1 \
POETRY_VIRTUALENVS_IN_PROJECT=1 \ POETRY_VIRTUALENVS_IN_PROJECT=1 \
POETRY_VERSION=1.2.0 POETRY_VERSION=1.5.1
RUN apt-get update \ RUN apt-get update \
&& apt-get install --no-install-recommends -y python3-dev python3-pip \ && apt-get install --no-install-recommends -y python3-dev python3-pip \
......
...@@ -8,6 +8,12 @@ ...@@ -8,6 +8,12 @@
currentdir=$(dirname "$(realpath "${BASH_SOURCE[0]}")") currentdir=$(dirname "$(realpath "${BASH_SOURCE[0]}")")
if [ "${1:0:2}" = "-J" ]; then
cmd=$2
else
cmd=$1
fi
case $1 in case $1 in
open) open)
shift shift
...@@ -20,16 +26,16 @@ import|merge|train|predict|--version|-V) ...@@ -20,16 +26,16 @@ import|merge|train|predict|--version|-V)
*) *)
cat << "EOT" cat << "EOT"
LarvaTagger.jl LarvaTagger
Usage: Usage:
larvatagger.jl open <file-path> [--backends=<path>] [--port=<number>] [--quiet] [--viewer] [--browser] [--manual-label=<label>] larvatagger open <file-path> [--backends=<path>] [--port=<number>] [--quiet] [--viewer] [--browser] [--manual-label=<label>]
larvatagger.jl import <input-path> [<output-file>] [--id=<id>] [--framerate=<fps>] [--pixelsize=<μm>] [--overrides=<comma-separated-list>] [--default-label=<label>] [--manual-label=<label>] [--decode] [--copy-labels] larvatagger import <input-path> [<output-file>] [--id=<id>] [--framerate=<fps>] [--pixelsize=<μm>] [--overrides=<comma-separated-list>] [--default-label=<label>] [--manual-label=<label>] [--decode] [--copy-labels]
larvatagger.jl train <backend-path> <data-path> <model-instance> [--pretrained-model=<instance>] [--labels=<comma-separated-list>] [--sample-size=<N>] [--balancing-strategy=<strategy>] [--class-weights=<csv>] [--manual-label=<label>] [--layers=<N>] [--iterations=<N>] [--seed=<seed>] larvatagger train <backend-path> <data-path> <model-instance> [--pretrained-model=<instance>] [--labels=<comma-separated-list>] [--sample-size=<N>] [--balancing-strategy=<strategy>] [--class-weights=<csv>] [--manual-label=<label>] [--layers=<N>] [--iterations=<N>] [--seed=<seed>]
larvatagger.jl predict <backend-path> <model-instance> <data-path> [--output=<filename>] [--make-dataset] [--skip-make-dataset] [--data-isolation] larvatagger predict <backend-path> <model-instance> <data-path> [--output=<filename>] [--make-dataset] [--skip-make-dataset] [--data-isolation]
larvatagger.jl merge <input-path> <input-file> [<output-file>] [--manual-label=<label>] [--decode] larvatagger merge <input-path> <input-file> [<output-file>] [--manual-label=<label>] [--decode]
larvatagger.jl -V | --version larvatagger -V | --version
larvatagger.jl -h | --help larvatagger -h | --help
Options: Options:
-h --help Show this screen. -h --help Show this screen.
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment