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

Simple Progress Bar Inclusion #2334

Merged
merged 21 commits into from
Dec 22, 2023
Merged

Simple Progress Bar Inclusion #2334

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
d8bab78
progress bar development
GiulioZizzo Nov 3, 2023
7bed09d
revert check on dim for fit-generator and move to a separate PR
GiulioZizzo Nov 18, 2023
b3dec0f
update kwarg test to run with pb display
GiulioZizzo Nov 18, 2023
a32d798
run on CI pipeline
GiulioZizzo Nov 18, 2023
043752d
remove CI to run on feature branch
GiulioZizzo Nov 21, 2023
b71810a
Merge branch 'dev_1.17.0' into simple_pb_inclusion
beat-buesser Nov 30, 2023
6c1bc43
Merge branch 'dev_1.17.0' into simple_pb_inclusion
beat-buesser Dec 13, 2023
39ab9cd
change to verbose, and add support for tf1
GiulioZizzo Dec 14, 2023
5fb24d5
standardise verbose use across tools
GiulioZizzo Dec 14, 2023
2a3290a
mypy fixes
GiulioZizzo Dec 15, 2023
3c6458d
split verbosity processing into separate method.
GiulioZizzo Dec 18, 2023
cc441c9
split verbosity processing into separate method.
GiulioZizzo Dec 18, 2023
9c3f572
general inclusion of pylint: disable=W0221. Updates to randomized/der…
GiulioZizzo Dec 18, 2023
804af32
Better handling of int values for verbosity. Adding fit_gen to tests …
GiulioZizzo Dec 18, 2023
94cf59f
Update art/estimators/certification/derandomized_smoothing/pytorch.py
beat-buesser Dec 19, 2023
1f3026b
Apply suggestions from code review
beat-buesser Dec 19, 2023
a405f49
Merge branch 'dev_1.17.0' into simple_pb_inclusion
beat-buesser Dec 19, 2023
aa6a0ee
Apply suggestions from code review
beat-buesser Dec 20, 2023
56f7f4a
unifying art tools in verbose interface
GiulioZizzo Dec 20, 2023
63916b2
mypy fixes
GiulioZizzo Dec 20, 2023
b817b9c
mypy fixes
GiulioZizzo Dec 20, 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
Prev Previous commit
Next Next commit
split verbosity processing into separate method. 
Signed-off-by: GiulioZizzo <giulio.zizzo@yahoo.co.uk>
  • Loading branch information
@GiulioZizzo
GiulioZizzo committed Dec 18, 2023
commit cc441c9c47a17a4bed56d8b68b57a033e777f344
11 changes: 1 addition & 10 deletions art/estimators/certification/randomized_smoothing/pytorch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,16 +164,7 @@ class was initialised.
import torch
from torch.utils.data import TensorDataset, DataLoader

if verbose is not None:
if isinstance(verbose, int):
if verbose == 0:
display_pb = False
else:
display_pb = True
else:
display_pb = verbose
else:
display_pb = self.verbose
display_pb = self.process_verbose(verbose)

# Set model mode
self._model.train(mode=training_mode)
Expand Down
11 changes: 1 addition & 10 deletions art/estimators/certification/randomized_smoothing/tensorflow.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,16 +156,7 @@ class was initialised.
"""
import tensorflow as tf

if verbose is not None:
if isinstance(verbose, int):
if verbose == 0:
display_pb = False
else:
display_pb = True
else:
display_pb = verbose
else:
display_pb = self.verbose
display_pb = self.process_verbose(verbose)

if self._train_step is None: # pragma: no cover
if self._loss_object is None: # pragma: no cover
Expand Down
Loading