Skip to content

Commit b0fca60

Browse files
authored
* do not include baseline in package * update to 1.1.1
1 parent 0e2da44 commit b0fca60

File tree

1,093 files changed

+108
-1137
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,093 files changed

+108
-1137
lines changed

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
![DeepOBS](docs/deepobs_banner.png "DeepOBS")
44

55
[![Documentation Status](https://readthedocs.org/projects/deepobs/badge/?version=latest)](https://deepobs.readthedocs.io/en/latest/?badge=latest)
6+
[![Build Status](https://travis-ci.com/fsschneider/deepobs.svg?branch=master)](https://travis-ci.com/username/projectname)
7+
[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
8+
69

710
**DeepOBS** is a benchmarking suite that drastically simplifies, automates and
811
improves the evaluation of deep learning optimizers.
@@ -39,10 +42,7 @@ as the data preprocessing scripts or the visualization features.
3942

4043
## Installation
4144

42-
pip install git+https://github.com/fsschneider/DeepOBS.git
43-
44-
Note, that the installation process can take a while as it will also
45-
automatically download all baseline results.
45+
pip install deepobs
4646

4747
We tested the package with Python 3.6 and TensorFlow version 1.12. Other
4848
versions of Python and TensorFlow (>= 1.4.0) might work, and we plan to expand

deepobs/analyzer/analyze_utils.py

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import matplotlib.pyplot as plt
66
from matplotlib2tikz import save as tikz_save
77
from matplotlib2tikz import get_tikz_code
8+
from .. import tensorflow
89

910

1011
class Analyzer:
@@ -108,10 +109,13 @@ def _get_conv_perf(self):
108109
float: Convergence performance for this test problem
109110
110111
"""
111-
with open(
112-
os.path.join(get_baseline_path(),
113-
"convergence_performance.json"), "r") as f:
114-
return json.load(f)[self.name]
112+
try:
113+
with open(os.path.join(tensorflow.config.get_baseline_dir(),
114+
"convergence_performance.json"), "r") as f:
115+
return json.load(f)[self.name]
116+
except IOError:
117+
print("Warning: Could not find a convergence performance file.")
118+
return 0.0
115119

116120

117121
class OptimizerAnalyzer:
@@ -993,14 +997,3 @@ def add_color_coding_tex(input):
993997
return "\cca{" + str(int(input)) + "}"
994998
else:
995999
return ""
996-
997-
998-
def get_baseline_path():
999-
"""Returns the path to the baseline results of DeepOBS.
1000-
1001-
Returns:
1002-
str: Path to the baselines of DeepOBS.
1003-
1004-
"""
1005-
this_dir, this_filename = os.path.split(__file__)
1006-
return os.path.join((os.path.dirname(this_dir)), "baselines/")

deepobs/baselines/cifar100_allcnnc/AdamOptimizer/num_epochs__350__batch_size__256__beta1__9.e-01__beta2__9.99e-01__epsilon__1.e-08__lr__1.5848931925e+00/random_seed__42__2019-02-13-18-27-50.json

Lines changed: 0 additions & 1 deletion
This file was deleted.

deepobs/baselines/cifar100_allcnnc/AdamOptimizer/num_epochs__350__batch_size__256__beta1__9.e-01__beta2__9.99e-01__epsilon__1.e-08__lr__1.5848931925e+01/random_seed__42__2019-02-14-02-43-25.json

Lines changed: 0 additions & 1 deletion
This file was deleted.

deepobs/baselines/cifar100_allcnnc/AdamOptimizer/num_epochs__350__batch_size__256__beta1__9.e-01__beta2__9.99e-01__epsilon__1.e-08__lr__1.5848931925e-01/random_seed__42__2019-02-13-18-19-21.json

Lines changed: 0 additions & 1 deletion
This file was deleted.

deepobs/baselines/cifar100_allcnnc/AdamOptimizer/num_epochs__350__batch_size__256__beta1__9.e-01__beta2__9.99e-01__epsilon__1.e-08__lr__1.5848931925e-02/random_seed__42__2019-02-13-18-14-49.json

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)