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

Upgrade open_clip_torch in marqo-base image #646

Merged
merged 11 commits into from
Nov 29, 2023
Merged

Upgrade open_clip_torch in marqo-base image #646

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
3854757
upgrade open clip version to 2.23.0
vicilliar Nov 10, 2023
e2563bf
add upgraded open clip to requirements.txt
vicilliar Nov 10, 2023
7dd3641
Update marqo-base image to test-open-clip-upgrade
vicilliar Nov 17, 2023
04fc409
remove upgrade from requirements.txt
vicilliar Nov 17, 2023
3855f42
Merge branch 'mainline' into joshua/upgrade-open-clip
vicilliar Nov 17, 2023
3589299
use 17 base image
vicilliar Nov 20, 2023
0828891
test upgrade to timm and safetensors
vicilliar Nov 28, 2023
186844a
use test marqo-base
vicilliar Nov 29, 2023
64e1168
change marqo-base image to 17
vicilliar Nov 29, 2023
866c8af
Remove upgrades from requirements.txt
vicilliar Nov 29, 2023
930ed9b
Merge branch 'mainline' into joshua/upgrade-open-clip
vicilliar Nov 29, 2023
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
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM marqoai/marqo-base:15 as base_image
FROM marqoai/marqo-base:17 as base_image
VOLUME /var/lib/docker
ARG TARGETPLATFORM
WORKDIR /app
Expand Down
5 changes: 3 additions & 2 deletions requirements.dev.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Pillow==9.3.0
numpy==1.23.4
validators==0.20.0
sentence-transformers==2.2.2
open_clip_torch==2.18.0
open_clip_torch==2.23.0
clip-marqo==1.0.2
onnx
protobuf
Expand All @@ -32,7 +32,8 @@ redis==4.4.2
# pin specific packages (last working 0.0.19 image)
# to fix ARM64 build scikit-learn error
platformdirs==3.5.0
timm==0.6.13
safetensors==0.4.1
timm==0.9.12
transformers==4.29.0

flatbuffers==23.5.9
Expand Down