Skip to content

Commit 9fd42bd

Browse files
authored
Merge pull request #793 from henrykironde/PR777-new
Update docs to Panda's pydata_sphinx_theme
2 parents 151ac4d + 8231cbf commit 9fd42bd

Some content is hidden

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

65 files changed

+2043
-1168
lines changed

.github/workflows/Conda-app.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ jobs:
5252
- name: Check style
5353
run: yapf -d --recursive deepforest/ --style=.style.yapf
5454

55-
- name: Check notebook style
56-
run: nbqa yapf --in-place docs/examples/*.ipynb --style=.style.yapf
55+
- name: Check notebook style
56+
run: nbqa yapf --in-place docs/user_guide/examples/*.ipynb --style=.style.yapf
5757

5858
- name: Check notebook build
5959
run: pytest --nbmake docs/**/*_test.ipynb

.gitignore

+2-1
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,5 @@ public/
1919
tests/__pycache__
2020
tests/data/*
2121
.vscode/
22-
22+
*ipynb_checkpoints/
23+
docs/user_guide/deepforestr.md

AUTHORS.rst

+1-9
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,5 @@ Primary Authors
2121
Other Contributors
2222
==================
2323

24-
The incomplete list of individuals below have provided patches or otherwise
25-
contributed to the project.
2624
Check GitHub for recent `contributors <https://github.com/weecology/DeepForest/graphs/contributors>`_.
27-
We would like to thank everyone who has contributed to the project in any way.
28-
29-
* `Henry Senyondo <https://github.com/henrykironde>`_
30-
31-
* `Dingyi Fang <https://github.com/dingyif>`_
32-
33-
* `Shawn Taylor <https://github.com/sdtaylor>`_
25+
We would like to thank everyone who has contributed to the project in any way.

HISTORY.rst

+46-32
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,68 @@
1-
=====================
2-
DeepForest Change Log
3-
=====================
1+
====================
2+
DeepForest Changelog
3+
====================
44

5-
**1.3.5**
5+
Version 1.3.5 (Date: Mar 12, 2024)
6+
----------------------------------
67

7-
Add Support for multiple annotation types (point, box, polygon).
8-
Create a utilities.download_ArcGIS_REST function to download tiles from ArcGIS REST API. For example to download NAIP imagery.
8+
- **New Feature:** Added support for multiple annotation types including point, box, and polygon.
9+
- **New Utility:** Created ``utilities.download_ArcGIS_REST`` function to download tiles from the ArcGIS REST API (e.g., NAIP imagery).
910

10-
**1.3.3**
11+
Version 1.3.3 (Date: Mar 12, 2024)
12+
----------------------------------
1113

12-
* Allow for annotations_file to be none in split_raster, for use in data preprocessing.
14+
- **Enhancement:** ``split_raster`` now allows ``annotations_file`` to be ``None``, enabling flexibility during data preprocessing.
1315

14-
**1.3.0**
16+
Version 1.3.0 (Date: Dec 3, 2023)
17+
----------------------------------
1518

16-
* Removed IoU_Callback to better align with pytorch-lightning API, see https://github.com/Lightning-AI/pytorch-lightning/issues/19101
17-
* Refactored evaluate code to use pytorch-lightning evaluation loop directly to calculate results frame during training.
18-
* Refactored image_callbacks. Now uses predictions directly, you do not need to specify the root dir or csv file, since it assumed to be evaluation file.
19+
- **Deprecation:** Removed ``IoU_Callback`` for better alignment with the PyTorch Lightning API (see `issue <https://github.com/Lightning-AI/pytorch-lightning/issues/19101>`_).
20+
- **Refactor:** Evaluation code now leverages the PyTorch Lightning evaluation loop for result calculation during training.
21+
- **Refactor:** Simplified ``image_callbacks`` by using predictions directly. No need to specify the root directory or CSV file, as the evaluation file is assumed.
1922

20-
**1.1.3**
23+
Version 1.1.3 (Date: Nov 9, 2021)
24+
----------------------------------
2125

22-
Add box coordinates to evaluate results frame.
26+
- **Enhancement:** Added box coordinates to the evaluation results frame for better result tracking.
2327

24-
**1.1.2**
28+
Version 1.1.2 (Date: Sep 30, 2021)
29+
----------------------------------
2530

26-
If there was more than one class, the precision in the class_recall.csv was computed incorrectly.
31+
- **Bug Fix:** Fixed incorrect precision calculation in ``class_recall.csv`` when multiple classes were present.
2732

28-
**1.1.1**
33+
Version 1.1.1 (Date: Sep 14, 2021)
34+
----------------------------------
2935

30-
Update to project_boxes to include an output for predict_tile and predict_image, the function was split into two. annotations_to_shapefile reverses shapefile_to_annotations. Thanks to @sdtaylor for this contribution.
36+
- **Update:** ``project_boxes`` now includes output options for both ``predict_tile`` and ``predict_image``.
37+
- **New Feature:** Introduced ``annotations_to_shapefile``, which reverses ``shapefile_to_annotations`` functionality.
38+
Thanks to @sdtaylor for this contribution.
3139

32-
**1.1.0**
40+
Version 1.1.0 (Date: Aug 5, 2021)
41+
----------------------------------
3342

34-
1.
35-
Empty frames are now allowed by passing annotations with 0's for all coords. A single row for each blank image.
43+
1. **Enhancement:** Empty frames are now allowed by passing annotations with 0's for all coordinates. Example format:
44+
::
3645

37-
image_path, 0,0,0,0, "Tree"
46+
image_path, 0, 0, 0, 0, "Tree"
3847

39-
2.
40-
A check_release function was implemented to reduce github rate limit issues. on use_release(), the local model will be used if check_release = False
48+
2. **New Feature:** Introduced ``check_release`` to reduce GitHub rate limit issues. When using ``use_release()``, the local model will be used if ``check_release = False``.
4149

42-
**1.0.9**
50+
Version 1.0.9 (Date: Jul 14, 2021)
51+
----------------------------------
4352

44-
Minor update to improve windows users default dtype, thanks to @ElliotSalisbury
53+
- **Enhancement:** Improved default dtype for Windows users, thanks to @ElliotSalisbury for the contribution.
4554

46-
**1.0.0**
55+
Version 1.0.0 (Date: Jun 7, 2021)
56+
----------------------------------
4757

48-
Major update to replace tensorflow backend with pytorch.
58+
- **Major Update:** Transitioned from TensorFlow to a PyTorch backend, enhancing performance and flexibility.
4959

50-
**0.1.30**
51-
Bug fixes to allow learning rate monitoring and decay on val_classification_loss
60+
Version 0.1.34 (Date: )
61+
-----------------------
5262

53-
**0.1.34**
54-
Profiled the dataset and evaluation code for performance. Evaluation should be much faster now.
63+
- **Optimization:** Profiled dataset and evaluation code, significantly improving evaluation performance.
64+
65+
Version 0.1.30 (Date: )
66+
-----------------------
67+
68+
- **Bug Fix:** Resolved issues to allow learning rate monitoring and decay based on ``val_classification_loss``.

deepforest/model.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ def configure_optimizers(self):
246246
min_lr=0,
247247
eps=1e-08)
248248

249-
#Monitor rate is val data is used
249+
# Monitor rate is val data is used
250250
return {'optimizer': optimizer, 'lr_scheduler': scheduler, "monitor": 'val_loss'}
251251

252252
def dataset_confusion(self, loader):

dev_requirements.txt

+1
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ slidingwindow
3434
sphinx
3535
sphinx_markdown_tables
3636
sphinx_rtd_theme
37+
sphinx-design
3738
supervision
3839
tensorboard
3940
torch

docs/CONTRIBUTING.rst

-1
This file was deleted.

0 commit comments

Comments
 (0)