Skip to content
Merged
Show file tree
Hide file tree
Changes from 67 commits
Commits
Show all changes
69 commits
Select commit Hold shift + click to select a range
6f7ce55
wind turbine: compare new split vs old split performance
favyen2 Sep 26, 2024
c2ec853
try with 384x384 patches plus freeze the model for the first couple e…
favyen2 Sep 27, 2024
90b26fe
fix freezing code
favyen2 Sep 27, 2024
726ad8e
remove unused old config for wind turbine training
favyen2 Sep 30, 2024
9b0d4bb
add webmercator version of the wind turbine dataset
favyen2 Sep 30, 2024
91dd7f9
Add script to add the bounds metadata for layers using SingleImageRas…
favyen2 Sep 30, 2024
f03249c
update name for the 384x384 experiment
favyen2 Sep 30, 2024
036bf0b
Fix wind turbine webmercator training (labels were not being populated)
favyen2 Sep 30, 2024
d6f8b02
Use six Sentinel-2 images from diverse months of the year
uakfdotb Oct 16, 2024
8cc663a
Add marine infrastructure dataset config and model config.
favyen2 Oct 18, 2024
2b29949
add files needed by the model config for training
favyen2 Oct 18, 2024
82a9149
maybe close to same performance
favyen2 Oct 22, 2024
a5953a6
Merge remote-tracking branch 'origin/master' into favyen/turbine-2024…
favyen2 Oct 22, 2024
24e6093
json formatting
favyen2 Oct 22, 2024
cb04f2d
fix missing sections in config.json
favyen2 Oct 22, 2024
6a42948
Merge remote-tracking branch 'origin/master' into favyen/marine-infra
favyen2 Oct 23, 2024
91274c1
Add job launcher and prediction pipeline for Satlas applications.
favyen2 Oct 23, 2024
5249d27
Merge remote-tracking branch 'origin/master' into favyen/marine-infra
favyen2 Nov 6, 2024
ac8eb32
marine infra updates
favyen2 Nov 6, 2024
4fb0a69
gcp rtree index not working after august 2024 ...
favyen2 Nov 11, 2024
01deb1f
Merge remote-tracking branch 'origin/master' into favyen/marine-infra
favyen2 Dec 5, 2024
7fccfb3
latest changes
favyen2 Dec 5, 2024
f6bbc78
sync
favyen2 Dec 10, 2024
07565da
Merge remote-tracking branch 'origin/master' into favyen/marine-infra
favyen2 Dec 12, 2024
7085a2f
sync
favyen2 Dec 12, 2024
480473a
Merge branch 'favyen/turbine-20240926' into favyen/marine-infra
favyen2 Dec 12, 2024
cf57d21
sync
favyen2 Dec 19, 2024
c193308
remove unneeded marine infra model configs
favyen2 Dec 19, 2024
cba9484
clarify that convert_satlas_webmercator_to_rslearn is intended to be …
favyen2 Dec 19, 2024
9f94514
add readme for wind turbine configs
favyen2 Dec 19, 2024
0f1a7db
add readme for worker system
favyen2 Dec 19, 2024
31421ad
update readme
favyen2 Dec 19, 2024
cd07cfe
add azure configs
favyen2 Jan 7, 2025
f916d5c
upgrade solar farm ingestion
favyen2 Jan 9, 2025
463fa94
remove debug configs
favyen2 Jan 9, 2025
976def9
add documentation and test (wip)
favyen2 Jan 9, 2025
0bd47f5
fix test
favyen2 Jan 9, 2025
f8ee3ec
move convert_satlas_webmercator_to_rslean to one_off_porjects
favyen2 Jan 9, 2025
693f9a0
update readme
favyen2 Jan 9, 2025
522c210
Merge branch 'master' of github.com:allenai/rslearn_projects into fav…
favyen2 Jan 9, 2025
4d200c8
fix
favyen2 Jan 13, 2025
31576ab
fix
favyen2 Jan 14, 2025
298de6a
only start satlas jobs that weren't already completed
favyen2 Jan 17, 2025
3c9083c
enable satlas prediction pipeline to run on jupiter (using /data disk)
uakfdotb Jan 31, 2025
1efd544
add solar farm config
uakfdotb Jan 31, 2025
8be2dd9
Merge branch 'master' into favyen/marine-infra
favyen2 Feb 5, 2025
9a3d757
add documentation about viterbi smoothing step
favyen2 Feb 6, 2025
0d922d6
Merge branch 'favyen/marine-infra' of github.com:allenai/rslearn_proj…
favyen2 Feb 6, 2025
ec95814
add documentation
favyen2 Feb 6, 2025
ead3e22
remove unused launch_worker
favyen2 Feb 6, 2025
a71f3f6
add test for bkt
favyen2 Feb 7, 2025
1eb9d78
add test for rslp/common/worker.py
favyen2 Feb 7, 2025
c4af2a5
add doc string
favyen2 Feb 7, 2025
df45d4c
add tests
favyen2 Feb 7, 2025
731cd0c
add test for apply_nms
favyen2 Feb 7, 2025
98d0925
add merge_points test
favyen2 Feb 7, 2025
d7810bf
remove unused nms stuff
favyen2 Feb 7, 2025
fed1b51
fix test
favyen2 Feb 7, 2025
eeb63e4
add tests for smoothing
uakfdotb Feb 8, 2025
df3341d
refactor prediction pipeline
favyen2 Feb 10, 2025
9b86ca4
fix tests
favyen2 Feb 11, 2025
cbf1f1e
working tests
uakfdotb Feb 12, 2025
a4d4ebf
Merge remote-tracking branch 'origin/master' into favyen/marine-infra
favyen2 Feb 13, 2025
a56c3f5
fix broken Dockerfile (missing wget)
favyen2 Feb 18, 2025
b23985b
fix import for updated planetary computer data source
favyen2 Feb 18, 2025
436bc00
fix tests
favyen2 Feb 20, 2025
8c713ca
fix tests x2
favyen2 Feb 20, 2025
f73761d
don't run bkt test in ci since bigtable instance is expensive to keep…
favyen2 Feb 24, 2025
4a251f8
Merge remote-tracking branch 'origin/master' into favyen/marine-infra
favyen2 Feb 24, 2025
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
9 changes: 8 additions & 1 deletion .github/workflows/build_test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,14 @@ jobs:
-e GOOGLE_APPLICATION_CREDENTIALS=/tmp/gcp-credentials.json \
-e RSLP_BUCKET=rslearn-eai \
-e RSLP_PREFIX=gs://rslearn-eai \
test pytest tests/integration/ --ignore tests/integration_slow/ -vv
-e BKT_PROJECT_ID=earthsystem-dev-c3po \
-e BKT_BUCKET_NAME=rslp-tests \
-e BKT_BIGTABLE_PROJECT_ID=earthsystem-dev-c3po \
-e BKT_BIGTABLE_INSTANCE_ID=rslp-bigtable-test-instance \
-e TEST_PUBSUB_PROJECT=earthsystem-dev-c3po \
-e TEST_PUBSUB_TOPIC=rslearn_projects_test_topic \
-e TEST_PUBSUB_SUBSCRIPTION=rslearn_projects_test_subscription \
test pytest tests/integration/ -vv


