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.

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

Update the Nuclio version #7787

Merged
merged 27 commits into from
May 2, 2024
Merged
Show file tree
Hide file tree
Changes from 25 commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
2b8f1ee
update nuclio version and faster_rcnn_inception_v2_coco function deps
Apr 17, 2024
9bcc134
update saic-vul runtime python ver
novda Apr 17, 2024
349d3d4
update mask_rcnn deps
novda Apr 18, 2024
2527547
update siammask deps
novda Apr 18, 2024
9eb4991
update logs in doc
novda Apr 18, 2024
e10e461
update gpu version
novda Apr 18, 2024
ed7692d
fix the pillow version
novda Apr 23, 2024
4ca44ed
return maxWorksers
novda Apr 23, 2024
64676b7
Merge branch 'develop' into za/update-nuclio-version
bsekachev Apr 23, 2024
35b53e1
remove extra code
novda Apr 23, 2024
66325b6
remove mask_rcnn functions
novda Apr 25, 2024
0ebffdc
remove extra spaces
novda Apr 25, 2024
4bdddb5
add changelog file
novda Apr 29, 2024
e258d2e
Merge branch 'za/update-nuclio-version' of github.com:novda/cvat into…
novda Apr 29, 2024
830851e
updated helm chart version
novda Apr 29, 2024
b1a02c1
fix define pillow version
novda Apr 29, 2024
e5eaca6
Merge branch 'develop' into za/update-nuclio-version
novda Apr 29, 2024
651309f
define the package version more clearly
novda Apr 29, 2024
d5741c1
change depricated method
novda Apr 30, 2024
f2f8759
remove package version define
novda Apr 30, 2024
01406ad
update siammask package to for python3.9
novda May 1, 2024
b4f9abd
remove extra packages
novda May 1, 2024
47b7730
Merge branch 'develop' into za/update-nuclio-version
novda May 1, 2024
8bb0d09
add entry about mask_rcnn
novda May 2, 2024
1e41839
fix linter error
novda May 2, 2024
802b7d8
fix formatting
novda May 2, 2024
f4b1942
formatted changelog file
novda May 2, 2024
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
10 changes: 10 additions & 0 deletions changelog.d/20240429_125117_zahadhamov_update_nuclio_version.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
### Changed

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add a blank line after the "Changed" heading for proper markdown formatting.

+ 

Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation.

Suggested change

