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

Jump to bottom

Merge master branch into develop branch #213

Merged
merged 11 commits into from
Feb 4, 2022
Merged

Merge master branch into develop branch #213

merged 11 commits into from
Feb 4, 2022

Conversation

passalis
Copy link
Collaborator

@passalis passalis commented Feb 3, 2022 •
edited
Loading

Synchronizes the develop branch with the latest changes from master.

ad-daniel and others added 9 commits January 3, 2022 20:27
@ad-daniel
Add automatic nightly sanity check (#192)
c50b133 
* Add automatic nightly check

* fix

* Add badge

* remove conditions

* Remove develop badge

* restore name
@ad-daniel
Fix nightly check (#193)
feccc9b 
* Fix nightly check

* fix test
@Pavlos-Tosidis @ad-daniel
upgrade scikit-learn to 0.22 (#198)
5cb4c3c 
* upgrade scikit-learn to 0.22

0.21.3 causes warnings with the current numpy version. Upgrading it fixes it.

* add changelog

Co-authored-by: ad-daniel <daniel.dias@epfl.ch>
@negarhdr @ad-daniel
bug fixed (#196)
49f7cd9 
Co-authored-by: Negar <negar.heidari@eng.au.dk>
Co-authored-by: ad-daniel <44834743+ad-daniel@users.noreply.github.com>
@ad-daniel
Fix copyright dates and double-check rights owner (action required) (#…
cc71138 
…199)

* Fix dates

* undo wrong change

* Fix Tampere
@ad-daniel @passalis
Automatic test of pip and docker (#200)
60d0757 
* Test pip installation

* Trigger

* Fix

* Minor

* Updated wheel test

* Added libopenblas install

* Temporary test disable

* Temporary test disable

* Added libsndfile1 dependency

* Restored disabled test

* New wheel building pipeline

* Update build_wheel.sh

* Added libboost-dev dep

* Update installation.md

* Switch to sdist

* sdist workflow

* Update tests_suite.yml

* Added numpy include dirs

* Disabled two 3d detection tests

* Disabled three 3d detection tests

* Disabled five 3d detection tests

* Disabled all 3d detection tests

* Disabled model download - 3d test

* Disabled everything?

* Removed imports from 3d object detection test

* Import test

* Import test

* Import test

* Import test

* Import test

* Import test

* Restored test

* Disabled object detection 3d test

* Refactor workflow

* disable temporarely

* Fix docker mobile manipulation

* Re-enable test

* add badge

* Fix changelog

* remove test install reference

* Restored pip installation

Co-authored-by: Nikolaos Passalis <passalis@users.noreply.github.com>
Co-authored-by: Nikolaos <passalis@csd.auth.gr>
@ad-daniel @passalis
Add automatic publishing of wheel and docker (#202)
d9f27c5 
* Test pip installation

* Trigger

* Fix

* Minor

* Updated wheel test

* Added libopenblas install

* Temporary test disable

* Temporary test disable

* Added libsndfile1 dependency

* Restored disabled test

* New wheel building pipeline

* Update build_wheel.sh

* Added libboost-dev dep

* Update installation.md

* Switch to sdist

* sdist workflow

* Update tests_suite.yml

* Added numpy include dirs

* Disabled two 3d detection tests

* Disabled three 3d detection tests

* Disabled five 3d detection tests

* Disabled all 3d detection tests

* Disabled model download - 3d test

* Disabled everything?

* Removed imports from 3d object detection test

* Import test

* Import test

* Import test

* Import test

* Import test

* Import test

* Restored test

* Disabled object detection 3d test

* Minimal

* Refactor workflow

* disable temporarely

* Fix docker mobile manipulation

* Re-enable test

* add badge

* Fix changelog

* remove test install reference

* test build process

* Fix

* version bump

* manual trigger

* Fix workflow

* Minor

* add cuda docker

* Minor

* Fix Token

* Publish wheel to testpypi

* Cleanup

* Specify version

* cleanup and check

* Fix

* Docker push test

* remove if

* Prepare for merge

* Fix pypi credentials

Co-authored-by: Nikolaos Passalis <passalis@users.noreply.github.com>
Co-authored-by: Nikolaos <passalis@csd.auth.gr>
@ad-daniel
Retry (#208)
a31d600
@passalis
Conflict resolution
9906541
@passalis passalis mentioned this pull request Feb 3, 2022
Closed
@passalis passalis added test release Tests if a wheel created from a branch runs correctly test sources Run style checks test tools Test the toolkit methods and removed test sources Run style checks test tools Test the toolkit methods labels Feb 3, 2022
ad-daniel
ad-daniel previously approved these changes Feb 3, 2022
View reviewed changes
Copy link
Collaborator

@ad-daniel ad-daniel left a comment

Choose a reason for hiding this comment

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

Thank you!

@ad-daniel
Copy link
Collaborator

Also, as a heads up, you might need to git remote prune origin every now and then. Since when we merge the branches are automatically deleted, the local one persists as a stale branch. Especially when synchronizing master and develop, the name of the branch is usually the same merge-X-into-Y, which without pruning might reference a closed branch. That command cleans your local directory

@ad-daniel
Copy link
Collaborator

Last message, might wanna wait for this #94 to be merged so it's included in the sync

ekakalet and others added 2 commits February 3, 2022 16:10
@ekakalet @ad-daniel @passalis
Synthetic multi view facial generator (#94)
3bb6bbd 
* Update readme.md

* Update readme.md

* Rename main.py to preprocessing_1.py

* Rename inference.py to preprocessing_2.py

* Update SyntheticDataGeneration.py

* Update SyntheticDataGeneration.py

* Update readme.md

* Delete bfm.ply

* Delete bfm_refine.ply

* Update readme.md

* Update SyntheticDataGeneration.py

* Update SyntheticDataGeneration.py

* Update testSyntheticDataGeneration.py

* Update SyntheticDataGeneration.py

* Update projects/data_generation/synthetic-multi-view-facial-image-generation/3ddfa/SyntheticDataGeneration.py

Co-authored-by: ad-daniel <44834743+ad-daniel@users.noreply.github.com>

* Update projects/data_generation/synthetic-multi-view-facial-image-generation/3ddfa/SyntheticDataGeneration.py

Co-authored-by: ad-daniel <44834743+ad-daniel@users.noreply.github.com>

* Update tests/test_license.py

Co-authored-by: ad-daniel <44834743+ad-daniel@users.noreply.github.com>

* Update SyntheticDataGeneration.py

* Update SyntheticDataGeneration.py

* Update testSyntheticDataGeneration.py

* Update projects/data_generation/synthetic-multi-view-facial-image-generation/README.md

Co-authored-by: ad-daniel <44834743+ad-daniel@users.noreply.github.com>

* Update projects/data_generation/synthetic-multi-view-facial-image-generation/README.md

Co-authored-by: ad-daniel <44834743+ad-daniel@users.noreply.github.com>

* Update projects/data_generation/synthetic-multi-view-facial-image-generation/README.md

Co-authored-by: ad-daniel <44834743+ad-daniel@users.noreply.github.com>

* Update README.md

* Update projects/data_generation/synthetic-multi-view-facial-image-generation/README.md

Co-authored-by: ad-daniel <44834743+ad-daniel@users.noreply.github.com>

* Update README.md

* ROS implementation

* Update README.md

* Update projects/data_generation/synthetic-multi-view-facial-image-generation/README.md

Co-authored-by: ad-daniel <44834743+ad-daniel@users.noreply.github.com>

* Create synthetic_facial_image_generator.md

* Update synthetic_facial_image_generator.md

* Update index.md

* Update testSyntheticDataGeneration.py

* Update SyntheticDataGeneration.py

* Update testSyntheticDataGeneration.py

* Update synthetic_facial_image_generator.md

* Update synthetic_facial_image_generator.md

* Rename projects/data_generation/synthetic-multi-view-facial-image-generation/3ddfa/SyntheticDataGeneration.py to projects/data_generation/synthetic-multi-view-facial-image-generation/algorithm/SyntheticDataGeneration.py

* Rename projects/data_generation/synthetic-multi-view-facial-image-generation/3ddfa/testSyntheticDataGeneration.py to projects/data_generation/synthetic-multi-view-facial-image-generation/algorithm/testSyntheticDataGeneration.py

* Update readme.md

* Delete readme.md

* Rename projects/data_generation/synthetic-multi-view-facial-image-generation/3ddfa/path_helper.py to projects/data_generation/synthetic-multi-view-facial-image-generation/algorithm/path_helper.py

* Rename projects/data_generation/synthetic-multi-view-facial-image-generation/3ddfa/path_helper2.py to projects/data_generation/synthetic-multi-view-facial-image-generation/algorithm/path_helper2.py

* Rename projects/data_generation/synthetic-multi-view-facial-image-generation/synthetic_facial_generation.py to projects/data_generation/synthetic-multi-view-facial-image-generation/algorithm/synthetic_facial_generation.py

* Update SyntheticDataGeneration.py

* Update testSyntheticDataGeneration.py

* Update testSyntheticDataGeneration.py

* Update testSyntheticDataGeneration.py

* Delete synthetic_facial_generation.py

* Delete path_helper2.py

* Delete path_helper.py

* Add files via upload

* Update synthetic_facial_generation.py

* Update synthetic_facial_generation.py

* Update synthetic_facial_generation.py

* Update SyntheticDataGeneration.py

* Update testSyntheticDataGeneration.py

* Update testSyntheticDataGeneration.py

* Update synthetic_facial_generation.py

* Update synthetic_facial_generation.py

* Update synthetic_facial_generation.py

* Update synthetic_facial_generation.py

* Update README.md

* Update README.md

* Update projects/data_generation/synthetic-multi-view-facial-image-generation/algorithm/SyntheticDataGeneration.py

Co-authored-by: ad-daniel <44834743+ad-daniel@users.noreply.github.com>

* Update projects/data_generation/synthetic-multi-view-facial-image-generation/algorithm/SyntheticDataGeneration.py

Co-authored-by: ad-daniel <44834743+ad-daniel@users.noreply.github.com>

* Update projects/data_generation/synthetic-multi-view-facial-image-generation/algorithm/SyntheticDataGeneration.py

Co-authored-by: ad-daniel <44834743+ad-daniel@users.noreply.github.com>

* Update projects/data_generation/synthetic-multi-view-facial-image-generation/algorithm/SyntheticDataGeneration.py

Co-authored-by: ad-daniel <44834743+ad-daniel@users.noreply.github.com>

* Update projects/data_generation/synthetic-multi-view-facial-image-generation/algorithm/SyntheticDataGeneration.py

Co-authored-by: ad-daniel <44834743+ad-daniel@users.noreply.github.com>

* new structure

* Delete projects/data_generation/synthetic-multi-view-facial-image-generation/3ddfa directory

* Delete projects/data_generation/synthetic-multi-view-facial-image-generation/data directory

* Delete projects/data_generation/synthetic-multi-view-facial-image-generation/experiments directory

* Delete projects/data_generation/synthetic-multi-view-facial-image-generation/misc directory

* Delete projects/data_generation/synthetic-multi-view-facial-image-generation/models directory

* Delete projects/data_generation/synthetic-multi-view-facial-image-generation/options directory

* Delete projects/data_generation/synthetic-multi-view-facial-image-generation/trainers directory

* Delete projects/data_generation/synthetic-multi-view-facial-image-generation/util directory

* Delete SyntheticDataGeneration.py

* Delete testSyntheticDataGeneration.py

* Delete __init__.py

* Delete test_frontal.py

* Delete test_multipose.py

* Delete train.py

* Delete LICENSE

* Update README.md

* Rename projects/data_generation/synthetic-multi-view-facial-image-generation/algorithm/SyntheticDataGeneration.py to projects/data_generation/synthetic-multi-view-facial-image-generation/SyntheticDataGeneration.py

* Rename projects/data_generation/synthetic-multi-view-facial-image-generation/algorithm/testSyntheticDataGeneration.py to projects/data_generation/synthetic-multi-view-facial-image-generation/testSyntheticDataGeneration.py

* Update tests_sources.yml

* Rename projects/data_generation/synthetic-multi-view-facial-image-generation/algorithm/__init__.py to projects/data_generation/synthetic-multi-view-facial-image-generation/__init__.py

* Update __init__.py

* Update __init__.py

* Update __init__.py

* Delete __init__.py

* Create __init__.py

* Update __init__.py

* Delete __init__.py

* Create __init__.py

* Delete __init__.py

* update

* Delete SyntheticDataGeneration.py

* Delete testSyntheticDataGeneration.py

* update for tests

* update for tests

* Update test_synthetic_facial_generation.py

* update

* Update test_synthetic_facial_generation.py

* Rename tests/sources/tools/data_generation/test_synthetic_facial_generation.py to tests/sources/tools/data_generation/synthetic-multi-view-facial-image-generation/test_synthetic_facial_generation.py

* update references

* Rename tests/sources/tools/data_generation/opendr_url.py to tests/sources/tools/data_generation/synthetic-multi-view-facial-generator/opendr_url.py

* Rename tests/sources/tools/data_generation/synthetic-multi-view-facial-generator/opendr_url.py to tests/sources/tools/data_generation/synthetic-multi-view-facial-generationopendr_url.py

* Rename tests/sources/tools/data_generation/synthetic-multi-view-facial-generationopendr_url.py to tests/sources/tools/data_generation/synthetic-multi-view-facial-generation/opendr_url.py

* Rename tests/sources/tools/data_generation/synthetic-multi-view-facial-generation/opendr_url.py to tests/sources/tools/data_generation/synthetic-mult-view-facial-image-generation/opendr_url.py

* Rename tests/sources/tools/data_generation/synthetic-mult-view-facial-image-generation/opendr_url.py to tests/sources/tools/data_generation/synthetic-multi-view-facial-image-generation/opendr_url.py

* Update opendr_url.py

* Update test_synthetic_facial_generation.py

* Update opendr_url.py

* Create 3ddfa_url.py

* Update and rename projects/data_generation/synthetic-multi-view-facial-image-generation/algorithm/3ddfa/3ddfa_url.py to projects/data_generation/3ddfa_url.py

* Update SyntheticDataGeneration.py

* Create test_multipose_url.py

* Update SyntheticDataGeneration.py

* Update 3ddfa_url.py

* Update test_multipose_url.py

* Update 3ddfa_url.py

* Update SyntheticDataGeneration.py

* Rename 3ddfa_url.py to help_url.py

* Update SyntheticDataGeneration.py

* Update help_url.py

* Update test_multipose_url.py

* Update test_multipose_url.py

* update

* Update and rename tests/sources/tools/data_generation/synthetic-multi-view-facial-image-generation/opendr_url.py to tests/sources/tools/data_generation/synthetic_multi_view_facial_image_generation/opendr_url.py

* Rename tests/sources/tools/data_generation/synthetic-multi-view-facial-image-generation/test_synthetic_facial_generation.py to tests/sources/tools/data_generation/synthetic_multi_view_facial_image_generation/test_synthetic_facial_generation.py

* rename

* updates

* update

* update

* Delete opendr_url.py

* Delete test_synthetic_facial_generation.py

* Rename tests/sources/tools/data_generation/test_synthetic_facial_generation.py to tests/sources/tools/data_generation/synthetic_multi_view_facial_image_generation/test_synthetic_facial_generation.py

* Rename tests/sources/tools/data_generation/__init__.py to tests/sources/tools/data_generation/synthetic_multi_view_facial_image_generation/__init__.py

* update test

* update

* Rename tests/sources/tools/data_generation/file_list.txt to tests/sources/tools/data_generation/synthetic_multi_view_facial_image_generation/file_list.txt

* Update __init__.py

* init

* Update tests_sources.yml

* Update tests_sources.yml

* update paths

* update

* update

* update

* Reorganize

* update

* update

* update

* update

* update tool

* Delete test_synthetic_facial_generation.py

* Delete file_list.txt

* Delete __init__.py

* Delete __init__.py

* Update tests_sources.yml

* update

* without pep errors

* reformat code

* Delete projects/data_generation/OLD directory

* Update SyntheticDataGeneration.py

* Update tool_synthetic_facial_generation.py

* Update render.py

* Update SyntheticDataGeneration.py

* Update SyntheticDataGeneration.py

* Update render.py

* Update render.py

* Update synthetic_facial_image_generator.md

* Update synthetic_facial_image_generator.md

* Update README.md

* Update README.md

* Delete __init__.py

* Delete __init__.py

* Update readme.md

* Update readme.md

* Delete realign_lmk

* Add files via upload

* Rename projects/data_generation/synthetic_multi_view_facial_image_generation/algorithm/DDFA/BFM_Remove_Neck/tri.mat to projects/data_generation/synthetic_multi_view_facial_image_generation/algorithm/DDFA/visualize/tri.mat

* Update readme.md

* Update README.md

* Delete tri.mat

* Add files via upload

* final updates

* installation and import fixes

* Bug fixes

* for execute in gpu_id 0

* resolve pep8 errors

* Update synthetic_facial_generation.py

* bug fixes

* Update docs/reference/index.md

Co-authored-by: ad-daniel <44834743+ad-daniel@users.noreply.github.com>

* Update docs/reference/synthetic_facial_image_generator.md

Co-authored-by: ad-daniel <44834743+ad-daniel@users.noreply.github.com>

* Update docs/reference/synthetic_facial_image_generator.md

Co-authored-by: ad-daniel <44834743+ad-daniel@users.noreply.github.com>

* Update docs/reference/synthetic_facial_image_generator.md

Co-authored-by: ad-daniel <44834743+ad-daniel@users.noreply.github.com>

* Update docs/reference/synthetic_facial_image_generator.md

Co-authored-by: ad-daniel <44834743+ad-daniel@users.noreply.github.com>

* Update docs/reference/synthetic_facial_image_generator.md

Co-authored-by: ad-daniel <44834743+ad-daniel@users.noreply.github.com>

* Update projects/data_generation/synthetic_multi_view_facial_image_generation/README.md

Co-authored-by: ad-daniel <44834743+ad-daniel@users.noreply.github.com>

* Update projects/data_generation/synthetic_multi_view_facial_image_generation/README.md

Co-authored-by: ad-daniel <44834743+ad-daniel@users.noreply.github.com>

* Update projects/data_generation/synthetic_multi_view_facial_image_generation/SyntheticDataGeneration.py

Co-authored-by: ad-daniel <44834743+ad-daniel@users.noreply.github.com>

* Update projects/data_generation/synthetic_multi_view_facial_image_generation/tool_synthetic_facial_generation.py

Co-authored-by: ad-daniel <44834743+ad-daniel@users.noreply.github.com>

* Update projects/data_generation/synthetic_multi_view_facial_image_generation/README.md

Co-authored-by: ad-daniel <44834743+ad-daniel@users.noreply.github.com>

* Update test_license.py

* Update test_license.py

* Update readme.md

* Update readme.md

* Delete projects/data_generation/synthetic_multi_view_facial_image_generation/algorithm/Rotate_and_Render/misc directory

* Delete projects/data_generation/synthetic_multi_view_facial_image_generation/algorithm/DDFA/train.configs directory

Co-authored-by: ad-daniel <44834743+ad-daniel@users.noreply.github.com>
Co-authored-by: ad-daniel <daniel.dias@epfl.ch>
Co-authored-by: Nikolaos Passalis <passalis@users.noreply.github.com>
Co-authored-by: Nikolaos <passalis@csd.auth.gr>
@passalis
Merge branch 'master' into merge-master-into-develop
a5c65a9
@passalis passalis added test sources Run style checks test tools Test the toolkit methods labels Feb 4, 2022
@passalis
Copy link
Collaborator Author

passalis commented Feb 4, 2022

I have included the latest master, so this is ready to be reviewed.

ad-daniel
ad-daniel approved these changes Feb 4, 2022
View reviewed changes
Copy link
Collaborator

@ad-daniel ad-daniel left a comment

Choose a reason for hiding this comment

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

Thank you!

Pavlos-Tosidis
Pavlos-Tosidis approved these changes Feb 4, 2022
View reviewed changes
Copy link
Collaborator

@Pavlos-Tosidis Pavlos-Tosidis left a comment

Choose a reason for hiding this comment

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

Seems fine

@passalis passalis merged commit a3c31c0 into develop Feb 4, 2022
@passalis passalis deleted the merge-master-into-develop branch February 4, 2022 17:21
lucamarchionni pushed a commit to lucamarchionni/opendr that referenced this pull request Jun 10, 2024
Merge pull request opendr-eu#213 from opendr-eu/merge-master-into-dev…
69a0f6e 
…elop

Merge `master` branch into `develop` branch
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ad-daniel ad-daniel ad-daniel approved these changes

@Pavlos-Tosidis Pavlos-Tosidis Pavlos-Tosidis approved these changes

@omichel omichel omichel approved these changes

Assignees
No one assigned
Labels
test release Tests if a wheel created from a branch runs correctly test sources Run style checks test tools Test the toolkit methods
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@passalis @ad-daniel @omichel @Pavlos-Tosidis @negarhdr @ekakalet