- name: Clean up
Expand Down
10 changes: 9 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM pytorch/pytorch:2.5.0-cuda11.8-cudnn9-runtime@sha256:d15e9803095e462e351f097fb1f5e7cdaa4f5e855d7ff6d6f36ec4c2aa2938ea

RUN apt update
RUN apt install -y libpq-dev ffmpeg libsm6 libxext6 git
RUN apt install -y libpq-dev ffmpeg libsm6 libxext6 git wget

# Install rslearn.
# We use git clone and then git checkout instead of git clone -b so that the user could
Expand All @@ -27,4 +27,12 @@ ENV PYTHONPATH="${PYTHONPATH}:."
COPY . /opt/rslearn_projects/
# install rslp package
RUN pip install --no-cache-dir /opt/rslearn_projects

# Build Satlas smooth_point_labels_viterbi.go program.
WORKDIR /opt/rslearn_projects/rslp/satlas/scripts
RUN wget https://go.dev/dl/go1.22.12.linux-amd64.tar.gz
RUN rm -rf /usr/local/go && tar -C /usr/local -xzf go1.22.12.linux-amd64.tar.gz
ENV PATH="${PATH}:/usr/local/go/bin"
RUN go build smooth_point_labels_viterbi.go

WORKDIR /opt/rslearn_projects
17 changes: 4 additions & 13 deletions ai2_docs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,10 @@ rslearn datasets, model checkpoints, etc. The easiest way is to create a `.env`

