Skip to content

Commit 183c935

Browse files
GitHKGitHK
authored
Merge pull request #1 from ITISFoundation/tensorflow-migration-and-new-pytorch
adding machine learning computational services
2 parents 4967619 + d8574ef commit 183c935

39 files changed

Lines changed: 836 additions & 0 deletions

File tree

‎.bumpversion-pytorch.cfg‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
[bumpversion]
2+
current_version = 1.1.0
3+
commit = False
4+
message = service version: {current_version} → {new_version}
5+
tag = False
6+
7+
[bumpversion:file:.osparc/osparc-python-runner-pytorch/metadata.yml]
8+
search = version: {current_version}
9+
replace = version: {new_version}
10+
11+
[bumpversion:file:Makefile]
12+
search = TAG_PYTORCH={current_version}
13+
replace = TAG_PYTORCH={new_version}

‎.bumpversion-tensorflow.cfg‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
[bumpversion]
2+
current_version = 1.1.0
3+
commit = False
4+
message = service version: {current_version} → {new_version}
5+
tag = False
6+
7+
[bumpversion:file:.osparc/osparc-python-runner-tensorflow/metadata.yml]
8+
search = version: {current_version}
9+
replace = version: {new_version}
10+
11+
[bumpversion:file:Makefile]
12+
search = TAG_TENSORFLOW={current_version}
13+
replace = TAG_TENSORFLOW={new_version}

‎.github/workflows/check-image.yml‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
name: Build and check image
2+
3+
on:
4+
# Run the workflow for pushes to the main branch
5+
push:
6+
branches:
7+
- master
8+
9+
# Run the workflow for pull requests (from forks or within the repo)
10+
pull_request:
11+
types:
12+
- opened
13+
- synchronize
14+
- reopened
15+
16+
jobs:
17+
verify-image-build:
18+
runs-on: ubuntu-latest
19+
steps:
20+
- name: Checkout repo content
21+
uses: actions/checkout@v2
22+
- name: ooil version
23+
uses: docker://itisfoundation/ci-service-integration-library:v2.0.11
24+
with:
25+
args: ooil --version
26+
- name: Assemble docker compose spec
27+
uses: docker://itisfoundation/ci-service-integration-library:v2.0.11
28+
with:
29+
args: ooil compose
30+
- name: Build all images if multiple
31+
uses: docker://itisfoundation/ci-service-integration-library:v2.0.11
32+
with:
33+
args: docker compose build
34+
- name: test Tensorflow
35+
run: make run-tensorflow-local
36+
- name: test PyTorch
37+
run: make run-pytorch-local

‎.gitignore‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# not interested in storing this file
2+
docker-compose.yml
3+
4+
5+
*.ignore.*
6+
7+
.venv/
8+
docker-compose.yml

‎.osparc/common/docker-compose.overwrite.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
services:
2+
common:
3+
build:
4+
context: ./common
5+
dockerfile: Dockerfile

‎.osparc/common/metadata.yml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
name: "Base runner-ml image"
2+
thumbnail:
3+
description: "used only for building not to be published"
4+
key: simcore/services/comp/common
5+
version: 0.0.0
6+
integration-version: 2.0.0
7+
type: dynamic
8+
authors:
9+
- name: "Andrei Neagu"
10+
email: "neagu@itis.swiss"
11+
affiliation: "IT'IS Foundation"
12+
contact: "neagu@itis.swiss"
13+
inputs: {}
14+
outputs: {}

‎.osparc/common/runtime.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
settings: []

‎.osparc/osparc-python-runner-pytorch/docker-compose.overwrite.yml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
services:
2+
osparc-python-runner-pytorch:
3+
depends_on:
4+
- common
5+
build:
6+
context: ./osparc-python-runner-pytorch
7+
dockerfile: Dockerfile

‎.osparc/osparc-python-runner-pytorch/metadata.yml‎

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
name: oSparc Python Runner PyTorch
2+
key: simcore/services/comp/osparc-python-runner-pytorch
3+
type: computational
4+
integration-version: 2.0.0
5+
version: 1.1.0
6+
description: https://raw.githubusercontent.com/ZurichMedTech/s4l-assets/refs/heads/main/app/full/services/simcore_services_comp_osparc-python-runner-pytorch.md
7+
icon: https://raw.githubusercontent.com/ZurichMedTech/s4l-assets/main/app/icons/s4l/simcore_services_comp_osparc-python-runner-pytorch.png
8+
thumbnail: https://raw.githubusercontent.com/ZurichMedTech/s4l-assets/main/app/thumbnails/s4l/simcore_services_comp_osparc-python-runner-pytorch.png
9+
contact: guidon@itis.swiss
10+
authors:
11+
- name: Manuel Guidon
12+
email: guidon@itis.swiss
13+
affiliation: IT'IS Foundation
14+
inputs:
15+
input_1:
16+
displayOrder: 1
17+
label: Input data
18+
description: Any code, requirements or data file
19+
type: data:*/*
20+
input_2:
21+
displayOrder: 2
22+
label: Additional input data - optional
23+
description: Any additional input data file
24+
type: data:*/*
25+
input_3:
26+
displayOrder: 3
27+
label: Additional input data - optional
28+
description: Any additional input data file
29+
type: data:*/*
30+
input_4:
31+
displayOrder: 4
32+
label: Additional input data - optional
33+
description: Any additional input data file
34+
type: data:*/*
35+
input_5:
36+
displayOrder: 5
37+
label: Additional input data - optional
38+
description: Any additional input data file
39+
type: data:*/*
40+
outputs:
41+
output_1:
42+
displayOrder: 1
43+
label: Output data
44+
description: The data produced by the script and saved under OUTPUT_FOLDER/output_1 as output_1.zip
45+
type: data:*/*
46+
fileToKeyMap:
47+
output_1.zip: output_1
48+
output_2:
49+
displayOrder: 2
50+
label: Output data
51+
description: The data produced by the script and saved under OUTPUT_FOLDER/output_2 as output_2.zip
52+
type: data:*/*
53+
fileToKeyMap:
54+
output_2.zip: output_2
55+
output_3:
56+
displayOrder: 3
57+
label: Output data
58+
description: The data produced by the script and saved under OUTPUT_FOLDER/output_3 as output_3.zip
59+
type: data:*/*
60+
fileToKeyMap:
61+
output_3.zip: output_3
62+
output_4:
63+
displayOrder: 4
64+
label: Output data
65+
description: The data produced by the script and saved under OUTPUT_FOLDER/output_4 as output_4.zip
66+
type: data:*/*
67+
fileToKeyMap:
68+
output_4.zip: output_4

‎.osparc/osparc-python-runner-pytorch/runtime.yml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
settings:
2+
- name: Resources
3+
type: Resources
4+
value:
5+
Limits:
6+
NanoCPUs: 0
7+
MemoryBytes: 0
8+
Reservations:
9+
NanoCPUs: 0
10+
MemoryBytes: 0
11+
GenericResources:
12+
- DiscreteResourceSpec:
13+
Kind: VRAM
14+
Value: 1

0 commit comments

Comments
 (0)