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

Devel #13

Merged
merged 87 commits into from
Jun 4, 2021
Merged
Changes from 1 commit
Commits
Show all changes
87 commits
Select commit Hold shift + click to select a range
abdbaab
updated requirements.txt
chadhat Apr 16, 2021
7457cc8
update datetime import in behavior.py
chadhat Apr 28, 2021
7edc922
add imgaug installation from git
chadhat Apr 28, 2021
0377563
Update requirements.txt
chadhat Apr 28, 2021
ca4fa08
Update requirements.txt
chadhat Apr 28, 2021
ed4b064
update dataprep.py to remove scipy imresize to Image from Pillow
chadhat Apr 28, 2021
4938d03
Add dockerfile
chadhat Apr 28, 2021
f1b1afd
minor typo
chadhat Apr 28, 2021
fc2c428
updated requirements.txt
chadhat Apr 16, 2021
d482caa
add imgaug installation from git
chadhat Apr 28, 2021
d8ed178
Update requirements.txt
chadhat Apr 28, 2021
2e6222c
Update requirements.txt
chadhat Apr 28, 2021
fd319ae
Merge branch 'devel' of https://github.com/damaggu/SIPEC into devel
chadhat May 5, 2021
d959b59
update datetime import in behavior.py
chadhat Apr 28, 2021
b62c3a0
update dataprep.py to remove scipy imresize to Image from Pillow
chadhat Apr 28, 2021
bb56b12
Add dockerfile
chadhat Apr 28, 2021
07a3016
minor typo
chadhat Apr 28, 2021
7ea2f46
citing the repository where the code is taken from
chadhat May 5, 2021
3035e1d
There is no modification to this file from our side. So keeping only …
chadhat May 5, 2021
8895312
changes to make the script compatible with tf >= 2
chadhat May 5, 2021
db62909
update docker and requirements for tf2
chadhat May 6, 2021
cea117a
upadte docker
chadhat May 6, 2021
4e872e8
update requirements.txt
chadhat May 6, 2021
6fd3884
update requirements.txt
chadhat May 6, 2021
984d45a
updated requirements.txt
chadhat May 6, 2021
61e7ca1
updated requirements.txt
chadhat May 6, 2021
2180591
update requirements.txt
chadhat May 6, 2021
e9dff84
update requirements.txt
chadhat May 6, 2021
6c5dc4e
fix indentations
chadhat May 6, 2021
0a6788d
fix indentations
chadhat May 6, 2021
7d69096
fixing indents
chadhat May 6, 2021
450b4ef
KE -> KL
chadhat May 6, 2021
975a95b
update utils.py set_seed
chadhat May 6, 2021
920a020
further updates to run with tf2
chadhat May 7, 2021
0ef16d6
memory growth for all devices
chadhat May 7, 2021
1ab4999
gpu memory growth
chadhat May 7, 2021
491f3e2
revert to cuda 11.0.3
chadhat May 7, 2021
e188e45
sync old requirements from master
chadhat May 19, 2021
fff31b7
checking out classification_comparison.py and dataloader.py from main…
chadhat May 19, 2021
2201949
Merge branch 'devel' into env_update
chadhat May 19, 2021
84c70b5
Merge pull request #2 from damaggu/env_update
chadhat May 19, 2021
134b975
checkedout utils.py from mrcnn_to_tf2
chadhat May 19, 2021
c96288a
remove redundant code and updates for tf2 compatibility
chadhat May 19, 2021
34f7e5e
updates for compatibility with tf2
chadhat May 25, 2021
0e8582a
update paths
chadhat May 26, 2021
98af2f7
Merge branch 'devel' into mrcnn_to_tf2
chadhat May 26, 2021
0215b1f
Merge pull request #3 from damaggu/mrcnn_to_tf2
chadhat May 26, 2021
3fe8760
update checking out latest config and fix path in classification_comp…
chadhat May 26, 2021
7512232
minor updates
chadhat May 27, 2021
289afaa
utils.py to tf2
damaggu May 30, 2021
70830b6
architectures.py to TF2
damaggu May 30, 2021
fe4fd7d
classification_comparison.py to TF2
damaggu May 30, 2021
3e9e7ef
poseestimation.py to TF2
damaggu May 30, 2021
9ca01d0
slim requirement.txt for TF2
damaggu May 30, 2021
5b4e238
Merge branch 'classification_comparison_to_tf2' of https://github.com…
chadhat May 31, 2021
31728a6
typo fix
damaggu May 31, 2021
7aa7e04
poseestimation ported to tf2
chadhat May 31, 2021
89b5179
Merge branch 'classification_comparison_to_tf2' of https://github.com…
chadhat May 31, 2021
b4a2399
classification comparison to tf2
chadhat May 31, 2021
7a2d063
Merge branch 'devel' into classification_comparison_to_tf2
damaggu May 31, 2021
771fa5e
Merge pull request #6 from damaggu/classification_comparison_to_tf2
damaggu May 31, 2021
bffb854
cleaned requirements.txt
damaggu May 31, 2021
9ea4ba9
cleaned full_inference.py
damaggu May 31, 2021
f01f6d5
cleaned visualization.py
damaggu May 31, 2021
81d94f5
fomratting
damaggu May 31, 2021
6fdf869
behavior.py to tf2
chadhat May 31, 2021
63ab8f7
Update behavior.py
chadhat Jun 1, 2021
a1a0647
Merge branch 'devel' into update_to_tf2
damaggu Jun 1, 2021
570121e
Merge pull request #8 from damaggu/update_to_tf2
damaggu Jun 1, 2021
9346110
Merge pull request #10 from damaggu/cleaned_inference_and_vis_and_req…
chadhat Jun 2, 2021
845edbd
Merge pull request #11 from damaggu/update_to_tf2
chadhat Jun 2, 2021
b329619
checkout requirements with versions
chadhat Jun 2, 2021
a603beb
minor fixes
chadhat Jun 2, 2021
b5de7cb
minor updates
chadhat Jun 2, 2021
9290204
checking out requirements with versions
chadhat Jun 2, 2021
c2a0a59
update requirements
chadhat Jun 2, 2021
3ca9c2a
fix requirements
chadhat Jun 2, 2021
7c53423
full_inference and segmentation examples in the container
chadhat Jun 2, 2021
a264b3b
update git ignore
chadhat Jun 2, 2021
e7bba46
remove Dockerfile from repo
chadhat Jun 2, 2021
6289f0f
harmonising for single docker
chadhat Jun 3, 2021
b55191a
minor updates classification comparison
chadhat Jun 3, 2021
28aa55c
delete duplicate
chadhat Jun 4, 2021
23b307f
remove sipec folder
chadhat Jun 4, 2021
ee439a0
Merge branch 'devel' into update_to_tf2
chadhat Jun 4, 2021
a20ad1e
Merge pull request #12 from SIPEC-Animal-Data-Analysis/update_to_tf2
chadhat Jun 4, 2021
b30aebc
Merge branch 'main' into devel
chadhat Jun 4, 2021
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
Prev Previous commit
Next Next commit
There is no modification to this file from our side. So keeping only …
…the source citation
  • Loading branch information
chadhat committed May 5, 2021
commit 3035e1d483d72e450513ced92c5b09b629cb3d7d
14 changes: 8 additions & 6 deletions SwissKnife/mrcnn/config.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
# SIPEC: the deep-learning Swiss knife for behavioral data analysis
# https://github.com/damaggu/SIPEC
# Contact: Dr. Markus Marks, marksm@ethz.ch
# Mask RCNN
# The code in this file is taken from the Mask RCNN repository,
# https://github.com/matterport/Mask_RCNN, by Waleed Abdulla, (c) 2017 Matterport, Inc.
"""
Mask R-CNN
Base Configurations class.

Copyright (c) 2017 Matterport, Inc.
Licensed under the MIT License (see LICENSE for details)
Written by Waleed Abdulla
"""

import numpy as np

Expand Down