Merge pull request #467 from azavea/rde/feature/rename-and-reorg

Repository reorganization, renames
azavea · Oct 7, 2018 · f33a96d · f33a96d
2 parents 23fbf07 + deda464
commit f33a96d
Show file tree

Hide file tree

Showing 329 changed files with 143 additions and 140 deletions.
diff --git a/src/.flake8 → .flake8 b/src/.flake8 → .flake8
@@ -9,4 +9,4 @@ max-line-length = 90
 # W503: flake8 reports this as incorrect, and scripts/format_code
 # changes code to it, so let format_code win.
 
-ignore = E127,W503
+ignore = E127,W503
diff --git a/.gitignore b/.gitignore
@@ -105,7 +105,7 @@ deployment/ansible/*.retry
 .#*
 
 # Generated pb2 files
-src/rastervision/protos/**/*_pb2.py
+rastervision/protos/**/*_pb2.py
 
 # Vim
 .*.sw*

diff --git a/.travis/build b/.travis/build
@@ -3,8 +3,8 @@ set -e
 
 source .travis/env
 
-docker build -t ${CPU_IMAGE} -f src/Dockerfile-cpu src;
+docker build -t ${CPU_IMAGE} -f Dockerfile-cpu .;
 
 if [ "${1}" == "BUILD_ALL" ]; then
-   docker build -t ${GPU_IMAGE} -f src/Dockerfile-gpu src;
+   docker build -t ${GPU_IMAGE} -f Dockerfile-gpu .;
 fi
diff --git a/.travis/codecov b/.travis/codecov
@@ -1,4 +1,4 @@
 #!/bin/bash
 
-docker run -w $(pwd)/src -v $(pwd):$(pwd) --rm raster-vision-cpu coverage xml
-docker run -e CODECOV_TOKEN=$CODECOV_TOKEN -v $(pwd):$(pwd) --rm raster-vision-cpu codecov --root=$(pwd)/src --commit=$TRAVIS_COMMIT
+docker run -w $(pwd) -v $(pwd):$(pwd) --rm raster-vision-cpu coverage xml
+docker run -e CODECOV_TOKEN=$CODECOV_TOKEN -v $(pwd):$(pwd) --rm raster-vision-cpu codecov --root=$(pwd) --commit=$TRAVIS_COMMIT
diff --git a/.travis/test b/.travis/test
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-docker run -v $(pwd):$(pwd) --rm -it raster-vision-cpu rm -f $(pwd)/src/.coverage $(pwd)/src/coverage.xml
+docker run -v $(pwd):$(pwd) --rm -it raster-vision-cpu rm -f $(pwd)/.coverage $(pwd)/coverage.xml
 docker run --rm -it raster-vision-cpu /opt/src/scripts/style_tests && \
