Skip to content

Commit c504a35

Browse files
author
Yurii Shevchuk
committed
updated version to 0.6.3 and changed table format
1 parent 3219512 commit c504a35

File tree

8 files changed

+23
-12
lines changed

8 files changed

+23
-12
lines changed

README.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
:align: center
1616

1717

18-
NeuPy v0.6.2
18+
NeuPy v0.6.3
1919
============
2020

2121
NeuPy is a Python library for Artificial Neural Networks. NeuPy supports many different types of Neural Networks from a simple perceptron to deep learning models.

neupy/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
NeuPy is a Python library for Artificial Neural Networks and Deep Learning.
33
"""
44

5-
__version__ = '0.6.2'
5+
__version__ = '0.6.3'

neupy/algorithms/gd/base.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ def apply_batches(function, arguments, batch_size, description='',
294294
else:
295295
bar.update(i)
296296

297-
bar.finish('\r' + ' ' * bar.term_width + '\r')
297+
bar.fd.write('\r' + ' ' * bar.term_width + '\r')
298298
return outputs
299299

300300

neupy/core/logs.py

+10
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
from contextlib import contextmanager
88

99
import tableprint
10+
from tableprint.style import STYLES, TableStyle, LineStyle
1011

1112
from .config import Configurable
1213
from .properties import BaseProperty
@@ -16,6 +17,15 @@
1617
__all__ = ('Verbose',)
1718

1819

20+
# Customized style
21+
STYLES['round'] = TableStyle(
22+
top=LineStyle('--', '-', '---', '--'),
23+
below_header=LineStyle('--', '-', '---', '--'),
24+
bottom=LineStyle('--', '-', '---', '--'),
25+
row=LineStyle('| ', '', ' | ', ' |'),
26+
)
27+
28+
1929
def terminal_echo(enabled, file_descriptor=sys.stdin):
2030
"""
2131
Enable/disable echo in the terminal.

site/pages/versions.rst

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ Old versions
55

66
<h3>Version 0.6</h3>
77

8+
<li>0.6.3 (February 2018) - <a href="/index.html">documentation [html]</a></li>
89
<li>0.6.2 (December 2017) - <a href="/index.html">documentation [html]</a></li>
910
<li>0.6.1 (November 2017) - <a href="/index.html">documentation [html]</a></li>
1011
<li>0.6.0 (September 2017) - <a href="/index.html">documentation [html]</a></li>

tests/algorithms/test_network_features.py

+7-7
Original file line numberDiff line numberDiff line change
@@ -243,13 +243,13 @@ def test_network_convergence(self):
243243

244244
def test_network_architecture_output(self):
245245
expected_architecture = textwrap.dedent("""
246-
╭───┬─────────────┬────────────┬──────────────╮
247-
# Input shape Layer type Output shape
248-
├───┼─────────────┼────────────┼──────────────┤
249-
1 2 Input 2
250-
2 2 Sigmoid 3
251-
3 3 Sigmoid 1
252-
╰───┴─────────────┴────────────┴──────────────╯
246+
-----------------------------------------------
247+
| # | Input shape | Layer type | Output shape |
248+
-----------------------------------------------
249+
| 1 | 2 | Input | 2 |
250+
| 2 | 2 | Sigmoid | 3 |
251+
| 3 | 3 | Sigmoid | 1 |
252+
-----------------------------------------------
253253
""").strip()
254254

255255
with catch_stdout() as out:

tests/core/test_logging.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ def test_nn_training(self):
128128
terminal_output = out.getvalue()
129129

130130
self.assertIn("Start training", terminal_output)
131-
self.assertIn("──────", terminal_output)
131+
self.assertIn("------", terminal_output)
132132
self.assertEqual(y_predicted.size, y_test.size)
133133

134134

tests/layers/connections/test_inline_connections.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ def test_inline_connections_after_exception(self):
197197
layers.Sigmoid(10)
198198
] > layers.Elementwise()
199199

200-
# Issue #181. Bug presented in NeuPy versions <= 0.6.2
200+
# Issue #181. Bug presented in NeuPy versions <= 0.6.3
201201
network = input_layer > layers.Softmax(5)
202202
self.assertEqual(network.input_shape, (2,))
203203
self.assertEqual(network.output_shape, (5,))

0 commit comments

Comments
 (0)