- Update the Nuclio version and related packages/libraries
(<https://github.com/cvat-ai/cvat/pull/7787>)

### Removed
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add a blank line after the "Removed" heading for proper markdown formatting.

+ 

Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation.

Suggested change
### Removed
### Removed

- The `mask_rcnn` function has been removed because `mask_rcnn` using python3.6.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Improve the grammatical structure of the sentence for clarity.

- The `mask_rcnn` function has been removed because `mask_rcnn` using python3.6.
+ The `mask_rcnn` function has been removed because it was using Python 3.6.

Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation.

Suggested change
- The `mask_rcnn` function has been removed because `mask_rcnn` using python3.6.
The `mask_rcnn` function has been removed because it was using Python 3.6.

In new version of Nuclio python3.6 is no longer supported. Nuclio officially recommends using python3.9.
Running `mask_rcnn` on python3.9 causes errors within the function and package conflicts.
(<https://github.com/cvat-ai/cvat/pull/7787>)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove the extra whitespace before the URL for consistency.

-   (<https://github.com/cvat-ai/cvat/pull/7787>)
+ (<https://github.com/cvat-ai/cvat/pull/7787>)

Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation.

Suggested change
Running `mask_rcnn` on python3.9 causes errors within the function and package conflicts.
(<https://github.com/cvat-ai/cvat/pull/7787>)
Running `mask_rcnn` on python3.9 causes errors within the function and package conflicts.
(<https://github.com/cvat-ai/cvat/pull/7787>)

2 changes: 1 addition & 1 deletion components/serverless/docker-compose.serverless.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
services:
nuclio:
container_name: nuclio
image: quay.io/nuclio/dashboard:1.11.24-amd64
image: quay.io/nuclio/dashboard:1.13.0-amd64
SpecLad marked this conversation as resolved.
Show resolved Hide resolved
restart: always
networks:
- cvat
Expand Down
2 changes: 1 addition & 1 deletion helm-chart/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ dependencies:
condition: postgresql.enabled

- name: nuclio
version: 0.12.1
version: 0.19.0
repository: https://nuclio.github.io/nuclio/charts
condition: nuclio.enabled

Expand Down
10 changes: 5 additions & 5 deletions serverless/pytorch/foolwood/siammask/nuclio/function-gpu.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ metadata:

spec:
description: Fast Online Object Tracking and Segmentation
runtime: 'python:3.6'
runtime: 'python:3.9'
handler: main:handler
eventTimeout: 30s
env:
Expand All @@ -27,21 +27,21 @@ spec:
- kind: ARG
value: PATH="/root/miniconda3/bin:${PATH}"
- kind: RUN
value: apt update && apt install -y --no-install-recommends wget git ca-certificates libglib2.0-0 libsm6 libxrender1 libxext6 && rm -rf /var/lib/apt/lists/*
value: apt update && apt install -y --no-install-recommends wget git ca-certificates libgl1 libglib2.0-0 libsm6 libxrender1 libxext6 && rm -rf /var/lib/apt/lists/*
- kind: RUN
value: wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh &&
chmod +x Miniconda3-latest-Linux-x86_64.sh && bash Miniconda3-latest-Linux-x86_64.sh -b &&
rm -f Miniconda3-latest-Linux-x86_64.sh
- kind: WORKDIR
value: /opt/nuclio
- kind: RUN
value: conda create -y -n siammask python=3.7
value: conda create -y -n siammask python=3.9
- kind: SHELL
value: '["conda", "run", "-n", "siammask", "/bin/bash", "-c"]'
- kind: RUN
value: git clone https://github.com/foolwood/SiamMask.git
- kind: RUN
value: pip install Cython==0.29.4 colorama==0.3.9 numpy==1.15.4 requests==2.21.0 fire==0.1.3 matplotlib==2.2.3 numba==0.39.0 scipy==1.1.0 h5py==2.8.0 pandas==0.23.4 tqdm==4.29.1 tensorboardX==1.6 opencv_python==3.4.3.18 jsonpickle
value: pip install Cython colorama 'numpy<1.20' requests fire matplotlib numba scipy h5py pandas tqdm tensorboardX opencv_python jsonpickle
- kind: RUN
value: pip install torch==1.9.0+cu111 torchvision==0.10.0+cu111 torchaudio==0.9.0 -f https://download.pytorch.org/whl/torch_stable.html
- kind: RUN
Expand All @@ -51,7 +51,7 @@ spec:
- kind: RUN
value: wget -P SiamMask/experiments/siammask_sharp http://www.robots.ox.ac.uk/~qwang/SiamMask_DAVIS.pth
- kind: ENTRYPOINT
value: '["conda", "run", "-n", "siammask"]'
value: '["conda", "run", "--no-capture-output", "-n", "siammask"]'

triggers:
myHttpTrigger:
Expand Down
10 changes: 5 additions & 5 deletions serverless/pytorch/foolwood/siammask/nuclio/function.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ metadata:

spec:
description: Fast Online Object Tracking and Segmentation
runtime: 'python:3.6'
runtime: 'python:3.9'
handler: main:handler
eventTimeout: 30s
env:
Expand All @@ -27,29 +27,29 @@ spec:
- kind: ARG
value: PATH="/root/miniconda3/bin:${PATH}"
- kind: RUN
value: apt update && apt install -y --no-install-recommends wget git ca-certificates libglib2.0-0 libsm6 libxrender1 libxext6 && rm -rf /var/lib/apt/lists/*
value: apt update && apt install -y --no-install-recommends wget git ca-certificates libgl1 libglib2.0-0 libsm6 libxrender1 libxext6 && rm -rf /var/lib/apt/lists/*
- kind: RUN
value: wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh &&
chmod +x Miniconda3-latest-Linux-x86_64.sh && bash Miniconda3-latest-Linux-x86_64.sh -b &&
rm -f Miniconda3-latest-Linux-x86_64.sh
- kind: WORKDIR
value: /opt/nuclio
- kind: RUN
value: conda create -y -n siammask python=3.6
value: conda create -y -n siammask python=3.9
- kind: SHELL
value: '["conda", "run", "-n", "siammask", "/bin/bash", "-c"]'
- kind: RUN
value: git clone https://github.com/foolwood/SiamMask.git
- kind: RUN
value: pip install Cython==0.29.4 colorama==0.3.9 numpy==1.15.4 requests==2.21.0 fire==0.1.3 matplotlib==2.2.3 numba==0.39.0 scipy==1.1.0 h5py==2.8.0 pandas==0.23.4 tqdm==4.29.1 tensorboardX==1.6 opencv_python==3.4.3.18 torch==1.9.0 torchvision==0.2.1 jsonpickle
value: pip install Cython colorama 'numpy<1.20' requests fire matplotlib numba scipy h5py pandas tqdm tensorboardX opencv_python torch torchvision jsonpickle
- kind: RUN
value: conda install -y gcc_linux-64
- kind: RUN
value: cd SiamMask && bash make.sh && cd -
- kind: RUN
value: wget -P SiamMask/experiments/siammask_sharp http://www.robots.ox.ac.uk/~qwang/SiamMask_DAVIS.pth
- kind: ENTRYPOINT
value: '["conda", "run", "-n", "siammask"]'
value: '["conda", "run", "--no-capture-output", "-n", "siammask"]'

triggers:
myHttpTrigger:
Expand Down
3 changes: 1 addition & 2 deletions serverless/pytorch/saic-vul/fbrs/nuclio/function.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ metadata:

spec:
description: f-BRS interactive segmentation
runtime: 'python:3.6'
runtime: 'python:3.9'
handler: main:handler
eventTimeout: 30s
env:
Expand All @@ -23,7 +23,6 @@ spec:

build:
image: cvat.pth.saic-vul.fbrs
baseImage: python:3.6.11

directives:
preCopy:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,13 +91,13 @@ metadata:

spec:
description: Faster RCNN from Tensorflow Object Detection API optimized for GPU
runtime: 'python:3.6'
runtime: 'python:3.9'
handler: main:handler
eventTimeout: 30s

build:
image: cvat.tf.faster_rcnn_inception_v2_coco:latest-gpu
baseImage: tensorflow/tensorflow:2.1.1-gpu
baseImage: tensorflow/tensorflow:2.16.1-gpu

directives:
preCopy:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,13 +91,13 @@ metadata:

spec:
description: Faster RCNN from Tensorflow Object Detection API
runtime: 'python:3.6'
runtime: 'python:3.9'
handler: main:handler
eventTimeout: 30s

build:
image: cvat.tf.faster_rcnn_inception_v2_coco
baseImage: tensorflow/tensorflow:2.1.1
baseImage: tensorflow/tensorflow:2.16.1

directives:
preCopy:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ def __del__(self):
def infer(self, image):
width, height = image.size
if width > 1920 or height > 1080:
image = image.resize((width // 2, height // 2), Image.ANTIALIAS)
image = image.resize((width // 2, height // 2), Image.LANCZOS)
image_np = np.array(image.getdata())[:, :3].reshape(
(image.height, image.width, -1)).astype(np.uint8)
image_np = np.expand_dims(image_np, axis=0)
Expand Down
135 changes: 0 additions & 135 deletions serverless/tensorflow/matterport/mask_rcnn/nuclio/function-gpu.yaml
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Need another changelog entry for this removal. Also, please explain in the PR description why it was removed.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Need another changelog entry for this removal.

@novda You still haven't done this.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added

This file was deleted.

Loading
Loading