298 Коммитов

Автор SHA1 Сообщение Дата
Petr Andriushchenko
5441edf2d6
Merge branch 'main' into add_itm 2023-03-31 15:23:15 +02:00
Petr Andriushchenko
f1aeeabd18
fixed varible name, uncomment test, exluded it from CI, fixed error in multimodal_search 2023-03-31 13:35:04 +02:00
Inga Ulusoy
0ae872e750 fix code smells, test notebook 2023-03-31 11:21:08 +02:00
pre-commit-ci[bot]
f89fa4e519
[pre-commit.ci] pre-commit autoupdate (#46)
* [pre-commit.ci] pre-commit autoupdate

updates:
- [github.com/psf/black: 22.12.0 → 23.1.0](https://github.com/psf/black/compare/22.12.0...23.1.0)
- [github.com/psf/black: 22.12.0 → 23.1.0](https://github.com/psf/black/compare/22.12.0...23.1.0)
- [github.com/s-weigand/flake8-nb: v0.5.0 → v0.5.2](https://github.com/s-weigand/flake8-nb/compare/v0.5.0...v0.5.2)

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Update .pre-commit-config.yaml

* run hooks

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Inga Ulusoy <inga.ulusoy@uni-heidelberg.de>
2023-03-30 19:39:21 +02:00
Petr Andriushchenko
ecc0d814bb
commented new heavy tests in test_multimodal_search.py 2023-03-30 14:19:07 +02:00
Petr Andriushchenko
f7081d6878
merge main to add_itm, fixed saving path, added tmp_path 2023-03-30 13:45:30 +02:00
Petr Andriushchenko
46d5d43f0b
merge main to add_itm 2023-03-30 13:43:06 +02:00
Petr Andriushchenko
e33035bc68
Merge pull request #66 from ssciwr/text-summasy
add text summary
2023-03-30 13:35:43 +02:00
Inga Ulusoy
f03c3a197c add test data file 2023-03-30 11:23:57 +02:00
Inga Ulusoy
cf1e1b83d7 add text summary 2023-03-30 11:23:01 +02:00
Petr Andriushchenko
a5c43b6488
Test debugging (#62)
* deleted lavis from utils

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* fixed test_objects

* added 'not gcv' to CI

* fixed multimodal search and summary tests

* disable doc build on PR for now

* restrict ipywidgets version to avoid dummycomm error

* limit deepface version

* original repositories for retinaface lavis

* update gcv test results

* update display test outputs

* update test env

* run all tests

* wo xdist to avoid segfault

* remove widgets ref

* skip long-running tests

* skip long

* verbose codecov upload

* refactor summary test 2

* finish summary test refactor

* reduce memory overhead of SummaryDetector

* remove VQA models from self

* remove VQA models from self

* update notebook for changes

* update notebook for changes

* fixed multimodal search tests

* fixed tests in multimodal search after precommit

* run all tests

* update doc notebook for summary changes

* skip long-running multimodal

* exclude blip2 from testing

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Inga Ulusoy <inga.ulusoy@uni-heidelberg.de>
2023-03-30 10:33:05 +02:00
Petr Andriushchenko
a00ac65868
fixed tests in multimodal 2023-03-29 16:27:17 +02:00
Petr Andriushchenko
b9ad5b267d
precommit 2023-03-28 16:36:24 +02:00
Petr Andriushchenko
e34adf0530
after merge 2023-03-28 16:35:46 +02:00
pre-commit-ci[bot]
fc04ee12d8 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-03-27 13:27:13 +00:00
Petr Andriushchenko
e889fb95f7
added itm test 2023-03-27 15:24:25 +02:00
Petr Andriushchenko
76fa7795d2
fixing dependencies 2023-03-27 14:25:21 +02:00
Petr Andriushchenko
ad9b40088f
fixed test_objects.py 2023-03-24 11:22:39 +01:00
pre-commit-ci[bot]
dcc62bdcd5 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-03-24 10:16:07 +00:00
Petr Andriushchenko
f96862eb04
remove lavis from utils.py 2023-03-24 11:14:55 +01:00
pre-commit-ci[bot]
3be4e6a114 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-03-24 10:01:56 +00:00
Petr Andriushchenko
7732b802b8
fixed tests 2023-03-24 11:01:35 +01:00
Petr Andriushchenko
cc3d7f3aa8
merge main to add_itm 2023-03-23 17:09:07 +01:00
Petr Andriushchenko
16fb5a02ee
fixed itm functionality 2023-03-23 16:40:48 +01:00
Inga Ulusoy
0ca9366980
update docs and google auth (#63)
* update notebooks and google auth

* update readme and text

* google cred

* update secret name

* add pandocto CI

* pandoc step

* install pandoc

* correct typo
2023-03-23 14:07:30 +01:00
Inga Ulusoy
6eff8b8145
Update doc (#61)
* add image summary notebook

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* pin deepface version to avoid bug with progress bar after update

* update actions version for checkout and python

* test ci without lavis

* no lavis for ci test

* merging

* return lavis

* change lavis to salesforce-lavis

* change pycocotools install method

* change pycocotools install method

* fix_pycocotools

* Downgrade Python

* back to 3.9 and remove pycocotools dependance

* instrucctions for windows

* missing comma after merge

* lavis only for ubuntu

* use lavis package name in install instead of git

* adding multimodal searching py and notebook

* exclude lavis on windows

* skip import on windows

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* reactivate lavis

* Revert "reactivate lavis"

This reverts commit ecdaf9d316e4b08816ba62da5e0482c8ff15b14e.

* Change input format for multimodal search

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* fix clip models

* account for new interface in init imports

* changed imports bec of lavis/windows

* fix if-else, added clip ViT-L-14=336 model

* fix code smells

* add model change function to summary

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* fixed new model in summary.py

* fixed summary windget

* moved some function to utils

* fixed imort torch in utils

* added test_summary.py

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* fixed opencv version

* added first test of multimodal_search.py

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* fixed test

* removed windows in CI and added test in multimodal search

* change lavis from dependencies from pip ro git

* fixed blip2 model in test_multimodal_search.py

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* fixed test multimodal search on cpu and gpu machines

* added test, fixed dependencies

* add -vv to pytest command in CI

* added test_multimodal_search tests

* fixed tests in test_multimodal_search.py

* fixed tests in test_summary

* changed CI and fixed test_multimodel search

* fixed ci

* fixed error in test multimodal search, changed ci

* added multimodal search test, added windows CI, added picture in test data

* CI debuging

* fixing tests in CI

* fixing test in CI 2

* fixing CI 3

* fixing CI

* added filtering function

* Brought back all tests after CI fixing

* changed CI one pytest by individual tests

* fixed opencv problem

* fix path for text, adjust result for new gcv

* remove opencv

* fixing cv2 error

* added opencv-contrib, change objects_cvlib

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* fixing tests in CI

* fixing CI testing

* fixing codecov in CI

* fixing codecov in CI

* run tests together; install opencv last

* update requirements for opencv dependencies

* first doc updates

* more changes to doc notebooks

---------

Co-authored-by: Petr Andriushchenko <pitandmind@gmail.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2023-03-22 10:56:10 +01:00
Petr Andriushchenko
2891c8a6ed
add image summary notebook (#57)
* add image summary notebook

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* pin deepface version to avoid bug with progress bar after update

* update actions version for checkout and python

* test ci without lavis

* no lavis for ci test

* merging

* return lavis

* change lavis to salesforce-lavis

* change pycocotools install method

* change pycocotools install method

* fix_pycocotools

* Downgrade Python

* back to 3.9 and remove pycocotools dependance

* instrucctions for windows

* missing comma after merge

* lavis only for ubuntu

* use lavis package name in install instead of git

* adding multimodal searching py and notebook

* exclude lavis on windows

* skip import on windows

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* reactivate lavis

* Revert "reactivate lavis"

This reverts commit ecdaf9d316e4b08816ba62da5e0482c8ff15b14e.

* Change input format for multimodal search

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* fix clip models

* account for new interface in init imports

* changed imports bec of lavis/windows

* fix if-else, added clip ViT-L-14=336 model

* fix code smells

* add model change function to summary

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* fixed new model in summary.py

* fixed summary windget

* moved some function to utils

* fixed imort torch in utils

* added test_summary.py

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* fixed opencv version

* added first test of multimodal_search.py

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* fixed test

* removed windows in CI and added test in multimodal search

* change lavis from dependencies from pip ro git

* fixed blip2 model in test_multimodal_search.py

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* fixed test multimodal search on cpu and gpu machines

* added test, fixed dependencies

* add -vv to pytest command in CI

* added test_multimodal_search tests

* fixed tests in test_multimodal_search.py

* fixed tests in test_summary

* changed CI and fixed test_multimodel search

* fixed ci

* fixed error in test multimodal search, changed ci

* added multimodal search test, added windows CI, added picture in test data

* CI debuging

* fixing tests in CI

* fixing test in CI 2

* fixing CI 3

* fixing CI

* added filtering function

* Brought back all tests after CI fixing

* changed CI one pytest by individual tests

* fixed opencv problem

* fix path for text, adjust result for new gcv

* remove opencv

* fixing cv2 error

* added opencv-contrib, change objects_cvlib

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* fixing tests in CI

* fixing CI testing

* cleanup objects

* fixing codecov in CI

* fixing codecov in CI

* run tests together; install opencv last

* update requirements for opencv dependencies

* moved lavis functions from utils to summary

* Remove lavis from utils.py

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* add missing jupyter

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: iulusoy <inga.ulusoy@uni-heidelberg.de>
2023-03-22 10:28:09 +01:00
Petr Andriushchenko
873844f380
fixed opencv error 2023-03-15 17:10:26 +01:00
Petr Andriushchenko
65dbf28eef
added new itm functionality 2023-03-15 16:04:43 +01:00
Petr Andriushchenko
65d916921b
changed CI one pytest by individual tests 2023-03-10 11:32:12 +01:00
Petr Andriushchenko
3dd120018c
Brought back all tests after CI fixing 2023-03-10 11:06:40 +01:00
Petr Andriushchenko
24ee78c23e
added filtering function 2023-03-09 15:45:06 +01:00
Petr Andriushchenko
2266df5919
fixing CI 2023-03-09 12:38:12 +01:00
Petr Andriushchenko
074cc5ba5d
fixing CI 3 2023-03-08 16:00:47 +01:00
Petr Andriushchenko
fd79f30ac9
fixing test in CI 2 2023-03-08 15:43:40 +01:00
Petr Andriushchenko
0c35486e8d
fixing tests in CI 2023-03-08 15:29:47 +01:00
Petr Andriushchenko
ea8476d56a
CI debuging 2023-03-08 15:15:36 +01:00
Petr Andriushchenko
0ddd671667
added multimodal search test, added windows CI, added picture in test data 2023-03-08 14:27:33 +01:00
Petr Andriushchenko
2d545d4abc fixed error in test multimodal search, changed ci 2023-03-07 14:30:48 +01:00
Petr Andriushchenko
905d3d75a3 fixed ci 2023-03-07 13:44:18 +01:00
Petr Andriushchenko
9f7264d1cf changed CI and fixed test_multimodel search 2023-03-07 13:30:06 +01:00
Petr Andriushchenko
949b4b2275 fixed tests in test_summary 2023-03-07 11:04:03 +01:00
Petr Andriushchenko
04592825e6 fixed tests in test_multimodal_search.py 2023-03-07 10:37:35 +01:00
Petr Andriushchenko
e12d50a195 added test_multimodal_search tests 2023-03-06 17:16:51 +01:00
Petr Andriushchenko
ce45a2c030 add -vv to pytest command in CI 2023-03-06 14:22:14 +01:00
Petr Andriushchenko
18ecf4888b added test, fixed dependencies 2023-03-03 16:26:26 +01:00
Petr Andriushchenko
b0cfab05e9 fixed test multimodal search on cpu and gpu machines 2023-03-02 15:37:30 +01:00
pre-commit-ci[bot]
ea275cdd09 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-03-02 12:23:37 +00:00
Petr Andriushchenko
37c6d1ad77 fixed blip2 model in test_multimodal_search.py 2023-03-02 13:23:15 +01:00
Petr Andriushchenko
d7133e8dc3 change lavis from dependencies from pip ro git 2023-03-02 10:15:46 +01:00