-docker run -w $(pwd)/src -v $(pwd):$(pwd) --rm -it raster-vision-cpu $(pwd)/src/scripts/compile && \
-docker run -w $(pwd)/src -v $(pwd):$(pwd) --rm -it raster-vision-cpu $(pwd)/src/scripts/unit_tests && \
-docker run -v $(pwd):$(pwd) --rm -it raster-vision-cpu $(pwd)/src/scripts/integration_tests
+docker run -w $(pwd) -v $(pwd):$(pwd) --rm -it raster-vision-cpu $(pwd)/scripts/compile && \
+docker run -w $(pwd) -v $(pwd):$(pwd) --rm -it raster-vision-cpu $(pwd)/scripts/unit_tests && \
+docker run -v $(pwd):$(pwd) --rm -it raster-vision-cpu $(pwd)/scripts/integration_tests
diff --git a/src/Dockerfile-cpu → Dockerfile-cpu b/src/Dockerfile-cpu → Dockerfile-cpu
diff --git a/src/Dockerfile-gpu → Dockerfile-gpu b/src/Dockerfile-gpu → Dockerfile-gpu
diff --git a/src/MANIFEST.in → MANIFEST.in b/src/MANIFEST.in → MANIFEST.in
diff --git a/scripts/update → docker/build b/scripts/update → docker/build
@@ -24,10 +24,10 @@ then
 
     if [ $# -eq 0 -o "${1:-}" = "--cpu" ]
     then
-        docker build -t raster-vision-cpu -f src/Dockerfile-cpu src
+        docker build -t raster-vision-cpu -f Dockerfile-cpu .
     fi
     if [ $# -eq 0 -o "${1:-}" = "--gpu" ]
     then
-        docker build -t raster-vision-gpu -f src/Dockerfile-gpu src
+        docker build -t raster-vision-gpu -f Dockerfile-gpu .
     fi
 fi
diff --git a/scripts/clean → docker/clean b/scripts/clean → docker/clean
@@ -17,6 +17,6 @@ if [ "${BASH_SOURCE[0]}" = "${0}" ]; then
     if [ "${1:-}" = "--help" ]; then
         usage
     else
-        docker images -qf dangling=true | xargs -r docker rmi
+        docker images -qf dangling=true | xargs docker rmi
     fi
 fi
diff --git a/scripts/run → docker/console b/scripts/run → docker/console
@@ -12,12 +12,11 @@ SOURCE="${BASH_SOURCE[0]}"
 while [ -h "$SOURCE" ] ; do SOURCE="$(readlink "$SOURCE")"; done
 SCRIPTS_DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
 PROJECT_ROOT="$( cd -P "$( dirname "$SCRIPTS_DIR" )" && pwd )"
-SRC="${PROJECT_ROOT}/src"
 
 function usage() {
     echo -n \
          "Usage: $(basename "$0")
-Run raster-vision image locally.
+Run a console in the raster-vision docker image locally.
 --aws forwards AWS credentials.
 --tensorboard maps port 6006
 --gpu use the NVIDIA runtime and GPU image
@@ -64,7 +63,7 @@ if [ "${BASH_SOURCE[0]}" = "${0}" ]
 then
     docker run ${RUNTIME} ${NAME} --rm -it ${TENSORBOARD} ${AWS} \
         -v ${HOME}/.rastervision:/root/.rastervision \
-        -v "$SRC":/opt/src \
+        -v "$PROJECT_ROOT":/opt/src \
         -v ${RASTER_VISION_DATA_DIR}:/opt/data \
         ${IMAGE} "${@:1}"
 fi
diff --git a/scripts/jupyter → docker/jupyter b/scripts/jupyter → docker/jupyter
@@ -10,7 +10,6 @@ SOURCE="${BASH_SOURCE[0]}"
 while [ -h "$SOURCE" ] ; do SOURCE="$(readlink "$SOURCE")"; done
 SCRIPTS_DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
 PROJECT_ROOT="$( cd -P "$( dirname "$SCRIPTS_DIR" )" && pwd )"
-SRC="$PROJECT_ROOT/src"
 
 function usage() {
     echo -n \
@@ -25,7 +24,7 @@ then
         docker run --rm -it \
                -e "AWS_PROFILE=$AWS_PROFILE" \
                -v "$HOME/.aws":/root/.aws:ro \
-               -v "$SRC":/opt/src \
+               -v "$PROJECT_ROOT":/opt/src \
                -v ${RASTER_VISION_DATA_DIR}:/opt/data \
                -v ${RASTER_VISION_NOTEBOOK_DIR}:/opt/notebooks \
                -p 8888:8888 \
@@ -40,7 +39,7 @@ then
         docker run --rm -it \
                -e "AWS_PROFILE=$AWS_PROFILE" \
                -v "$HOME/.aws":/root/.aws:ro \
-               -v "$SRC":/opt/src \
+               -v "$PROJECT_ROOT":/opt/src \
                -v ${RASTER_VISION_DATA_DIR}:/opt/data \
                -p 8888:8888 \
                raster-vision-cpu \

diff --git a/docs/conf.py b/docs/conf.py
@@ -76,7 +76,7 @@
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
 #
-html_theme = "sphinx_rtd_theme"
+html_theme = 'sphinx_rtd_theme'
 
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the

diff --git a/src/extras_requirements.json → extras_requirements.json b/src/extras_requirements.json → extras_requirements.json
diff --git a/src/integration_tests/__init__.py → integration_tests/__init__.py b/src/integration_tests/__init__.py → integration_tests/__init__.py
diff --git a/src/integration_tests/__main__.py → integration_tests/__main__.py b/src/integration_tests/__main__.py → integration_tests/__main__.py
diff --git a/...assification_tests/configs/backend.config → ...assification_tests/configs/backend.config b/...assification_tests/configs/backend.config → ...assification_tests/configs/backend.config
diff --git a/...ification_tests/expected-output/eval.json → ...ification_tests/expected-output/eval.json b/...ification_tests/expected-output/eval.json → ...ification_tests/expected-output/eval.json
diff --git a/...s/chip_classification_tests/experiment.py → ...s/chip_classification_tests/experiment.py b/...s/chip_classification_tests/experiment.py → ...s/chip_classification_tests/experiment.py
diff --git a/...sification_tests/scene/image-buffered.tif → ...sification_tests/scene/image-buffered.tif b/...sification_tests/scene/image-buffered.tif → ...sification_tests/scene/image-buffered.tif
diff --git a/...on_tests/scene/image-buffered.tif.aux.xml → ...on_tests/scene/image-buffered.tif.aux.xml b/...on_tests/scene/image-buffered.tif.aux.xml → ...on_tests/scene/image-buffered.tif.aux.xml
diff --git a/...chip_classification_tests/scene/image.tif → ...chip_classification_tests/scene/image.tif b/...chip_classification_tests/scene/image.tif → ...chip_classification_tests/scene/image.tif
diff --git a/...ssification_tests/scene/image.tif.aux.xml → ...ssification_tests/scene/image.tif.aux.xml b/...ssification_tests/scene/image.tif.aux.xml → ...ssification_tests/scene/image.tif.aux.xml
diff --git a/...ip_classification_tests/scene/labels.json → ...ip_classification_tests/scene/labels.json b/...ip_classification_tests/scene/labels.json → ...ip_classification_tests/scene/labels.json
diff --git a/src/integration_tests/integration_tests.py → integration_tests/integration_tests.py b/src/integration_tests/integration_tests.py → integration_tests/integration_tests.py
diff --git a/..._tests/object_detection_tests/__init__.py → ..._tests/object_detection_tests/__init__.py b/..._tests/object_detection_tests/__init__.py → ..._tests/object_detection_tests/__init__.py
diff --git a/...ct_detection_tests/configs/backend.config → ...ct_detection_tests/configs/backend.config b/...ct_detection_tests/configs/backend.config → ...ct_detection_tests/configs/backend.config
diff --git a/...detection_tests/expected-output/eval.json → ...detection_tests/expected-output/eval.json b/...detection_tests/expected-output/eval.json → ...detection_tests/expected-output/eval.json
diff --git a/...ests/object_detection_tests/experiment.py → ...ests/object_detection_tests/experiment.py b/...ests/object_detection_tests/experiment.py → ...ests/object_detection_tests/experiment.py
diff --git a/...ts/object_detection_tests/scene/image.tif → ...ts/object_detection_tests/scene/image.tif b/...ts/object_detection_tests/scene/image.tif → ...ts/object_detection_tests/scene/image.tif
diff --git a/.../object_detection_tests/scene/labels.json → .../object_detection_tests/scene/labels.json b/.../object_detection_tests/scene/labels.json → .../object_detection_tests/scene/labels.json
diff --git a/...s/semantic_segmentation_tests/__init__.py → ...s/semantic_segmentation_tests/__init__.py b/...s/semantic_segmentation_tests/__init__.py → ...s/semantic_segmentation_tests/__init__.py
diff --git a/...mentation_tests/expected-output/eval.json → ...mentation_tests/expected-output/eval.json b/...mentation_tests/expected-output/eval.json → ...mentation_tests/expected-output/eval.json
diff --git a/...semantic_segmentation_tests/experiment.py → ...semantic_segmentation_tests/experiment.py b/...semantic_segmentation_tests/experiment.py → ...semantic_segmentation_tests/experiment.py
diff --git a/...mantic_segmentation_tests/scene/image.tif → ...mantic_segmentation_tests/scene/image.tif b/...mantic_segmentation_tests/scene/image.tif → ...mantic_segmentation_tests/scene/image.tif
diff --git a/...antic_segmentation_tests/scene/labels.tif → ...antic_segmentation_tests/scene/labels.tif b/...antic_segmentation_tests/scene/labels.tif → ...antic_segmentation_tests/scene/labels.tif
diff --git a/src/integration_tests/util/__init__.py → integration_tests/util/__init__.py b/src/integration_tests/util/__init__.py → integration_tests/util/__init__.py
diff --git a/src/integration_tests/util/generate_scene.py → integration_tests/util/generate_scene.py b/src/integration_tests/util/generate_scene.py → integration_tests/util/generate_scene.py
diff --git a/src/rastervision/__init__.py → rastervision/__init__.py b/src/rastervision/__init__.py → rastervision/__init__.py
diff --git a/src/rastervision/__main__.py → rastervision/__main__.py b/src/rastervision/__main__.py → rastervision/__main__.py
diff --git a/src/rastervision/analyzer/__init__.py → rastervision/analyzer/__init__.py b/src/rastervision/analyzer/__init__.py → rastervision/analyzer/__init__.py
diff --git a/src/rastervision/analyzer/analyzer.py → rastervision/analyzer/analyzer.py b/src/rastervision/analyzer/analyzer.py → rastervision/analyzer/analyzer.py
diff --git a/src/rastervision/analyzer/analyzer_config.py → rastervision/analyzer/analyzer_config.py b/src/rastervision/analyzer/analyzer_config.py → rastervision/analyzer/analyzer_config.py
diff --git a/src/rastervision/analyzer/api.py → rastervision/analyzer/api.py b/src/rastervision/analyzer/api.py → rastervision/analyzer/api.py
diff --git a/src/rastervision/analyzer/stats_analyzer.py → rastervision/analyzer/stats_analyzer.py b/src/rastervision/analyzer/stats_analyzer.py → rastervision/analyzer/stats_analyzer.py
diff --git a/...rvision/analyzer/stats_analyzer_config.py → ...rvision/analyzer/stats_analyzer_config.py b/...rvision/analyzer/stats_analyzer_config.py → ...rvision/analyzer/stats_analyzer_config.py
@@ -44,7 +44,7 @@ def load_bundle_files(self, bundle_dir):
                    .with_stats_uri(local_stats_uri) \
                    .build()
 
-    def preprocess_command(self, command_type, experiment_config, context=[]):
+    def update_for_command(self, command_type, experiment_config, context=[]):
         conf = self
         io_def = rv.core.CommandIODefinition()
         if command_type == rv.ANALYZE:

diff --git a/src/rastervision/augmentor/__init__.py → rastervision/augmentor/__init__.py b/src/rastervision/augmentor/__init__.py → rastervision/augmentor/__init__.py
diff --git a/src/rastervision/augmentor/api.py → rastervision/augmentor/api.py b/src/rastervision/augmentor/api.py → rastervision/augmentor/api.py
diff --git a/src/rastervision/augmentor/augmentor.py → rastervision/augmentor/augmentor.py b/src/rastervision/augmentor/augmentor.py → rastervision/augmentor/augmentor.py
diff --git a/...astervision/augmentor/augmentor_config.py → rastervision/augmentor/augmentor_config.py b/...astervision/augmentor/augmentor_config.py → rastervision/augmentor/augmentor_config.py
@@ -29,7 +29,7 @@ def from_proto(msg):
                            .from_proto(msg) \
                            .build()
 
-    def preprocess_command(self, command_type, experiment_config, context=[]):
+    def update_for_command(self, command_type, experiment_config, context=[]):
         # Generally augmentors do not have an affect on the IO.
         return (self, rv.core.CommandIODefinition())
 

diff --git a/...astervision/augmentor/nodata_augmentor.py → rastervision/augmentor/nodata_augmentor.py b/...astervision/augmentor/nodata_augmentor.py → rastervision/augmentor/nodata_augmentor.py
diff --git a/...sion/augmentor/nodata_augmentor_config.py → ...sion/augmentor/nodata_augmentor_config.py b/...sion/augmentor/nodata_augmentor_config.py → ...sion/augmentor/nodata_augmentor_config.py
diff --git a/src/rastervision/backend/MANIFEST.in → rastervision/backend/MANIFEST.in b/src/rastervision/backend/MANIFEST.in → rastervision/backend/MANIFEST.in
diff --git a/src/rastervision/backend/__init__.py → rastervision/backend/__init__.py b/src/rastervision/backend/__init__.py → rastervision/backend/__init__.py
diff --git a/src/rastervision/backend/api.py → rastervision/backend/api.py b/src/rastervision/backend/api.py → rastervision/backend/api.py
diff --git a/src/rastervision/backend/backend.py → rastervision/backend/backend.py b/src/rastervision/backend/backend.py → rastervision/backend/backend.py
diff --git a/src/rastervision/backend/backend_config.py → rastervision/backend/backend_config.py b/src/rastervision/backend/backend_config.py → rastervision/backend/backend_config.py
@@ -38,7 +38,7 @@ def from_proto(msg):
                            .from_proto(msg) \
                            .build()
 
-    def preprocess_command(self, command_type, experiment_config,
+    def update_for_command(self, command_type, experiment_config,
                            context=None):
         io_def = CommandIODefinition()
         if command_type == rv.TRAIN:

diff --git a/.../backend/keras_classification/__init__.py → .../backend/keras_classification/__init__.py b/.../backend/keras_classification/__init__.py → .../backend/keras_classification/__init__.py
diff --git a/...n/backend/keras_classification/backend.py → ...n/backend/keras_classification/backend.py b/...n/backend/keras_classification/backend.py → ...n/backend/keras_classification/backend.py
diff --git a/...keras_classification/builders/__init__.py → ...keras_classification/builders/__init__.py b/...keras_classification/builders/__init__.py → ...keras_classification/builders/__init__.py
diff --git a/..._classification/builders/model_builder.py → ..._classification/builders/model_builder.py b/..._classification/builders/model_builder.py → ..._classification/builders/model_builder.py
diff --git a/...ssification/builders/optimizer_builder.py → ...ssification/builders/optimizer_builder.py b/...ssification/builders/optimizer_builder.py → ...ssification/builders/optimizer_builder.py
diff --git a/...lassification/builders/trainer_builder.py → ...lassification/builders/trainer_builder.py b/...lassification/builders/trainer_builder.py → ...lassification/builders/trainer_builder.py
diff --git a/...keras_classification/commands/__init__.py → ...keras_classification/commands/__init__.py b/...keras_classification/commands/__init__.py → ...keras_classification/commands/__init__.py
diff --git a/...nd/keras_classification/commands/train.py → ...nd/keras_classification/commands/train.py b/...nd/keras_classification/commands/train.py → ...nd/keras_classification/commands/train.py
diff --git a/...end/keras_classification/core/__init__.py → ...end/keras_classification/core/__init__.py b/...end/keras_classification/core/__init__.py → ...end/keras_classification/core/__init__.py
diff --git a/...kend/keras_classification/core/trainer.py → ...kend/keras_classification/core/trainer.py b/...kend/keras_classification/core/trainer.py → ...kend/keras_classification/core/trainer.py
diff --git a/...d/keras_classification/models/__init__.py → ...d/keras_classification/models/__init__.py b/...d/keras_classification/models/__init__.py → ...d/keras_classification/models/__init__.py
diff --git a/...d/keras_classification/models/resnet50.py → ...d/keras_classification/models/resnet50.py b/...d/keras_classification/models/resnet50.py → ...d/keras_classification/models/resnet50.py
diff --git a/...eras_classification/samples/pipeline.json → ...eras_classification/samples/pipeline.json b/...eras_classification/samples/pipeline.json → ...eras_classification/samples/pipeline.json
diff --git a/...ion/backend/keras_classification/utils.py → ...ion/backend/keras_classification/utils.py b/...ion/backend/keras_classification/utils.py → ...ion/backend/keras_classification/utils.py
diff --git a/...on/backend/keras_classification_config.py → ...on/backend/keras_classification_config.py b/...on/backend/keras_classification_config.py → ...on/backend/keras_classification_config.py
@@ -92,9 +92,9 @@ def load_bundle_files(self, bundle_dir):
                    .with_model_uri(local_model_uri) \
                    .build()
 
-    def preprocess_command(self, command_type, experiment_config,
+    def update_for_command(self, command_type, experiment_config,
                            context=None):
-        conf, io_def = super().preprocess_command(command_type,
+        conf, io_def = super().update_for_command(command_type,
                                                   experiment_config, context)
         if command_type == rv.CHIP:
             if not conf.training_data_uri:

diff --git a/src/rastervision/backend/model_defaults.json → rastervision/backend/model_defaults.json b/src/rastervision/backend/model_defaults.json → rastervision/backend/model_defaults.json
diff --git a/src/rastervision/backend/tf_deeplab.py → rastervision/backend/tf_deeplab.py b/src/rastervision/backend/tf_deeplab.py → rastervision/backend/tf_deeplab.py
diff --git a/...rastervision/backend/tf_deeplab_config.py → rastervision/backend/tf_deeplab_config.py b/...rastervision/backend/tf_deeplab_config.py → rastervision/backend/tf_deeplab_config.py
@@ -94,9 +94,9 @@ def to_proto(self):
 
         return msg
 
-    def preprocess_command(self, command_type, experiment_config,
+    def update_for_command(self, command_type, experiment_config,
                            context=None):
-        conf, io_def = super().preprocess_command(command_type,
+        conf, io_def = super().update_for_command(command_type,
                                                   experiment_config, context)
         if command_type == rv.CHIP:
             conf.training_data_uri = experiment_config.chip_uri

diff --git a/...stervision/backend/tf_object_detection.py → rastervision/backend/tf_object_detection.py b/...stervision/backend/tf_object_detection.py → rastervision/backend/tf_object_detection.py
diff --git a/...ion/backend/tf_object_detection_config.py → ...ion/backend/tf_object_detection_config.py b/...ion/backend/tf_object_detection_config.py → ...ion/backend/tf_object_detection_config.py
@@ -118,9 +118,9 @@ def load_bundle_files(self, bundle_dir):
                    .with_model_uri(local_model_uri) \
                    .build()
 
-    def preprocess_command(self, command_type, experiment_config,
+    def update_for_command(self, command_type, experiment_config,
                            context=None):
-        conf, io_def = super().preprocess_command(command_type,
+        conf, io_def = super().update_for_command(command_type,
                                                   experiment_config, context)
         if command_type == rv.CHIP:
             if not conf.training_data_uri:

diff --git a/src/rastervision/cli/__init__.py → rastervision/cli/__init__.py b/src/rastervision/cli/__init__.py → rastervision/cli/__init__.py
diff --git a/src/rastervision/cli/main.py → rastervision/cli/main.py b/src/rastervision/cli/main.py → rastervision/cli/main.py
diff --git a/src/rastervision/cli/verbosity.py → rastervision/cli/verbosity.py b/src/rastervision/cli/verbosity.py → rastervision/cli/verbosity.py
diff --git a/src/rastervision/command/__init__.py → rastervision/command/__init__.py b/src/rastervision/command/__init__.py → rastervision/command/__init__.py
diff --git a/src/rastervision/command/analyze_command.py → rastervision/command/analyze_command.py b/src/rastervision/command/analyze_command.py → rastervision/command/analyze_command.py
diff --git a/...rvision/command/analyze_command_config.py → ...rvision/command/analyze_command_config.py b/...rvision/command/analyze_command_config.py → ...rvision/command/analyze_command_config.py
diff --git a/src/rastervision/command/api.py → rastervision/command/api.py b/src/rastervision/command/api.py → rastervision/command/api.py
diff --git a/src/rastervision/command/bundle_command.py → rastervision/command/bundle_command.py b/src/rastervision/command/bundle_command.py → rastervision/command/bundle_command.py
diff --git a/...ervision/command/bundle_command_config.py → ...ervision/command/bundle_command_config.py b/...ervision/command/bundle_command_config.py → ...ervision/command/bundle_command_config.py
diff --git a/src/rastervision/command/chip_command.py → rastervision/command/chip_command.py b/src/rastervision/command/chip_command.py → rastervision/command/chip_command.py
diff --git a/...stervision/command/chip_command_config.py → rastervision/command/chip_command_config.py b/...stervision/command/chip_command_config.py → rastervision/command/chip_command_config.py
diff --git a/src/rastervision/command/command.py → rastervision/command/command.py b/src/rastervision/command/command.py → rastervision/command/command.py
diff --git a/src/rastervision/command/command_config.py → rastervision/command/command_config.py b/src/rastervision/command/command_config.py → rastervision/command/command_config.py
diff --git a/src/rastervision/command/eval_command.py → rastervision/command/eval_command.py b/src/rastervision/command/eval_command.py → rastervision/command/eval_command.py
diff --git a/...stervision/command/eval_command_config.py → rastervision/command/eval_command_config.py b/...stervision/command/eval_command_config.py → rastervision/command/eval_command_config.py
diff --git a/src/rastervision/command/predict_command.py → rastervision/command/predict_command.py b/src/rastervision/command/predict_command.py → rastervision/command/predict_command.py
diff --git a/...rvision/command/predict_command_config.py → ...rvision/command/predict_command_config.py b/...rvision/command/predict_command_config.py → ...rvision/command/predict_command_config.py
diff --git a/src/rastervision/command/train_command.py → rastervision/command/train_command.py b/src/rastervision/command/train_command.py → rastervision/command/train_command.py
diff --git a/...tervision/command/train_command_config.py → rastervision/command/train_command_config.py b/...tervision/command/train_command_config.py → rastervision/command/train_command_config.py
diff --git a/src/rastervision/core/__init__.py → rastervision/core/__init__.py b/src/rastervision/core/__init__.py → rastervision/core/__init__.py
diff --git a/src/rastervision/core/box.py → rastervision/core/box.py b/src/rastervision/core/box.py → rastervision/core/box.py
diff --git a/src/rastervision/core/class_map.py → rastervision/core/class_map.py b/src/rastervision/core/class_map.py → rastervision/core/class_map.py
diff --git a/...astervision/core/command_io_definition.py → rastervision/core/command_io_definition.py b/...astervision/core/command_io_definition.py → rastervision/core/command_io_definition.py
diff --git a/src/rastervision/core/config.py → rastervision/core/config.py b/src/rastervision/core/config.py → rastervision/core/config.py
@@ -22,7 +22,7 @@ def to_proto(self):
         pass
 
     @abstractmethod
-    def preprocess_command(self, command_type, experiment_config,
+    def update_for_command(self, command_type, experiment_config,
                            context=None):
         """Returns a copy of this config which may or may not have
            been modified based on the command needs and the experiment

diff --git a/src/rastervision/core/raster_stats.py → rastervision/core/raster_stats.py b/src/rastervision/core/raster_stats.py → rastervision/core/raster_stats.py
diff --git a/src/rastervision/core/training_data.py → rastervision/core/training_data.py b/src/rastervision/core/training_data.py → rastervision/core/training_data.py
diff --git a/src/rastervision/data/__init__.py → rastervision/data/__init__.py b/src/rastervision/data/__init__.py → rastervision/data/__init__.py
diff --git a/src/rastervision/data/api.py → rastervision/data/api.py b/src/rastervision/data/api.py → rastervision/data/api.py
diff --git a/...ervision/data/crs_transformer/__init__.py → ...ervision/data/crs_transformer/__init__.py b/...ervision/data/crs_transformer/__init__.py → ...ervision/data/crs_transformer/__init__.py
diff --git a/...n/data/crs_transformer/crs_transformer.py → ...n/data/crs_transformer/crs_transformer.py b/...n/data/crs_transformer/crs_transformer.py → ...n/data/crs_transformer/crs_transformer.py
diff --git a/...s_transformer/identity_crs_transformer.py → ...s_transformer/identity_crs_transformer.py b/...s_transformer/identity_crs_transformer.py → ...s_transformer/identity_crs_transformer.py
diff --git a/...s_transformer/rasterio_crs_transformer.py → ...s_transformer/rasterio_crs_transformer.py b/...s_transformer/rasterio_crs_transformer.py → ...s_transformer/rasterio_crs_transformer.py
diff --git a/src/rastervision/data/dataset.py → rastervision/data/dataset.py b/src/rastervision/data/dataset.py → rastervision/data/dataset.py
diff --git a/src/rastervision/data/dataset_config.py → rastervision/data/dataset_config.py b/src/rastervision/data/dataset_config.py → rastervision/data/dataset_config.py
@@ -82,14 +82,14 @@ def to_proto(self):
             test_scenes=test_scenes,
             augmentors=augmentors)
 
-    def preprocess_command(self, command_type, experiment_config,
+    def update_for_command(self, command_type, experiment_config,
                            context=None):
         io_def = rv.core.CommandIODefinition()
 
         if command_type in [rv.ANALYZE, rv.CHIP]:
             train_scenes = []
             for scene in self.train_scenes:
-                (new_config, scene_io_def) = scene.preprocess_command(
+                (new_config, scene_io_def) = scene.update_for_command(
                     command_type, experiment_config, context)
                 io_def.merge(scene_io_def)
                 train_scenes.append(new_config)
@@ -109,7 +109,7 @@ def preprocess_command(self, command_type, experiment_config,
                                      .with_task(experiment_config.task) \
                                      .with_label_store() \
                                      .build()
-                (new_config, scene_io_def) = scene.preprocess_command(
+                (new_config, scene_io_def) = scene.update_for_command(
                     command_type, experiment_config, context)
                 io_def.merge(scene_io_def)
                 val_scenes.append(new_config)
@@ -124,7 +124,7 @@ def preprocess_command(self, command_type, experiment_config,
                                      .with_task(experiment_config.task) \
                                      .with_label_store() \
                                      .build()
-                (new_config, scene_io_def) = scene.preprocess_command(
+                (new_config, scene_io_def) = scene.update_for_command(
                     command_type, experiment_config, context)
                 io_def.merge(scene_io_def)
                 test_scenes.append(new_config)
@@ -135,7 +135,7 @@ def preprocess_command(self, command_type, experiment_config,
         if command_type == rv.CHIP:
             augmentors = []
             for augmentor in self.augmentors:
-                (new_config, aug_io_def) = augmentor.preprocess_command(
+                (new_config, aug_io_def) = augmentor.update_for_command(
                     command_type, experiment_config, context)
                 io_def.merge(aug_io_def)
                 augmentors.append(new_config)

diff --git a/src/rastervision/data/label/__init__.py → rastervision/data/label/__init__.py b/src/rastervision/data/label/__init__.py → rastervision/data/label/__init__.py
diff --git a/.../data/label/chip_classification_labels.py → .../data/label/chip_classification_labels.py b/.../data/label/chip_classification_labels.py → .../data/label/chip_classification_labels.py
diff --git a/src/rastervision/data/label/labels.py → rastervision/data/label/labels.py b/src/rastervision/data/label/labels.py → rastervision/data/label/labels.py
diff --git a/...ion/data/label/object_detection_labels.py → ...ion/data/label/object_detection_labels.py b/...ion/data/label/object_detection_labels.py → ...ion/data/label/object_detection_labels.py
diff --git a/...ata/label/semantic_segmentation_labels.py → ...ata/label/semantic_segmentation_labels.py b/...ata/label/semantic_segmentation_labels.py → ...ata/label/semantic_segmentation_labels.py
diff --git a/...astervision/data/label_source/__init__.py → rastervision/data/label_source/__init__.py b/...astervision/data/label_source/__init__.py → rastervision/data/label_source/__init__.py
diff --git a/src/rastervision/data/label_source/api.py → rastervision/data/label_source/api.py b/src/rastervision/data/label_source/api.py → rastervision/data/label_source/api.py
diff --git a/...rce/chip_classification_geojson_source.py → ...rce/chip_classification_geojson_source.py b/...rce/chip_classification_geojson_source.py → ...rce/chip_classification_geojson_source.py
diff --git a/...p_classification_geojson_source_config.py → ...p_classification_geojson_source_config.py b/...p_classification_geojson_source_config.py → ...p_classification_geojson_source_config.py
@@ -51,7 +51,7 @@ def create_source(self, task_config, extent, crs_transformer, tmp_dir):
             self.pick_min_class_id, self.background_class_id, self.cell_size,
             self.infer_cells)
 
-    def preprocess_command(self, command_type, experiment_config, context=[]):
+    def update_for_command(self, command_type, experiment_config, context=[]):
         conf = self
         io_def = rv.core.CommandIODefinition()
         io_def.add_input(self.uri)

diff --git a/...rastervision/data/label_source/default.py → rastervision/data/label_source/default.py b/...rastervision/data/label_source/default.py → rastervision/data/label_source/default.py
@@ -4,7 +4,7 @@
 import rastervision as rv
 
 
-class DefaultLabelSourceProvider(ABC):
+class LabelSourceDefaultProvider(ABC):
     @staticmethod
     @abstractmethod
     def handles(task_type, s):
@@ -18,7 +18,7 @@ def construct(s):
         pass
 
 
-class DefaultObjectDetectionGeoJSONSourceProvider(DefaultLabelSourceProvider):
+class ObjectDetectionGeoJSONSourceDefaultProvider(LabelSourceDefaultProvider):
     @staticmethod
     def handles(task_type, uri):
         if task_type == rv.OBJECT_DETECTION:
@@ -33,8 +33,8 @@ def construct(uri):
                                    .build()
 
 
-class DefaultChipClassificationGeoJSONSourceProvider(
-        DefaultLabelSourceProvider):
+class ChipClassificationGeoJSONSourceDefaultProvider(
+        LabelSourceDefaultProvider):
     @staticmethod
     def handles(task_type, uri):
         if task_type == rv.CHIP_CLASSIFICATION:
@@ -49,8 +49,8 @@ def construct(uri):
                                    .build()
 
 
-class DefaultSemanticSegmentationRasterSourceProvider(
-        DefaultLabelSourceProvider):
+class SemanticSegmentationRasterSourceDefaultProvider(
+        LabelSourceDefaultProvider):
     @staticmethod
     def handles(task_type, uri):
         if task_type == rv.SEMANTIC_SEGMENTATION:

diff --git a/...rvision/data/label_source/label_source.py → ...rvision/data/label_source/label_source.py b/...rvision/data/label_source/label_source.py → ...rvision/data/label_source/label_source.py
diff --git a/.../data/label_source/label_source_config.py → .../data/label_source/label_source_config.py b/.../data/label_source/label_source_config.py → .../data/label_source/label_source_config.py
diff --git a/...source/object_detection_geojson_source.py → ...source/object_detection_geojson_source.py b/...source/object_detection_geojson_source.py → ...source/object_detection_geojson_source.py
diff --git a/...object_detection_geojson_source_config.py → ...object_detection_geojson_source_config.py b/...object_detection_geojson_source_config.py → ...object_detection_geojson_source_config.py
@@ -21,7 +21,7 @@ def create_source(self, task_config, extent, crs_transformer, tmp_dir):
         return ObjectDetectionGeoJSONSource(self.uri, crs_transformer,
                                             task_config.class_map, extent)
 
-    def preprocess_command(self, command_type, experiment_config, context=[]):
+    def update_for_command(self, command_type, experiment_config, context=[]):
         io_def = rv.core.CommandIODefinition()
         io_def.add_input(self.uri)
 

diff --git a/..._source/segmentation_class_transformer.py → ..._source/segmentation_class_transformer.py b/..._source/segmentation_class_transformer.py → ..._source/segmentation_class_transformer.py
diff --git a/...ce/semantic_segmentation_raster_source.py → ...ce/semantic_segmentation_raster_source.py b/...ce/semantic_segmentation_raster_source.py → ...ce/semantic_segmentation_raster_source.py
diff --git a/...ntic_segmentation_raster_source_config.py → ...ntic_segmentation_raster_source_config.py b/...ntic_segmentation_raster_source_config.py → ...ntic_segmentation_raster_source_config.py
@@ -31,15 +31,15 @@ def create_source(self, task_config, extent, crs_transformer, tmp_dir):
             self.source.create_source(tmp_dir, extent, crs_transformer),
             self.rgb_class_map)
 
-    def preprocess_command(self, command_type, experiment_config, context=[]):
+    def update_for_command(self, command_type, experiment_config, context=[]):
         if context is None:
             context = []
         context = context + [self]
         io_def = rv.core.CommandIODefinition()
 
         b = self.to_builder()
 
-        (new_raster_source, sub_io_def) = self.source.preprocess_command(
+        (new_raster_source, sub_io_def) = self.source.update_for_command(
             command_type, experiment_config, context)
 
         io_def.merge(sub_io_def)
@@ -87,7 +87,7 @@ def with_raster_source(self, source, channel_order=None):
         if isinstance(source, RasterSourceConfig):
             b.config['source'] = source
         elif isinstance(source, str):
-            provider = rv._registry.get_default_raster_source_provider(source)
+            provider = rv._registry.get_raster_source_default_provider(source)
             source = provider.construct(source, channel_order=channel_order)
             b.config['source'] = source
         else:

diff --git a/src/rastervision/data/label_source/utils.py → rastervision/data/label_source/utils.py b/src/rastervision/data/label_source/utils.py → rastervision/data/label_source/utils.py
diff --git a/...rastervision/data/label_store/__init__.py → rastervision/data/label_store/__init__.py b/...rastervision/data/label_store/__init__.py → rastervision/data/label_store/__init__.py
diff --git a/src/rastervision/data/label_store/api.py → rastervision/data/label_store/api.py b/src/rastervision/data/label_store/api.py → rastervision/data/label_store/api.py
diff --git a/...tore/chip_classification_geojson_store.py → ...tore/chip_classification_geojson_store.py b/...tore/chip_classification_geojson_store.py → ...tore/chip_classification_geojson_store.py
diff --git a/...ip_classification_geojson_store_config.py → ...ip_classification_geojson_store_config.py b/...ip_classification_geojson_store_config.py → ...ip_classification_geojson_store_config.py
@@ -26,7 +26,7 @@ def create_store(self, task_config, extent, crs_transformer, tmp_dir):
         return ChipClassificationGeoJSONStore(self.uri, crs_transformer,
                                               task_config.class_map)
 
-    def preprocess_command(self, command_type, experiment_config, context=[]):
+    def update_for_command(self, command_type, experiment_config, context=[]):
         conf = self
         io_def = rv.core.CommandIODefinition()
 

diff --git a/src/rastervision/data/label_store/default.py → rastervision/data/label_store/default.py b/src/rastervision/data/label_store/default.py → rastervision/data/label_store/default.py
@@ -4,7 +4,7 @@
 import rastervision as rv
 
 
-class DefaultLabelStoreProvider(ABC):
+class LabelStoreDefaultProvider(ABC):
     @staticmethod
     @abstractmethod
     def is_default_for(task_type):
@@ -24,7 +24,7 @@ def construct(s=None):
         pass
 
 
-class DefaultObjectDetectionGeoJSONStoreProvider(DefaultLabelStoreProvider):
+class ObjectDetectionGeoJSONStoreDefaultProvider(LabelStoreDefaultProvider):
     @staticmethod
     def is_default_for(task_type):
         return task_type == rv.OBJECT_DETECTION
@@ -45,7 +45,7 @@ def construct(uri=None):
         return b.build()
 
 
-class DefaultChipClassificationGeoJSONStoreProvider(DefaultLabelStoreProvider):
+class ChipClassificationGeoJSONStoreDefaultProvider(LabelStoreDefaultProvider):
     @staticmethod
     def is_default_for(task_type):
         return task_type == rv.CHIP_CLASSIFICATION
@@ -65,8 +65,8 @@ def construct(uri=None):
         return b.build()
 
 
-class DefaultSemanticSegmentationRasterStoreProvider(
-        DefaultLabelStoreProvider):
+class SemanticSegmentationRasterStoreDefaultProvider(
+        LabelStoreDefaultProvider):
     @staticmethod
     def is_default_for(task_type):
         return task_type == rv.SEMANTIC_SEGMENTATION

diff --git a/...tervision/data/label_store/label_store.py → rastervision/data/label_store/label_store.py b/...tervision/data/label_store/label_store.py → rastervision/data/label_store/label_store.py
diff --git a/...on/data/label_store/label_store_config.py → ...on/data/label_store/label_store_config.py b/...on/data/label_store/label_store_config.py → ...on/data/label_store/label_store_config.py
diff --git a/...l_store/object_detection_geojson_store.py → ...l_store/object_detection_geojson_store.py b/...l_store/object_detection_geojson_store.py → ...l_store/object_detection_geojson_store.py
diff --git a/.../object_detection_geojson_store_config.py → .../object_detection_geojson_store_config.py b/.../object_detection_geojson_store_config.py → .../object_detection_geojson_store_config.py
@@ -26,7 +26,7 @@ def create_store(self, task_config, extent, crs_transformer, tmp_dir):
         return ObjectDetectionGeoJSONStore(self.uri, crs_transformer,
                                            task_config.class_map)
 
-    def preprocess_command(self, command_type, experiment_config, context=[]):
+    def update_for_command(self, command_type, experiment_config, context=[]):
         conf = self
         io_def = rv.core.CommandIODefinition()
 

diff --git a/...ore/semantic_segmentation_raster_store.py → ...ore/semantic_segmentation_raster_store.py b/...ore/semantic_segmentation_raster_store.py → ...ore/semantic_segmentation_raster_store.py
diff --git a/...antic_segmentation_raster_store_config.py → ...antic_segmentation_raster_store_config.py b/...antic_segmentation_raster_store_config.py → ...antic_segmentation_raster_store_config.py
@@ -31,7 +31,7 @@ def create_store(self, task_config, extent, crs_transformer, tmp_dir):
         return SemanticSegmentationRasterStore(
             self.uri, extent, crs_transformer, tmp_dir, class_map=class_map)
 
-    def preprocess_command(self, command_type, experiment_config, context=[]):
+    def update_for_command(self, command_type, experiment_config, context=[]):
         conf = self
         io_def = rv.core.CommandIODefinition()
 

diff --git a/src/rastervision/data/label_store/utils.py → rastervision/data/label_store/utils.py b/src/rastervision/data/label_store/utils.py → rastervision/data/label_store/utils.py
diff --git a/...stervision/data/raster_source/__init__.py → rastervision/data/raster_source/__init__.py b/...stervision/data/raster_source/__init__.py → rastervision/data/raster_source/__init__.py
diff --git a/src/rastervision/data/raster_source/api.py → rastervision/data/raster_source/api.py b/src/rastervision/data/raster_source/api.py → rastervision/data/raster_source/api.py