Skip to content

Commit 4688ffc

Browse files
7/27/21
1 parent 63c1408 commit 4688ffc

File tree

9 files changed

+485
-501
lines changed

9 files changed

+485
-501
lines changed

README.md

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,64 @@ More demonstration videos (older version of the program):
9999

100100
![Coast Train example 2](https://raw.githubusercontent.com/dbuscombe-usgs/dash_doodler/main/assets/logos/doodler-demo-2-9-21-short-coast2.gif)
101101

102+
<!--
103+
## Docker workflows
104+
105+
```
106+
sudo docker pull mardascience/dash_doodler:d1
107+
```
108+
109+
```
110+
sudo docker volume create doodler_data
111+
sudo docker run -p 8050:8050 mardascience/dash_doodler:d1
112+
sudo docker volume inspect doodler_data
113+
114+
sudo docker volume create --driver local -o o=bind -o type=none -o device="/home/marda/test" doodler_data
115+
116+
sudo docker run -d -p 8050:8050 --name doodler_container --mount source=doodler_data,target=/app mardascience/dash_doodler:d1
117+
sudo docker inspect doodler_container
118+
```
119+
120+
To build your own docker based on miniconda `continuumio/miniconda3`
121+
122+
123+
```
124+
cp install/Dockerfile.miniconda ./Dockerfile
125+
sudo docker build -t doodler_docker_image .
126+
```
127+
128+
then when it has finished building, check its size
129+
130+
```
131+
sudo docker image ls doodler_docker_image
132+
```
133+
134+
It is large - 4.8 GB. Run it:
135+
136+
```
137+
sudo docker run -p 8050:8050 -d -it --name www doodler_docker_image
138+
```
139+
140+
Build with pip instead:
141+
142+
```
143+
cp install/Dockerfile.pip ./Dockerfile
144+
sudo docker build -t doodler_docker_image_pip .
145+
```
146+
147+
How large is that?
148+
149+
```
150+
sudo docker image ls doodler_docker_image_pip
151+
```
152+
153+
To stop and remove:
154+
155+
```
156+
sudo docker stop www
157+
sudo docker rm www
158+
``` -->
159+
102160

103161
## <a name="ack"></a>Acknowledgements
104162

doodler.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -377,7 +377,7 @@ def shapes_seg_pair_as_dict(d, key, seg, remove_old=True):
377377
# Slider for specifying pen width
378378
dcc.Slider(
379379
id="crf-downsample-slider",
380-
min=2,
380+
min=1,
381381
max=6,
382382
step=1,
383383
value=DEFAULT_CRF_DOWNSAMPLE,
@@ -410,7 +410,7 @@ def shapes_seg_pair_as_dict(d, key, seg, remove_old=True):
410410
# Slider for specifying pen width
411411
dcc.Slider(
412412
id="rf-downsample-slider",
413-
min=2,
413+
min=1,
414414
max=20,
415415
step=1,
416416
value=DEFAULT_RF_DOWNSAMPLE,

install/Dockerfile.miniconda

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
#
2+
FROM continuumio/miniconda3
3+
LABEL maintainer "Doodler, by Dr Daniel Buscombe, Marda Science/USGS <dbuscombe@gmail.com>"
4+
WORKDIR /
5+
# The code to run when container is started:
6+
COPY ./ ./
7+
8+
COPY install/dashdoodler.yml .
9+
RUN conda env create -f dashdoodler.yml
10+
11+
# Make RUN commands use the new environment:
12+
SHELL ["conda", "run", "-n", "dashdoodler", "/bin/bash", "-c"]
13+
14+
EXPOSE 8050/tcp
15+
EXPOSE 8050/udp
16+
EXPOSE 80
17+
EXPOSE 8080
18+
19+
# set environment variables
20+
ENV PYTHONDONTWRITEBYTECODE 1
21+
ENV PYTHONUNBUFFERED 1
22+
23+
ENTRYPOINT ["conda", "run", "--no-capture-output", "-n", "dashdoodler", "python", "doodler.py"]

my_defaults.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
DEFAULT_PEN_WIDTH = 3
2-
DEFAULT_CRF_DOWNSAMPLE = 2
3-
DEFAULT_RF_DOWNSAMPLE = 2
2+
DEFAULT_CRF_DOWNSAMPLE = 1
3+
DEFAULT_RF_DOWNSAMPLE = 1
44
DEFAULT_CRF_THETA = 1
55
DEFAULT_CRF_MU = 1
66
DEFAULT_CRF_GTPROB = 0.9
317 Bytes
Binary file not shown.
13.1 KB
Binary file not shown.

utils/gen_npz_4_zoo.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,11 @@ def make_npz():
6868
data[k] = dat[k]
6969
del dat
7070

71-
classes = data['classes']
71+
try:
72+
classes = data['classes']
73+
except:
74+
classes = ['water', 'land']
75+
7276
class_string = '_'.join([c.strip() for c in classes])
7377

7478
savez_dict = dict()

0 commit comments

Comments
 (0)