RSLP_PREFIX=gs://rslearn-eai
RSLP_WEKA_PREFIX=weka://dfive-default/rslearn-eai
BKT_PROJECT_ID=ai2-prior-satlas
BKT_BUCKET_NAME=satlas-explorer-data
BKT_BIGTABLE_PROJECT_ID=ai2-prior-satlas
BKT_BIGTABLE_INSTANCE_ID=satlas

You will also need to setup GCP credentials that have access to this bucket.

Expand All @@ -42,19 +46,6 @@ launcher like `rslp.launch_beaker`, then it isn't needed since the credentials a
already configured as secrets on the platform, but you would need to setup your Beaker
or other platform credentials to be able to launch the jobs.

TODO: update GCP/W&B to use service accounts.

Currently, until https://github.com/allenai/rslearn/issues/33 is resolved, model config
files use S3-compatable API to access GCS rather than GCS directly. Therefore, you need
to set up environment variables to provide the appropriate credentials:

S3_ACCESS_KEY_ID=GOOG...
S3_SECRET_ACCESS_KEY=...

You can create these credentials at
https://console.cloud.google.com/storage/settings;tab=interoperability?hl=en&project=skylight-proto-1
under "Access keys for your user account".


Usage
-----
Expand Down
111 changes: 111 additions & 0 deletions data/satlas/marine_infra/config.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,111 @@
{
"layers": {
"label": {
"type": "vector"
},
"mask": {
"band_sets": [
{
"bands": [
"mask"
],
"dtype": "uint8",
"format": {
"format": "png",
"name": "single_image"
}
}
],
"type": "raster"
},
"output": {
"format": {
"coordinate_mode": "pixel",
"name": "geojson"
},
"type": "vector"
},
"sentinel2": {
"band_sets": [
{
"bands": [
"B02",
"B03",
"B04",
"B08"
],
"dtype": "uint16",
"format": {
"geotiff_options": {
"compress": "zstd",
"predictor": 2,
"zstd_level": 1
},
"name": "geotiff"
}
},
{
"bands": [
"B05",
"B06",
"B07",
"B8A",
"B11",
"B12"
],
"dtype": "uint16",
"format": {
"geotiff_options": {
"compress": "zstd",
"predictor": 2,
"zstd_level": 1
},
"name": "geotiff"
},
"zoom_offset": -1
},
{
"bands": [
"B01",
"B09",
"B10"
],
"dtype": "uint16",
"format": {
"geotiff_options": {
"compress": "zstd",
"predictor": 2,
"zstd_level": 1
},
"name": "geotiff"
},
"zoom_offset": -2
}
],
"data_source": {
"harmonize": true,
"index_cache_dir": "cache/sentinel2",
"max_cloud_cover": 50,
"max_time_delta": "0d",
"modality": "L1C",
"name": "rslp.satlas.data_sources.MonthlySentinel2",
"query_config": {
"max_matches": 4
},
"sort_by": "cloud_cover",
"use_rtree_index": false
},
"type": "raster"
}
},
"tile_store": {
"class_path": "rslearn.tile_stores.default.DefaultTileStore",
"init_args": {
"geotiff_options": {
"compress": "zstd",
"predictor": 2,
"zstd_level": 1
}
}
}
}
Loading
Loading