diff --git a/Dockerfile b/Dockerfile index 0701571e17608880c81f04ecd2b15609fd9337f1..ba260418fcf5faeb2876a4248f9c40b3850dea2a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,17 @@ ARG UBUNTU_VER=20.04 ARG CONDA_VER=latest ARG OS_TYPE=x86_64 -RUN apt-get update && apt-get install -y --no-install-recommends curl +RUN apt-get update && apt-get install -y --no-install-recommends \ + curl \ + sudo \ + libglib2.0-0 \ + libsm6 \ + libxext6 \ + libxrender-dev \ + libsndfile1 \ + libtiff5 \ + && rm -rf /var/lib/apt/lists/* + RUN curl -LO "http://repo.continuum.io/miniconda/Miniconda3-${CONDA_VER}-Linux-${OS_TYPE}.sh" && \ bash Miniconda3-${CONDA_VER}-Linux-${OS_TYPE}.sh -p /miniconda -b && \ @@ -20,17 +30,19 @@ SHELL ["/miniconda/bin/conda", "run", "-n", "pdal-env", "/bin/bash", "-c"] RUN echo "conda activate pdal-env" >> ~/.bashrc -RUN conda install -c conda-forge pdal python-pdal +RUN conda install -c conda-forge pdal==2.4.3 python-pdal==3.1.2 + +RUN pip install parse oci ocifs -COPY requirements.txt /app/requirements.txt -RUN pip install --no-cache -r /app/requirements.txt +COPY requirements.txt app/requirements.txt +RUN pip install --no-cache -r app/requirements.txt COPY . /app -ENTRYPOINT ["/miniconda/bin/conda", "run", "-n", "pdal-env", "python", "/app/run.py"] +# ENTRYPOINT ["/miniconda/bin/conda", "run", "-n", "pdal-env", "python", "/app/run_oracle_wrapper.py"] WORKDIR /app -CMD ["--help" ] +# CMD ["--help" ] diff --git a/build.sh b/build.sh index 0ba2e216fe3e6ccd575c2ed76c12e26a115b1ebc..21f3b5c7b14fb257695c7a1d5ac45eeaa41c0269 100755 --- a/build.sh +++ b/build.sh @@ -1,3 +1,3 @@ #/bin/sh -docker build -t nibio/cuda-vscode-conda:latest . +docker build -t nibio/pc-geoslam-oracle:latest . diff --git a/config/config.yaml b/config/config.yaml index fc9e44d3de6f0776dd5450698dc6d5626183b2a3..3992d3efd51935f39ecd225bb7006f0551e47957 100644 --- a/config/config.yaml +++ b/config/config.yaml @@ -3,7 +3,7 @@ general: output_folder: './maciek_results' clean_output_folder: true run_sematic_segmentation: true - run_instance_segmentation: true + run_instance_segmentation: false label_formats: label_for_instances_in_gt: 'treeID' label_for_instances_in_predicted: 'instance_nr'