Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
bob.fusion.base
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
bob
bob.fusion.base
Commits
113e6afc
Commit
113e6afc
authored
2 years ago
by
André MAYORAZ
Browse files
Options
Downloads
Patches
Plain Diff
Precommit updated configuration
parent
46190fdf
No related branches found
No related tags found
1 merge request
!17
Resolve "Switch to new CI/CD configuration"
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
.pre-commit-config.yaml
+5
-5
5 additions, 5 deletions
.pre-commit-config.yaml
src/bob/fusion/base/script/fuse.py
+3
-4
3 additions, 4 deletions
src/bob/fusion/base/script/fuse.py
src/bob/fusion/base/tools/plotting.py
+0
-1
0 additions, 1 deletion
src/bob/fusion/base/tools/plotting.py
with
8 additions
and
10 deletions
.pre-commit-config.yaml
+
5
−
5
View file @
113e6afc
...
@@ -2,20 +2,20 @@
...
@@ -2,20 +2,20 @@
# See https://pre-commit.com/hooks.html for more hooks
# See https://pre-commit.com/hooks.html for more hooks
repos
:
repos
:
-
repo
:
https://github.com/timothycrosley/isort
-
repo
:
https://github.com/timothycrosley/isort
rev
:
5.1
0.1
rev
:
5.1
2.0
hooks
:
hooks
:
-
id
:
isort
-
id
:
isort
args
:
[
--settings-path
,
"
pyproject.toml"
]
args
:
[
--settings-path
,
"
pyproject.toml"
]
-
repo
:
https://github.com/psf/black
-
repo
:
https://github.com/psf/black
rev
:
2
2.3
.0
rev
:
2
3.1
.0
hooks
:
hooks
:
-
id
:
black
-
id
:
black
-
repo
:
https://git
la
b.com/pycqa/flake8
-
repo
:
https://git
hu
b.com/pycqa/flake8
rev
:
3.9.2
rev
:
6.0.0
hooks
:
hooks
:
-
id
:
flake8
-
id
:
flake8
-
repo
:
https://github.com/pre-commit/pre-commit-hooks
-
repo
:
https://github.com/pre-commit/pre-commit-hooks
rev
:
v4.
2
.0
rev
:
v4.
4
.0
hooks
:
hooks
:
-
id
:
check-ast
-
id
:
check-ast
-
id
:
check-case-conflict
-
id
:
check-case-conflict
...
...
This diff is collapsed.
Click to expand it.
src/bob/fusion/base/script/fuse.py
+
3
−
4
View file @
113e6afc
...
@@ -33,7 +33,7 @@ def write_info(
...
@@ -33,7 +33,7 @@ def write_info(
model_file
,
model_file
,
skip_check
,
skip_check
,
force
,
force
,
**
kwargs
**
kwargs
,
):
):
info
=
"""
info
=
"""
scores: %s
scores: %s
...
@@ -95,7 +95,6 @@ def routine_fusion(
...
@@ -95,7 +95,6 @@ def routine_fusion(
min_file_size
=
1000
,
min_file_size
=
1000
,
do_training
=
True
,
do_training
=
True
,
):
):
# load the model if model_file exists and no training data was provided
# load the model if model_file exists and no training data was provided
if
os
.
path
.
exists
(
model_file
)
and
not
do_training
:
if
os
.
path
.
exists
(
model_file
)
and
not
do_training
:
logger
.
info
(
"
Loading the algorithm from %s
"
,
model_file
)
logger
.
info
(
"
Loading the algorithm from %s
"
,
model_file
)
...
@@ -240,7 +239,7 @@ def fuse(
...
@@ -240,7 +239,7 @@ def fuse(
model_file
,
model_file
,
skip_check
,
skip_check
,
force
,
force
,
**
kwargs
**
kwargs
,
):
):
"""
Score fusion
"""
Score fusion
...
@@ -288,7 +287,7 @@ def fuse(
...
@@ -288,7 +287,7 @@ def fuse(
model_file
,
model_file
,
skip_check
,
skip_check
,
force
,
force
,
**
kwargs
**
kwargs
,
)
)
"""
Do the actual fusion.
"""
"""
Do the actual fusion.
"""
...
...
This diff is collapsed.
Click to expand it.
src/bob/fusion/base/tools/plotting.py
+
0
−
1
View file @
113e6afc
...
@@ -8,7 +8,6 @@ from bob.learn.em import KMeansMachine
...
@@ -8,7 +8,6 @@ from bob.learn.em import KMeansMachine
def
grouping
(
scores
,
gformat
=
"
random
"
,
npoints
=
500
,
seed
=
None
,
**
kwargs
):
def
grouping
(
scores
,
gformat
=
"
random
"
,
npoints
=
500
,
seed
=
None
,
**
kwargs
):
scores
=
np
.
asarray
(
scores
)
scores
=
np
.
asarray
(
scores
)
if
scores
.
size
==
0
:
if
scores
.
size
==
0
:
return
scores
return
scores
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment