Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor to support API prefixed Model example I/O files #1493

Open
wants to merge 12 commits into
base: master
Choose a base branch
from
Open

Refactor to support API prefixed Model example I/O files #1493

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
3711000
Modifying ersilia pack dockerfiles
Malikbadmus Jan 8, 2025
bb1ecfd
Added the new prefix file to predefined example files list
Malikbadmus Jan 8, 2025
e5c0022
minor change
Malikbadmus Jan 8, 2025
0dc4fba
Merge branch 'master' into Examples_I/O
DhanshreeA Jan 8, 2025
5b2d9c1
Merge branch 'master' into Examples_I/O
DhanshreeA Jan 13, 2025
8b53afe
example file correctioon
Malikbadmus Jan 13, 2025
c69a60f
Merge branch 'master' into Examples_I/O
DhanshreeA Jan 14, 2025
b24f4b5
Merge branch 'master' into Examples_I/O
DhanshreeA Jan 21, 2025
1288999
Merge branch 'ersilia-os:master' into Examples_I/O
Malikbadmus Jan 21, 2025
3448a1b
Merge branch 'master' into Examples_I/O
DhanshreeA Jan 22, 2025
d70274d
Merge branch 'ersilia-os:master' into Examples_I/O
Malikbadmus Jan 25, 2025
b0586c2
Minor fixes
Malikbadmus Jan 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions dockerfiles/dockerize-ersiliapack/base/Dockerfile.pip
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ COPY . /ersilia-pack
RUN apt-get clean && apt-get autoremove -y && \
rm -rf /var/lib/apt/lists/* && cd /ersilia-pack && pip install -e . && \
mv /ersilia-pack/docker-entrypoint.sh /root/docker-entrypoint.sh && \
chmod + /root/docker-entrypoint.sh
chmod +x /root/docker-entrypoint.sh
EXPOSE 80
ENTRYPOINT [ "sh", "/root/docker-entrypoint.sh"]
ENTRYPOINT [ "sh", "/root/docker-entrypoint.sh"]
4 changes: 2 additions & 2 deletions dockerfiles/dockerize-ersiliapack/local.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ And an entrypoint script called `docker-entrypoint.sh`.
5. This step assumes you are inside the ersilia-pack directory and you have completed Step 4. Build the base docker image, eg for Python 3.12 conda image, as follows:

```
docker build -f Dockerfile3.12-slim-bullseye -t ersiliaos/ersiliapack-py312:latest .
docker build -f Dockerfile.pip3.12-slim-bullseye -t ersiliaos/ersiliapack-py312:latest .
```

### Local build - model
Expand All @@ -42,4 +42,4 @@ docker build -f Dockerfile3.12-slim-bullseye -t ersiliaos/ersiliapack-py312:late

```
docker build -t ersiliaos/eosxxxx:latest .
```
```
8 changes: 4 additions & 4 deletions dockerfiles/dockerize-ersiliapack/model/Dockerfile.conda
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@ RUN conda install -c conda-forge xorg-libxrender xorg-libxtst
RUN cp /root/bundles/$MODEL/*/information.json /root/information.json && \
cp /root/bundles/$MODEL/*/api_schema.json /root/api_schema.json && \
cp /root/bundles/$MODEL/*/status.json /root/status.json && \
mkdir -p /root/model/framework/examples && \
cp /root/bundles/$MODEL/*/model/framework/examples/output.csv /root/model/framework/examples/output.csv && \
cp /root/bundles/$MODEL/*/model/framework/examples/input.csv /root/model/framework/examples/input.csv && \
mkdir -p /root/model/framework/examples && \
cp /root/bundles/$MODEL/*/model/framework/examples/run_output.csv /root/model/framework/examples/run_output.csv && \
cp /root/bundles/$MODEL/*/model/framework/examples/run_input.csv /root/model/framework/examples/run_input.csv && \
chmod + docker-entrypoint.sh
EXPOSE 80
ENTRYPOINT [ "sh", "docker-entrypoint.sh"]
ENTRYPOINT [ "sh", "docker-entrypoint.sh"]
6 changes: 3 additions & 3 deletions dockerfiles/dockerize-ersiliapack/model/Dockerfile.pip
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@ RUN apt-get update && \
cp /root/bundles/$MODEL/*/information.json /root/information.json && \
cp /root/bundles/$MODEL/*/api_schema.json /root/api_schema.json && \
cp /root/bundles/$MODEL/*/status.json /root/status.json && \
mkdir -p /root/model/framework/examples && \
cp /root/bundles/$MODEL/*/model/framework/examples/output.csv /root/model/framework/examples/output.csv && \
cp /root/bundles/$MODEL/*/model/framework/examples/input.csv /root/model/framework/examples/input.csv
mkdir -p /root/model/framework/examples && \
cp /root/bundles/$MODEL/*/model/framework/examples/run_output.csv /root/model/framework/examples/run_output.csv && \
cp /root/bundles/$MODEL/*/model/framework/examples/run_input.csv /root/model/framework/examples/run_input.csv
7 changes: 2 additions & 5 deletions ersilia/default.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,8 @@
EXAMPLE_STANDARD_INPUT_CSV_FILENAME = "example_standard_input.csv"
EXAMPLE_STANDARD_OUTPUT_CSV_FILENAME = "example_standard_output.csv"
PREDEFINED_EXAMPLE_FILES = [
"model/framework/examples/input.csv",
"model/framework/examples/output.csv",
"model/framework/input.csv",
"model/framework/example.csv",
"example.csv",
"model/framework/examples/run_input.csv",
"model/framework/examples/run_output.csv",
]
DEFAULT_ERSILIA_ERROR_EXIT_CODE = 1
METADATA_JSON_FILE = "metadata.json"
Expand Down