Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 3c81ec9

Browse files
author
Laurent Thomas
committed
add pip ionstall matplotlib to tutorial notebooks
1 parent 9c9825a commit 3c81ec9

9 files changed

+257
-172
lines changed

‎CHANGELOG.md

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,27 @@ All notable changes to this project will be documented in this file.
33

44
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
55

6-
### [1.6.4] - 2023年03月03日
6+
7+
## [1.6.5] - 2023年06月12日
8+
9+
### Changed
10+
- Throw a clearer error message in place of OpenCV error message when template and/or image has 0-width or height
11+
- Add `pip install matplotlib` in example notebooks since not an actualy dependency of MTM
12+
13+
14+
## [1.6.4] - 2023年03月03日
715

816
### Changed
917
- Improve speed by adding concurrency in the findMatches method, using half the number of cpu cores available.
1018
- Mention installation in editable mode in README
1119

12-
### [1.6.3] - 2021年11月24日
20+
21+
## [1.6.3] - 2021年11月24日
1322

1423
### Changed
1524
- Updated internal NMS code to work with latest OpenCV, and set min OpenCV version to 4.5.4.
1625

26+
1727
## [1.6.2.post1] - 2021年11月24日
1828

1929
### Changed

‎MTM/version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
# 1) we don't load dependencies by storing it in __init__.py
33
# 2) we can import it in setup.py for the same reason
44
# 3) we can import it into your module module
5-
__version__ = '1.6.4'
5+
__version__ = '1.6.5'

‎tutorials/Benchmark.ipynb

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,22 @@
4141
}
4242
],
4343
"source": [
44-
"# Go to root folder of the repo\n",
44+
"# Set the root of the repo as the working directory, when running the notebook locally to load the package locally too\n",
45+
"# Not needed if the package was installed with pip\n",
4546
"%cd .."
4647
]
4748
},
49+
{
50+
"cell_type": "code",
51+
"execution_count": null,
52+
"metadata": {},
53+
"outputs": [],
54+
"source": [
55+
"# Install matplotlib if not already installed\n",
56+
"# it is used in this notebook, but is otherwise not an actual dependency of MTM\n",
57+
"%pip install matplotlib"
58+
]
59+
},
4860
{
4961
"cell_type": "code",
5062
"execution_count": 5,
@@ -766,7 +778,7 @@
766778
],
767779
"metadata": {
768780
"kernelspec": {
769-
"display_name": "Python 3",
781+
"display_name": "Python 3 (ipykernel)",
770782
"language": "python",
771783
"name": "python3"
772784
},
@@ -780,7 +792,7 @@
780792
"name": "python",
781793
"nbconvert_exporter": "python",
782794
"pygments_lexer": "ipython3",
783-
"version": "3.8.3"
795+
"version": "3.8.10"
784796
}
785797
},
786798
"nbformat": 4,

‎tutorials/InteractiveParameters.ipynb

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,22 @@
2222
}
2323
],
2424
"source": [
25-
"# If using local source code, set working directory to repo directory\n",
25+
"# Set the root of the repo as the working directory, when running the notebook locally to load the package locally too\n",
26+
"# Not needed if the package was installed with pip\n",
2627
"%cd .."
2728
]
2829
},
30+
{
31+
"cell_type": "code",
32+
"execution_count": null,
33+
"metadata": {},
34+
"outputs": [],
35+
"source": [
36+
"# Install matplotlib if not already installed\n",
37+
"# it is used in this notebook, but is otherwise not an actual dependency of MTM\n",
38+
"%pip install matplotlib"
39+
]
40+
},
2941
{
3042
"cell_type": "code",
3143
"execution_count": 2,
@@ -2646,7 +2658,7 @@
26462658
],
26472659
"metadata": {
26482660
"kernelspec": {
2649-
"display_name": "Python 3",
2661+
"display_name": "Python 3 (ipykernel)",
26502662
"language": "python",
26512663
"name": "python3"
26522664
},
@@ -2660,7 +2672,7 @@
26602672
"name": "python",
26612673
"nbconvert_exporter": "python",
26622674
"pygments_lexer": "ipython3",
2663-
"version": "3.8.3"
2675+
"version": "3.8.10"
26642676
}
26652677
},
26662678
"nbformat": 4,

‎tutorials/NoiseBenchmark.ipynb

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,17 @@
1010
"Only for the second detection we introduce some random noise in the image."
1111
]
1212
},
13+
{
14+
"cell_type": "code",
15+
"execution_count": null,
16+
"metadata": {},
17+
"outputs": [],
18+
"source": [
19+
"# Install matplotlib if not already installed\n",
20+
"# it is used in this notebook, but is otherwise not an actual dependency of MTM\n",
21+
"%pip install matplotlib"
22+
]
23+
},
1324
{
1425
"cell_type": "code",
1526
"execution_count": 1,
@@ -349,7 +360,7 @@
349360
],
350361
"metadata": {
351362
"kernelspec": {
352-
"display_name": "Python 3",
363+
"display_name": "Python 3 (ipykernel)",
353364
"language": "python",
354365
"name": "python3"
355366
},
@@ -363,7 +374,7 @@
363374
"name": "python",
364375
"nbconvert_exporter": "python",
365376
"pygments_lexer": "ipython3",
366-
"version": "3.6.6"
377+
"version": "3.8.10"
367378
}
368379
},
369380
"nbformat": 4,

