diff --git a/Dockerfile b/Dockerfile index 23a4071edaa554ab608117eefc3f3c13f8b3dab5..db1c725c93352d57321147d97b55b2de9675a50e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -44,6 +44,4 @@ WORKDIR /app ENTRYPOINT ["/miniconda/bin/conda", "run", "-n", "pdal-env", "python", "/app/run_oracle_wrapper.py"] -# CMD ["--help" ] - diff --git a/config/config.yaml b/config/config.yaml index 3bba841b0edaadced1ad680241c8602771681a8e..f3ef2f2afaae46db6c76c6fd952c5761cb4e7c85 100644 --- a/config/config.yaml +++ b/config/config.yaml @@ -1,9 +1,9 @@ general: - input_folder: './local_input_folder' - output_folder: './local_output_folder' + input_folder: 'local_input_folder' + output_folder: 'local_output_folder' clean_output_folder: false run_sematic_segmentation: true - run_instance_segmentation: false + run_instance_segmentation: true label_formats: label_for_instances_in_gt: 'treeID' label_for_instances_in_predicted: 'instance_nr' @@ -13,7 +13,7 @@ semantic_segmentation_params: batch_size : 5 # batch size for inference tile_size: 10 # tile size in meters min_density: 100 # minimum density of points in a tile(used for removing small tiles) - remove_small_tiles: 1 # 1: remove small tiles, 0: not remove small tiles + remove_small_tiles: 0 # 1: remove small tiles, 0: not remove small tiles instance_segmentation_params: instance_segmentation_script: './run_bash_scripts/tls.sh' n_tiles: 3 diff --git a/d_run.sh b/d_run.sh new file mode 100644 index 0000000000000000000000000000000000000000..4feaeb67b9d6675d437e0a5b264600e97b6eaa83 --- /dev/null +++ b/d_run.sh @@ -0,0 +1,9 @@ + +docker container rm test_oracle +docker image rm nibio/pc-geoslam-oracle +./build.sh +echo "Running the container" +# docker run --gpus all --name test_oracle nibio/pc-geoslam-oracle +docker run -it --gpus all --name test_oracle nibio/pc-geoslam-oracle + + diff --git a/nibio_preprocessing/tiling.py b/nibio_preprocessing/tiling.py index b9186efb9966145e894970c46b057ea570b4d32a..f113426affdc0b825214f4fd856b5ece89f0d035 100644 --- a/nibio_preprocessing/tiling.py +++ b/nibio_preprocessing/tiling.py @@ -44,7 +44,9 @@ class Tiling: { "type":"filters.splitter", "length":str(self.tile_size), - "buffer":str(self.tile_buffer) + "buffer":str(self.tile_buffer), + "origin_x":"0.0", + "origin_y":"0.0" }, { "type":"writers.ply", diff --git a/requirements.txt b/requirements.txt index 9e761f979fd0727e61cbb3784f62c165ce705528..347f9ab5365df5006e3750b50d7661017fd907c9 100644 Binary files a/requirements.txt and b/requirements.txt differ diff --git a/run_bash_scripts/sem_seg_sean.sh b/run_bash_scripts/sem_seg_sean.sh index b431eaa8ead5e2bc8a0b0a5949be06526face3a1..3c598c55a607d8b41c0ecc95d5ae384cb548eecc 100755 --- a/run_bash_scripts/sem_seg_sean.sh +++ b/run_bash_scripts/sem_seg_sean.sh @@ -3,7 +3,7 @@ ############################ parameters ################################################# # General parameters CLEAR_INPUT_FOLDER=1 # 1: clear input folder, 0: not clear input folder -CONDA_ENV="pdal-env-1" # conda environment for running the pipeline +CONDA_ENV="pdal-env" # conda environment for running the pipeline # Parameters for the semetnic segmentation data_folder="" # path to the folder containing the data