Skip to content

Commit 6a2d9a3

Browse files
committed
Improved logging
1 parent 3971ba9 commit 6a2d9a3

File tree

4 files changed

+16
-12
lines changed

4 files changed

+16
-12
lines changed

tests/setup_logging.py

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
import logging
22

33

4-
logging.basicConfig(
5-
level=logging.INFO,
6-
format='%(asctime)s %(module)s %(levelname)s: %(message)s',
7-
handlers=[
8-
logging.StreamHandler() # Logs to console
9-
]
10-
)
4+
def setup_logging():
5+
logging.basicConfig(
6+
level=logging.INFO,
7+
format='%(asctime)s %(module)s %(levelname)s: %(message)s',
8+
handlers=[
9+
logging.StreamHandler() # Logs to console
10+
]
11+
)

tests/test_bench_cover.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
from tdamapper.utils.vptree_flat import VPTree as FVPT
1111

1212
from tests.ball_tree import SkBallTree
13-
import tests.setup_logging
13+
from tests.setup_logging import setup_logging
1414

1515

1616
dist = euclidean()
@@ -25,6 +25,7 @@ def dataset(dim=10, num=1000):
2525

2626
class TestVpSettings(unittest.TestCase):
2727

28+
setup_logging()
2829
logger = logging.getLogger(__name__)
2930

3031
def cover(self, vpt, X, r):

tests/test_bench_metrics.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
import tdamapper.utils.metrics as metrics
1111

12-
import tests.setup_logging
12+
from tests.setup_logging import setup_logging
1313

1414

1515
@numba.njit(fastmath=True)
@@ -109,6 +109,7 @@ def run_bench(X):
109109

110110
class TestBenchMetrics(unittest.TestCase):
111111

112+
setup_logging()
112113
logger = logging.getLogger(__name__)
113114

114115
def test_bench(self):

tests/test_bench_vptree.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
from tdamapper.utils.vptree_flat import VPTree as FVPT
1111

1212
from tests.ball_tree import SkBallTree
13-
import tests.setup_logging
13+
from tests.setup_logging import setup_logging
1414

1515

1616
dist = euclidean()
@@ -25,12 +25,13 @@ def dataset(dim=10, num=1000):
2525

2626
class TestBenchmark(unittest.TestCase):
2727

28+
setup_logging()
29+
logger = logging.getLogger(__name__)
30+
2831
eps = 0.25
2932

3033
k = 5
3134

32-
logger = logging.getLogger(__name__)
33-
3435
def test_bench(self):
3536
self.logger.info('==== Dataset random =============')
3637
self._test_compare(dataset())

0 commit comments

Comments
 (0)