‎tutorials/Tutorial1-Introduction.ipynb

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,25 @@
3838
"name": "stdout",
3939
"output_type": "stream",
4040
"text": [
41-
"C:\\Users\\LaurentThomas\\Documents\\repo-MTM-Python\n"
41+
"C:\\Users\\Laurent.Thomas\\Documents\\GitHub\\MultiTemplateMatching-Python\n"
4242
]
4343
}
4444
],
4545
"source": [
46-
"cd .."
46+
"# Set the root of the repo as the working directory, when running the notebook locally to load the package locally too\n",
47+
"# Not needed if the package was installed with pip\n",
48+
"%cd .."
49+
]
50+
},
51+
{
52+
"cell_type": "code",
53+
"execution_count": null,
54+
"metadata": {},
55+
"outputs": [],
56+
"source": [
57+
"# Install matplotlib if not already installed\n",
58+
"# it is used in this notebook, but is otherwise not an actual dependency of MTM\n",
59+
"%pip install matplotlib"
4760
]
4861
},
4962
{
@@ -55,7 +68,7 @@
5568
"name": "stdout",
5669
"output_type": "stream",
5770
"text": [
58-
"MTM version: 1.6.0\n"
71+
"MTM version: 1.6.4\n"
5972
]
6073
}
6174
],
@@ -601,7 +614,7 @@
601614
],
602615
"metadata": {
603616
"kernelspec": {
604-
"display_name": "Python 3",
617+
"display_name": "Python 3 (ipykernel)",
605618
"language": "python",
606619
"name": "python3"
607620
},
@@ -615,7 +628,7 @@
615628
"name": "python",
616629
"nbconvert_exporter": "python",
617630
"pygments_lexer": "ipython3",
618-
"version": "3.8.3"
631+
"version": "3.8.10"
619632
}
620633
},
621634
"nbformat": 4,

‎tutorials/Tutorial2-Template_Augmentation.ipynb

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,19 +29,32 @@
2929
},
3030
{
3131
"cell_type": "code",
32-
"execution_count": 4,
32+
"execution_count": 2,
3333
"metadata": {},
3434
"outputs": [
3535
{
3636
"name": "stdout",
3737
"output_type": "stream",
3838
"text": [
39-
"C:\\Users\\LaurentThomas\\Documents\n"
39+
"C:\\Users\\Laurent.Thomas\\Documents\\GitHub\\MultiTemplateMatching-Python\n"
4040
]
4141
}
4242
],
4343
"source": [
44-
"cd .."
44+
"# Set the root of the repo as the working directory, when running the notebook locally to load the package locally too\n",
45+
"# Not needed if the package was installed with pip\n",
46+
"%cd .."
47+
]
48+
},
49+
{
50+
"cell_type": "code",
51+
"execution_count": null,
52+
"metadata": {},
53+
"outputs": [],
54+
"source": [
55+
"# Install matplotlib if not already installed\n",
56+
"# it is used in this notebook, but is otherwise not an actual dependency of MTM\n",
57+
"%pip install matplotlib"
4558
]
4659
},
4760
{
@@ -484,7 +497,7 @@
484497
],
485498
"metadata": {
486499
"kernelspec": {
487-
"display_name": "Python 3",
500+
"display_name": "Python 3 (ipykernel)",
488501
"language": "python",
489502
"name": "python3"
490503
},
@@ -498,7 +511,7 @@
498511
"name": "python",
499512
"nbconvert_exporter": "python",
500513
"pygments_lexer": "ipython3",
501-
"version": "3.8.3"
514+
"version": "3.8.10"
502515
}
503516
},
504517
"nbformat": 4,

‎tutorials/Tutorial3-SpeedingUp.ipynb

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,20 @@
3636
}
3737
],
3838
"source": [
39-
"cd .."
39+
"# Set the root of the repo as the working directory, when running the notebook locally to load the package locally too\n",
40+
"# Not needed if the package was installed with pip\n",
41+
"%cd .."
42+
]
43+
},
44+
{
45+
"cell_type": "code",
46+
"execution_count": null,
47+
"metadata": {},
48+
"outputs": [],
49+
"source": [
50+
"# Install matplotlib if not already installed\n",
51+
"# it is used in this notebook, but is otherwise not an actual dependency of MTM\n",
52+
"%pip install matplotlib"
4053
]
4154
},
4255
{
@@ -703,7 +716,7 @@
703716
],
704717
"metadata": {
705718
"kernelspec": {
706-
"display_name": "Python 3",
719+
"display_name": "Python 3 (ipykernel)",
707720
"language": "python",
708721
"name": "python3"
709722
},
@@ -717,7 +730,7 @@
717730
"name": "python",
718731
"nbconvert_exporter": "python",
719732
"pygments_lexer": "ipython3",
720-
"version": "3.8.3"
733+
"version": "3.8.10"
721734
}
722735
},
723736
"nbformat": 4,

‎tutorials/WithMask.ipynb

Lines changed: 149 additions & 148 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /