Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reimplement managed raster class in C++ #1597

Merged
merged 93 commits into from
Dec 12, 2024
Merged

Reimplement managed raster class in C++ #1597

Changes from 1 commit
Commits
Show all changes
93 commits
Select commit Hold shift + click to select a range
5e58f60
compare different implementations of upslope neighbors
emlys May 7, 2024
7c51c08
improve efficiency of managedraster helper functions
emlys Jun 15, 2024
a55d57c
work in progress: rewrite managed raster module in c++
emlys Jun 25, 2024
068d886
work in progress: managed raster in C++
emlys Jul 16, 2024
8576088
C++ managed raster implementation now faster on SDR sample data
emlys Jul 17, 2024
7f2ec80
Merge branch 'feature/routing-refactor' into feature/routing-refactor…
emlys Jul 17, 2024
11ef40f
NDR tests passing with new C++ implementation of managedraster
emlys Jul 18, 2024
c7486f2
all tests using managedraster passing locally
emlys Jul 23, 2024
048e769
debugging: find gdal.h
emlys Jul 23, 2024
cccf0e6
debugging: add incldue path to compile args for windows
emlys Jul 23, 2024
8d104a4
debugging
emlys Jul 23, 2024
6ca0f78
debugging'
emlys Jul 23, 2024
61d1f65
debugging
emlys Jul 23, 2024
d3aebac
debugging
emlys Jul 23, 2024
eb15fa1
debugging
emlys Jul 23, 2024
93ec4b9
debugging
emlys Jul 23, 2024
4506414
debugging
emlys Jul 23, 2024
1ff72b6
debugging
emlys Jul 23, 2024
6acaea6
debugging
emlys Jul 23, 2024
9316d20
use C++20; no need to compile managed_raster as a separate extension
emlys Jul 23, 2024
0d4805a
debugging
emlys Jul 23, 2024
53b15d0
debugging
emlys Jul 23, 2024
06c8648
debugging
emlys Jul 23, 2024
1749eb9
debugging
emlys Jul 23, 2024
e4c234f
debugging
emlys Jul 23, 2024
bbd7c5a
debugging
emlys Jul 23, 2024
7bc4b58
debugging
emlys Jul 23, 2024
efc5527
debugging
emlys Jul 23, 2024
474a89a
debugging
emlys Jul 23, 2024
a63532f
debugging
emlys Jul 23, 2024
05aa968
debugging
emlys Jul 23, 2024
81af8a3
debugging
emlys Jul 23, 2024
a0e5810
debugging
emlys Jul 23, 2024
d5bd998
use setuptools library_dirs parameter
emlys Jul 24, 2024
09a6f8e
debugging
emlys Jul 24, 2024
c669180
organizing options in setup.py
emlys Jul 24, 2024
61883f5
swy core: use libcpp.vector rather than allocating an array
emlys Jul 25, 2024
d236af1
swy core: use libcpp.vector rather than allocating an array
emlys Jul 25, 2024
7e12302
use std::string type to store raster path in ManagedRaster
emlys Jul 30, 2024
c664e43
Merge branch 'main' into feature/routing-refactor-compare
emlys Aug 9, 2024
baac039
Merge branch 'main' into feature/routing-refactor-compare
emlys Aug 22, 2024
8cf1e6b
Merge branch 'feature/routing-refactor' into feature/routing-refactor…
emlys Aug 22, 2024
5932fdb
remove extra changed files
emlys Aug 22, 2024
8fe87ec
clean upg
emlys Aug 22, 2024
d7d3b09
now slightly faster than implementation on main
emlys Aug 26, 2024
4e5e717
add library dir for gdal to setup.py
emlys Aug 26, 2024
5f6a647
typo
emlys Aug 26, 2024
8defb6f
another mistake
emlys Aug 26, 2024
6245b6a
add C++ errors for invalid arguments to managedraster
emlys Sep 3, 2024
364d7ff
Update src/natcap/invest/managed_raster/ManagedRaster.h
emlys Oct 15, 2024
386beb2
remove unneeded file
emlys Oct 15, 2024
7b994e2
remove unused enumeration
emlys Oct 15, 2024
f62a696
inline managedraster set and get functions
emlys Oct 15, 2024
8109a60
write C++ error messages out to error stream
emlys Oct 15, 2024
da23f3e
clean up lru_cache and actualBlockWidths in managedraster.close
emlys Oct 23, 2024
31565e8
inline is_close function
emlys Oct 24, 2024
8c31a12
use gdal-config to get library path on macos
emlys Oct 24, 2024
b88567c
separate C++ classes for each variant of neighbor pixel iteration
emlys Oct 24, 2024
36c26b2
drafting a true C++ iterator
emlys Oct 25, 2024
fc8dd38
implement true C++ iterator for downslope neighbors and use in SDR
emlys Oct 29, 2024
e6a370e
using downslope iterators everywhere
emlys Oct 29, 2024
2cf8f5d
use true iterators for upslope neighbors
emlys Oct 29, 2024
ba37a0a
Merge branch 'feature/routing-refactor' into feature/routing-refactor…
emlys Oct 29, 2024
b957881
debugging
emlys Oct 29, 2024
989a7b6
debugging
emlys Oct 29, 2024
b8e710f
cdef flow_dir_sum
emlys Oct 29, 2024
b532001
debugging
emlys Oct 29, 2024
9421e2c
debugging
emlys Oct 29, 2024
9981569
debugging
emlys Oct 29, 2024
6d556e2
debugging
emlys Oct 31, 2024
c7742e8
debugging
emlys Oct 31, 2024
7b9db1f
debugging
emlys Oct 31, 2024
9071362
debugging
emlys Oct 31, 2024
ba9cebe
debugging
emlys Oct 31, 2024
13cc0dc
debugging
emlys Oct 31, 2024
7a767f5
use const reference parameters to equality fns
emlys Oct 31, 2024
5b8c04e
inherit from Neighbors class
emlys Oct 31, 2024
947900c
inherit operator funcs
emlys Nov 1, 2024
f737225
inherit equality functions from parent class
emlys Nov 1, 2024
3a623eb
run all tests
emlys Nov 1, 2024
420145f
inherit increment operators from parent class
emlys Nov 1, 2024
dde78df
call base class constructors where possible
emlys Nov 1, 2024
11cc0ef
setup.py: use same options for linux as for mac
emlys Nov 5, 2024
25c954a
remove extra comments
emlys Nov 22, 2024
d50a2c9
downgrade compiler version to c++17
emlys Dec 9, 2024
3adae2d
read gdal lib path from env variable on windows
emlys Dec 10, 2024
24d1028
set NATCAP_INVEST_GDAL_LIB_PATH in github actions
emlys Dec 10, 2024
b3d2a55
bump c++ version back to 20
emlys Dec 10, 2024
45ec188
set NATCAP_INVEST_GDAL_LIB_PATH in one more place
emlys Dec 10, 2024
9b95796
temporarily pin pytest-subtests version
emlys Dec 10, 2024
3c9b795
Merge branch 'feature/routing-refactor' into feature/routing-refactor…
emlys Dec 10, 2024
07059b0
remove stdlib flag from compile command; default to libstdc++
emlys Dec 10, 2024
041cd1a
remove managed_raster pyx file
emlys Dec 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
run all tests
@emlys
emlys committed Nov 1, 2024
commit 3a623ebe1191170bf5724d3b2f958258665347c5
2 changes: 1 addition & 1 deletion Makefile
View file
Original file line number Diff line number Diff line change
@@ -155,7 +155,7 @@ $(BUILD_DIR) $(DATA_DIR) $(DIST_DIR) $(DIST_DATA_DIR):
$(MKDIR) $@

test: $(GIT_TEST_DATA_REPO_PATH)
$(TESTRUNNER) -s -k base_regression tests/test_ndr.py
$(TESTRUNNER) tests

validate_sampledata: $(GIT_SAMPLE_DATA_REPO_PATH)
$(TEST_DATAVALIDATOR)