diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 2eaa313e0bc..3bde011b01e 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -46,12 +46,12 @@ jobs: python-version: 3.6 - name: Install dependencies run: | - ./util/scripts/install-deps-osx.sh skip-upgrade + ./util/install_deps_macos.sh skip-upgrade brew install ccache ccache -M 2G # GitHub's total cache limit is 5GB for all OSes. - name: Config and build run: | PATH=/usr/local/var/homebrew/linked/ccache/libexec:$PATH ccache -s - ./util/scripts/run-ci.sh + ./util/run_ci.sh ccache -s diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 51e670de66a..3bd96737600 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -49,12 +49,12 @@ jobs: # Pre-installed 18.04 packages: https://git.io/JfHmW - name: Install dependencies run: | - ./util/scripts/install-deps-ubuntu.sh assume-yes + ./util/install_deps_ubuntu.sh assume-yes sudo apt-get --yes install ccache ccache -M 2G # GitHub's total cache limit is 5GB for all OSes. - name: Config and build run: | PATH=/usr/lib/ccache:$PATH ccache -s - ./util/scripts/run-ci.sh + ./util/run_ci.sh ccache -s diff --git a/.travis.yml b/.travis.yml index ccc1ff54d14..389b4422d58 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,7 +30,7 @@ matrix: - clang-7 - clang-format-5.0 install: - - ./util/scripts/install-deps-ubuntu.sh assume-yes + - ./util/install_deps_ubuntu.sh assume-yes script: - mkdir build - cd build @@ -58,7 +58,7 @@ matrix: - libosmesa6-dev install: # Install ubuntu dependencies - - ./util/scripts/install-deps-ubuntu.sh assume-yes + - ./util/install_deps_ubuntu.sh assume-yes # Install Kinect k4a package - curl https://packages.microsoft.com/keys/microsoft.asc | sudo apt-key add - - sudo apt-add-repository --yes https://packages.microsoft.com/ubuntu/18.04/prod @@ -95,13 +95,5 @@ matrix: - bin/GLInfo - python -c "from open3d import *; import open3d; print(open3d)" - cd .. # Back to Open3D/ - - ./util/scripts/make-documentation.sh + - ./util/make_documentation.sh - ./.travis/deploy_docs.sh - - # - env: DOCKER=YES UBUNTU=16.04 BUNDLE=deps ENV=py3 LINK=STATIC - # script: ./util/docker/open3d-test/tools/test.sh $UBUNTU $BUNDLE $ENV $LINK - # install: sudo apt-get update && sudo apt-get install -y realpath - - # - env: DOCKER=YES UBUNTU=16.04 BUNDLE=deps ENV=py3 LINK=SHARED - # script: ./util/docker/open3d-test/tools/test.sh $UBUNTU $BUNDLE $ENV $LINK - # install: sudo apt-get update && sudo apt-get install -y realpath diff --git a/CMakeLists.txt b/CMakeLists.txt index 92b01befa6e..aec7ba44dfd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -362,14 +362,14 @@ export(EXPORT ${PROJECT_NAME}Targets NAMESPACE ${PROJECT_NAME}::) # `make check-style` checks style for c++/cuda/python/ipynb files add_custom_target(check-style COMMAND ${PYTHON_EXECUTABLE} - ${CMAKE_CURRENT_SOURCE_DIR}/util/scripts/check_style.py + ${CMAKE_CURRENT_SOURCE_DIR}/util/check_style.py COMMENT "Python executable used for style check: ${PYTHON_EXECUTABLE}." ) # `make apply-style` applies style for c++/cuda/python/ipynb files add_custom_target(apply-style COMMAND ${PYTHON_EXECUTABLE} - ${CMAKE_CURRENT_SOURCE_DIR}/util/scripts/check_style.py --do_apply_style + ${CMAKE_CURRENT_SOURCE_DIR}/util/check_style.py --do_apply_style COMMENT "Python executable used for style check: ${PYTHON_EXECUTABLE}." ) @@ -379,7 +379,7 @@ add_custom_target(check-cpp-style COMMAND ${CMAKE_COMMAND} -DPROJECT_SOURCE_DIR="${PROJECT_SOURCE_DIR}" -DDO_APPLY_STYLE=OFF - -P ${CMAKE_CURRENT_SOURCE_DIR}/util/scripts/check_cpp_style.cmake + -P ${CMAKE_CURRENT_SOURCE_DIR}/util/check_cpp_style.cmake ) # `make apply-cpp-style` applies style for c++/cuda files. @@ -388,7 +388,7 @@ add_custom_target(apply-cpp-style COMMAND ${CMAKE_COMMAND} -DPROJECT_SOURCE_DIR="${PROJECT_SOURCE_DIR}" -DDO_APPLY_STYLE=ON - -P ${CMAKE_CURRENT_SOURCE_DIR}/util/scripts/check_cpp_style.cmake + -P ${CMAKE_CURRENT_SOURCE_DIR}/util/check_cpp_style.cmake ) function(open3d_aligned_print first second) diff --git a/docs/compilation.rst b/docs/compilation.rst index d4c6e95e5ff..3774739da8e 100644 --- a/docs/compilation.rst +++ b/docs/compilation.rst @@ -58,7 +58,7 @@ compilation time. Otherwise, the dependencies can also be build from source, see .. code-block:: bash - util/scripts/install-deps-ubuntu.sh + util/install_deps_ubuntu.sh .. _compilation_ubuntu_python_binding: @@ -291,7 +291,7 @@ The MacOS compilation steps are mostly identical with :ref:`compilation_ubuntu`. 1. Install dependencies (optional) `````````````````````````````````` -Run ``util/scripts/install-deps-osx.sh``. We use `homebrew `_ +Run ``util/install_deps_macos.sh``. We use `homebrew `_ to manage dependencies. Follow the instructions from the script. 2. Setup Python binding environments @@ -443,8 +443,8 @@ library from source code. .. tip:: On Ubuntu and MacOS it is recommended to link Open3D to system installed libraries. The dependencies can be installed via scripts - ``util/scripts/install-deps-ubuntu.sh`` and - ``util/scripts/install-deps-osx.sh``. On Windows, it is recommended to + ``util/install_deps_ubuntu.sh`` and + ``util/install_deps_macos.sh``. On Windows, it is recommended to compile everything from source since Windows lacks a package management software. diff --git a/docs/getting_started.rst b/docs/getting_started.rst index bf53ec4a299..de319e889fd 100644 --- a/docs/getting_started.rst +++ b/docs/getting_started.rst @@ -82,5 +82,5 @@ demonstrate the usage of Open3D Python interface. See ``examples/python`` for al .. note:: Open3D's Python tutorial utilizes some external packages: ``numpy``, ``matplotlib``, ``opencv-python``. OpenCV is only used for reconstruction - system. Please read util/scripts/install-deps-python.sh for installing these + system. Please read util/install-deps-python.sh for installing these packages. diff --git a/docs/index.rst b/docs/index.rst index d8e25ffa8b1..8e8567c6525 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -45,7 +45,6 @@ Open3D: A Modern Library for 3D Data Processing tutorial/Advanced/index tutorial/ReconstructionSystem/index tutorial/C++/cplusplus_interface - tutorial/docker/index tutorial/reference .. _cpp_api_index: diff --git a/docs/tutorial/docker/docker-gui.rst b/docs/tutorial/docker/docker-gui.rst deleted file mode 100644 index 816a392f8a1..00000000000 --- a/docs/tutorial/docker/docker-gui.rst +++ /dev/null @@ -1,146 +0,0 @@ -.. _docker-gui: - -Docker GUI ----------- - -The following document describes a solution for utilizing Open3D with GUI/visualization under Docker. - -Utilizing this approach the user can: - -- sandbox Open3D from other applications on a machine -- operate Open3D on a headless machine using VNC or the terminal -- edit the Open3D code on the host side but run it inside an Open3D container - -This recipe was developed and tested on Ubuntu 18.04. Other distributions might need slightly different instructions. - -.. _docker-gui-usage-notes: - -Usage notes -=========== - -.. _docker-gui-files: - -Docker files -```````````` - -The docker setup files and tools can be found under `Open3d/util/docker/open3d-xvfb `_. - - - Dockerfile - - setup - - entrypoint.s - - docker_sample.sh - - tools - - attach.sh - - build.sh - - delete.sh - - name.sh - - prune.sh - - run.sh - - stop.sh - -**Dockerfile** - -``Dockerfile`` is the Docker script used to build the Open3D image. - -**Tools** - -We provide a number of Docker tools for convenience: - -- ``attach.sh`` - Attach a terminal to a running Open3D docker container. -- ``build.sh`` - Build the Open3D docker image. -- ``delete.sh`` - Delete the Open3D image. -- ``prune.sh`` - Delete **all** stopped containers and **all** dangling images. -- ``run.sh`` - Run the Open3D container. Checkout Open3D, build and install. -- ``stop.sh`` - Stop the Open3D container. - -A typical flow of events when working with docker looks like this: - -.. code-block:: sh - - $ cd /util/docker/open3d_xvfb/tools - $ ./build.sh - $ ./run.sh - root@open3d-xvfb:~/open3d/build# - root@open3d-xvfb:~/open3d/build# exit - $ ./attach.sh - root@open3d-xvfb:~/open3d# - root@open3d-xvfb:~/open3d# exit - $ ./stop.sh - -Building the Open3D Docker image will take approximately 10-15 minutes to complete. -At the end the image will be ~1GB in size. - -Running the Open3D Docker container will perform the following steps: - -- git clone Open3D master to ``~/open3d_docker`` -- run the container in interactive mode with the host path ``~/open3d_docker`` mounted inside the container at ``/root/Open3D`` -- build Open3D and install inside the docker container. -- attach a terminal to the Open3D container for command line input from the host side - -In order to disconnect from a running container type ``exit`` at the terminal. -You can still attach to a running container at a later time. - -The Open3D container is automatically removed when stopped. -None of the Open3D files are removed as they in fact reside on the host due to the Docker bind mounting functionality. -In order to keep the container around (and not have to rebuild the Open3D binaries every time) remove the ``-rm`` option in ``run.sh``. - -Prunning images/containers is useful when modifying/testing a new image. -It cleans up the docker workspace and frees up disk space. - -.. _docker-gui-remote-access: - -Remote access -````````````` - -VNC can be used to remote into a running docker container. - -A running Open3D container listens to port 5920 on the host. -The ``run.sh`` script redirects host port 5920 to container port 5900. - -This allows remoting into the container using VNC to ``:5920``. -The default password is ``1234`` and can be changed in ``Open3D/issue_17/util/docker/open3d-xvfb/setup/entrypoint.sh`` (requires rebuilding the Open3D Docker image with ``build.sh``). -Once connected you can use Open3D as usual. - -.. _docker-gui-host-terminal: - -Running at the host terminal -```````````````````````````` - -It is also possible to run Open3D from a host terminal attached to a running Open3D Docker container. -An example on how this can be perfomed: - -.. code-block:: sh - - # at the host terminal - $ sudo cp ~/open3d_docker/util/docker/open3d-xvfb/setup/docker_sample.sh \ - ~/open3d_docker/build/lib/Tutorial/Advanced - $ cd ~/open3d_docker/utilities/docker/open3d-xvfb/tools - $ ./attach.sh - - # at the container terminal - $ cd ~/open3d/build/lib/Tutorial/Advanced - $ sh docker_sample.sh - -.. _docker-gui-limitations: - -Limitations -=========== - -- | the ``lxde`` user interface needs more configuring. - | Some things won't work as expected. For example the ``UXTerm`` doesn't start and ``lxterminal`` may crash occasionally. -- | the container screen resolution is set to 1280x1024x8. - | The resolution will be increased in the future. -- | there are some rendering issues. - | Some images may be saved incorrectly to the disk. For example, when running the ``headless_sample.py`` sample the color images saved to the disk are black. -- | ``run.sh`` clones Open3D to a hardcoded location: ``~/open3d_docker`` - | We are considering the following alternatives: - - - let the user specify the destination - - reuse the current location of Open3D - diff --git a/docs/tutorial/docker/docker-test.rst b/docs/tutorial/docker/docker-test.rst deleted file mode 100644 index 70887b5340b..00000000000 --- a/docs/tutorial/docker/docker-test.rst +++ /dev/null @@ -1,128 +0,0 @@ -.. _docker-test: - -Docker test ------------ - -A number of Docker images have been designed for the purpose of testing Open3D. -These configurations are based on various Ubuntu versions, Python installations -and number of preinstalled Open3D dependencies and don't support a GUI. - -Ubuntu: - -- 14.04 -- 16.04 -- 18.04 - -Python installations: - -- py2: python2.x -- py3: python3.x -- mc2: miniconda2 -- mc3: miniconda3 - -Preinstalled dependencies (bundle type): - -- base: minimal, dependencies will be built from source -- deps: all dependencies are installed from packages - -The Python version will differ from one image to another based on the defaults for that configuration. - -The images can be found at: `intelvcl/open3d-test `_ - -.. _docker-test-usage-notes: - -Usage notes -=========== - -The docker setup files and tools can be found under: `Open3d/util/docker/open3d-test `_. - -.. _docker-test-setup: - -Setup files -``````````` - -The setup files are used, along with the dockerfiles, to build the images. - -.. _docker-test-tools: - -Tools -````` - -The tools are scripts designed to: - -- build the docker images -- upload the images to the online repository -- test Open3D -- delete the images from the system -- stop running containers - -Most scripts, with the exception of those that are meant for all -configurations, accept the following arguments: - -- Ubuntu version: 14.04 16.04 18.04 -- Bundle type: base deps -- Environment type: py2 py3 mc2 mc3 -- Link type: STATIC SHARED - -The first two arguments, the Ubuntu version and the bundle type, are always required. -The last two arguments, the Python installation (aka environment type) and the library link type are only required by the test.sh script. - -The scripts are designed to display help on the arguments if an error is detected. - -**build.sh** - -This script will build a single Open3D docker image based on the Ubuntu version, bundle type and Python version. - -**build-all.sh** - -This script will build all of the supported Open3D docker images. - -**upload.sh** - -This script will upload a single Open3D docker image. Accepts the same command line arguments as build.sh. - -Requires docker login: - -.. code-block:: sh - - $ docker login --username intelvcl - -**upload-all.sh** - -This script will upload all of the Open3D docker images. - -Requires docker login: - -.. code-block:: sh - - $ docker login --username intelvcl - -**cleanup.sh** - -This script will remove all of the Open3D docker images, if any is found on the system. - -**prune.sh** - -This script is useful at design time and helps remove any unfinished docker images. - -**test.sh** - -This script tests a single Open3D configuration. -Requires all four command line arguments. - -**test-all.sh** - -This script tests all Open3D test configurations. - -**run.sh** - -This script is useful for interacting with Open3D under a specific configuration. -Accepts the same command line arguments as build.sh. - -**stop.sh** - -This script stops a single Open3D container. - -**stop-all.sh** - -This script stops all, if any was found, Open3D containers. diff --git a/docs/tutorial/docker/index.rst b/docs/tutorial/docker/index.rst deleted file mode 100644 index 042714e44d6..00000000000 --- a/docs/tutorial/docker/index.rst +++ /dev/null @@ -1,221 +0,0 @@ -.. _docker: - -Docker ------- - -The following document briefly describes: - -- the installation of Docker CE -- a solution for utilizing Open3D with GUI/visualization under Docker -- the use of Docker images for testing Open3D without a GUI - -.. toctree:: - - docker-gui - docker-test - -.. _docker_installation: - -Ubuntu installation -=================== - -.. warning:: For the latest and most accurate installation guide see the official documentation at `Docker-CE install `_. - -The prefered installation mode is to use the official `Docker repository `_. - -Install dependencies: - -.. code-block:: sh - - $ sudo apt update && \ - sudo apt upgrade -y && \ - sudo apt install -y \ - curl \ - apt-transport-https \ - ca-certificates \ - software-properties-common - -Add Docker’s official GPG key: - -.. code-block:: sh - - $ curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add - - -Manually verify that the key is ``9DC8 5822 9FC7 DD38 854A E2D8 8D81 803C 0EBF CD88``: - -.. code-block:: sh - - $ sudo apt-key fingerprint 0EBFCD88 - -Set up the stable repository: - -.. code-block:: sh - - $ sudo add-apt-repository \ - "deb [arch=amd64] https://download.docker.com/linux/ubuntu \ - $(lsb_release -cs) \ - stable" - - $ sudo apt update - -Install the latest version: - -.. code-block:: sh - - $ sudo apt install -y docker-ce - -Verify the installation: - -.. code-block:: sh - - $ sudo docker run hello-world - -The verification will timeout if running behind a proxy: -``Unable to find image 'hello-world:latest' locally`` - -In order to address this problem see the :ref:`docker_proxy_settings_daemon` proxy settings. - -**Optional steps** - -`Docker Post-installation steps for Linux `_ - -**Add user to “docker” group** - -This will eliminate the need to use sudo in order to run docker commands. - -.. code-block:: sh - - $ sudo usermod -aG docker - -.. warning:: | The docker group grants privileges equivalent to the root user. - | For details on how this impacts security in your system, see `Docker Daemon Attack Surface `_. - -.. _docker_proxy_settings: - -Proxy settings -============== - -.. _docker_proxy_settings_daemon: - -Docker daemon -````````````` - -In order to solve the hello-world issue above follow the `Docker proxy settings `_. - -Create a systemd drop-in directory for the docker service: - -.. code-block:: sh - - $ sudo mkdir -p /etc/systemd/system/docker.service.d - - $ sudo touch /etc/systemd/system/docker.service.d/http-proxy.conf - $ sudo ne /etc/systemd/system/docker.service.d/http-proxy.conf - [Service] - Environment="HTTP_PROXY=server:port" "NO_PROXY=localhost;127.0.0.1" - - $ sudo touch /etc/systemd/system/docker.service.d/https-proxy.conf - $ sudo ne /etc/systemd/system/docker.service.d/https-proxy.conf - [Service] - Environment="HTTPS_PROXY=server:port/" "NO_PROXY=localhost;127.0.0.1" - -Flush changes and restart Docker: - -.. code-block:: sh - - $ sudo systemctl daemon-reload - $ sudo systemctl restart docker - - -Verify that the configuration has been loaded: - -.. code-block:: sh - - $ systemctl show --property=Environment docker - -.. _docker_proxy_settings_container: - -Docker container -```````````````` - -The docker container proxy settings must be set in order to enable features like `apt install` in your container. -This can be accomplished either in the Dockerfile itself or by using a global mechanism like `chameleonsocks`. - -**Dockerfile** - -Take a look at the first few lines of the example :download:`Dockerfile <../../_static/docker/Dockerfile>`: - -.. literalinclude:: ../../_static/docker/Dockerfile - :language: docker - :lineno-start: 3 - :lines: 3-10 - :linenos: - -Uncommenting and settings these environment variables does the job. - -**chameleonsocks** - -Another way to set the proxy settings of the container is to use `chameleonsocks `_ which is a mechanism to redirect SOCKS or HTTP proxies. - -`chameleonsocks` has the advantage that the Dockerfile doesn't need changing based on network configuration circumstances. -However it can conflict with other proxy settings on your host system. When that happens stopping the `chameleonsocks` container addresses the conflicts. - -.. code-block:: sh - - $ cd ~ - $ mkdir chameleonsocks - $ cd chameleonsocks - $ https_proxy=`_ -edit ``/etc/docker/daemon.json`` on the host: - -.. code-block:: sh - - $ sudo ne /etc/docker/daemon.json - { - "dns": ["xxx.xxx.xxx.xxx", "xxx.xxx.xxx.xxx"] - } diff --git a/util/scripts/check_cpp_style.cmake b/util/check_cpp_style.cmake similarity index 100% rename from util/scripts/check_cpp_style.cmake rename to util/check_cpp_style.cmake diff --git a/util/scripts/check_style.py b/util/check_style.py similarity index 99% rename from util/scripts/check_style.py rename to util/check_style.py index fdd60e45e6a..6ed446e3cd4 100644 --- a/util/scripts/check_style.py +++ b/util/check_style.py @@ -68,7 +68,7 @@ def _glob_files(directories, extensions): List of file paths. """ pwd = Path(os.path.dirname(os.path.abspath(__file__))) - open3d_root_dir = pwd.parent.parent + open3d_root_dir = pwd.parent file_paths = [] for directory in directories: @@ -346,7 +346,7 @@ def run(self, do_apply_style, no_parallel, verbose): # Check formatting libs clang_format_bin = _find_clang_format() pwd = Path(os.path.dirname(os.path.abspath(__file__))) - python_style_config = str(pwd.parent.parent / ".style.yapf") + python_style_config = str(pwd.parent / ".style.yapf") # Check or apply style cpp_formatter = CppFormatter(_glob_files(CPP_FORMAT_DIRS, diff --git a/util/docker/open3d-test/Dockerfiles/Dockerfile-base b/util/docker/open3d-test/Dockerfiles/Dockerfile-base deleted file mode 100644 index bed4daf46b7..00000000000 --- a/util/docker/open3d-test/Dockerfiles/Dockerfile-base +++ /dev/null @@ -1,18 +0,0 @@ -ARG UBUNTU_VERSION - -FROM ubuntu:${UBUNTU_VERSION} - -ARG UBUNTU_VERSION - -ENV DEBIAN_FRONTEND noninteractive - -WORKDIR /root - -COPY [ "/setup/googletest-release-1.8.0.tar.gz", \ - "/setup/install-gtest.sh", \ - "/setup/setup-base.sh", \ - "/setup/test.sh", \ - "/setup/.bashrc", \ - "./" ] - -RUN /bin/bash /root/setup-base.sh && rm /root/setup-base.sh diff --git a/util/docker/open3d-test/Dockerfiles/Dockerfile-deps b/util/docker/open3d-test/Dockerfiles/Dockerfile-deps deleted file mode 100644 index 694943b207d..00000000000 --- a/util/docker/open3d-test/Dockerfiles/Dockerfile-deps +++ /dev/null @@ -1,10 +0,0 @@ -ARG REPOSITORY -ARG UBUNTU_VERSION - -FROM ${REPOSITORY}/open3d-test:${UBUNTU_VERSION}-base - -ARG UBUNTU_VERSION - -COPY [ "/setup/setup-deps.sh", "./" ] - -RUN /bin/bash /root/setup-deps.sh && rm /root/setup-deps.sh diff --git a/util/docker/open3d-test/Dockerfiles/Dockerfile-mc b/util/docker/open3d-test/Dockerfiles/Dockerfile-mc deleted file mode 100644 index 5267dcc24eb..00000000000 --- a/util/docker/open3d-test/Dockerfiles/Dockerfile-mc +++ /dev/null @@ -1,12 +0,0 @@ -ARG REPOSITORY -ARG UBUNTU_VERSION -ARG BUNDLE_TYPE - -FROM ${REPOSITORY}/open3d-test:${UBUNTU_VERSION}-${BUNDLE_TYPE} - -ARG MC_INSTALLER -ARG CONDA_DIR - -COPY [ "/setup/${MC_INSTALLER}", "/setup/setup-mc.sh", "./" ] - -RUN /root/setup-mc.sh ${MC_INSTALLER} ${CONDA_DIR} && rm /root/setup-mc.sh diff --git a/util/docker/open3d-test/Dockerfiles/Dockerfile-py b/util/docker/open3d-test/Dockerfiles/Dockerfile-py deleted file mode 100644 index 7ba2e016eb8..00000000000 --- a/util/docker/open3d-test/Dockerfiles/Dockerfile-py +++ /dev/null @@ -1,11 +0,0 @@ -ARG REPOSITORY -ARG UBUNTU_VERSION -ARG BUNDLE_TYPE - -FROM ${REPOSITORY}/open3d-test:${UBUNTU_VERSION}-${BUNDLE_TYPE} - -ARG PYTHON - -COPY [ "/setup/setup-py.sh", "./" ] - -RUN /root/setup-py.sh ${PYTHON} && rm /root/setup-py.sh diff --git a/util/docker/open3d-test/setup/.bashrc b/util/docker/open3d-test/setup/.bashrc deleted file mode 100644 index 45bb8cb3e49..00000000000 --- a/util/docker/open3d-test/setup/.bashrc +++ /dev/null @@ -1,99 +0,0 @@ -# ~/.bashrc: executed by bash(1) for non-login shells. -# see /usr/share/doc/bash/examples/startup-files (in the package bash-doc) -# for examples - -# If not running interactively, don't do anything -[ -z "$PS1" ] && return - -# don't put duplicate lines in the history. See bash(1) for more options -# ... or force ignoredups and ignorespace -HISTCONTROL=ignoredups:ignorespace - -# append to the history file, don't overwrite it -shopt -s histappend - -# for setting history length see HISTSIZE and HISTFILESIZE in bash(1) -HISTSIZE=1000 -HISTFILESIZE=2000 - -# check the window size after each command and, if necessary, -# update the values of LINES and COLUMNS. -shopt -s checkwinsize - -# make less more friendly for non-text input files, see lesspipe(1) -[ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)" - -# set variable identifying the chroot you work in (used in the prompt below) -if [ -z "$debian_chroot" ] && [ -r /etc/debian_chroot ]; then - debian_chroot=$(cat /etc/debian_chroot) -fi - -# set a fancy prompt (non-color, unless we know we "want" color) -case "$TERM" in - xterm-color) color_prompt=yes;; -esac - -# uncomment for a colored prompt, if the terminal has the capability; turned -# off by default to not distract the user: the focus in a terminal window -# should be on the output of commands, not on the prompt -#force_color_prompt=yes - -if [ -n "$force_color_prompt" ]; then - if [ -x /usr/bin/tput ] && tput setaf 1 >&/dev/null; then - # We have color support; assume it's compliant with Ecma-48 - # (ISO/IEC-6429). (Lack of such support is extremely rare, and such - # a case would tend to support setf rather than setaf.) - color_prompt=yes - else - color_prompt= - fi -fi - -if [ "$color_prompt" = yes ]; then - PS1='${debian_chroot:+($debian_chroot)}\[\033[01;35m\]\h\[\033[00m\]:\[\033[01;35m\]\W\[\033[00m\]\$ ' -else - PS1='${debian_chroot:+($debian_chroot)}\h:\W\$ ' -fi -unset color_prompt force_color_prompt - -# If this is an xterm set the title to user@host:dir -case "$TERM" in -xterm*|rxvt*) - PS1="\[\e]0;${debian_chroot:+($debian_chroot)}\u@\h: \w\a\]$PS1" - ;; -*) - ;; -esac - -# enable color support of ls and also add handy aliases -if [ -x /usr/bin/dircolors ]; then - test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)" - alias ls='ls --color=auto' - #alias dir='dir --color=auto' - #alias vdir='vdir --color=auto' - - alias grep='grep --color=auto' - alias fgrep='fgrep --color=auto' - alias egrep='egrep --color=auto' -fi - -# some more ls aliases -alias ll='ls -alF' -alias la='ls -A' -alias l='ls -CF' - -# Alias definitions. -# You may want to put all your additions into a separate file like -# ~/.bash_aliases, instead of adding them here directly. -# See /usr/share/doc/bash-doc/examples in the bash-doc package. - -if [ -f ~/.bash_aliases ]; then - . ~/.bash_aliases -fi - -# enable programmable completion features (you don't need to enable -# this, if it's already enabled in /etc/bash.bashrc and /etc/profile -# sources /etc/bash.bashrc). -#if [ -f /etc/bash_completion ] && ! shopt -oq posix; then -# . /etc/bash_completion -#fi diff --git a/util/docker/open3d-test/setup/install-gtest.sh b/util/docker/open3d-test/setup/install-gtest.sh deleted file mode 100644 index 6d3b699c9e0..00000000000 --- a/util/docker/open3d-test/setup/install-gtest.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/bash - -# the google test library must be built with -# the same flags as the C++ code under test. - -# decompress the gtest source -tar -xzf googletest-release-1.8.0.tar.gz - -printf "building googletest 1.8.0 ... " -cd googletest-release-1.8.0 -mkdir build -cd build -cmake .. >/dev/null 2>&1 -make -j$(nproc) >/dev/null 2>&1 -printf "done\n" - -printf "installing ... " -cd googlemock/gtest -cp lib*.a /usr/local/lib -cd ../../../googletest -cp -r include/gtest /usr/local/include/gtest -printf "done\n" - -printf "cleanup ... " -rm -rf /root/googletest-release-1.8.0* -cd ../.. -printf "done\n\n" diff --git a/util/docker/open3d-test/setup/setup-base.sh b/util/docker/open3d-test/setup/setup-base.sh deleted file mode 100755 index 3e37acacd73..00000000000 --- a/util/docker/open3d-test/setup/setup-base.sh +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/bash - -# install the minimal Open3D dependencies -# - xorg-dev replaced with just 4 out of ~60 dependencies: -# - libxrandr-dev -# - libxinerama-dev -# - libxcursor-dev -# - libxi-dev && -# - by replacing xorg-dev we've: -# - reduced the Docker image size substantially -# - made sure libpng is not installed -apt-get update -qq -apt-get install -qq -y --no-install-recommends \ - build-essential \ - git \ - libglu1-mesa-dev \ - libxrandr-dev \ - libxinerama-dev \ - libxcursor-dev \ - libxi-dev \ - tzdata >/dev/null 2>&1 - -# the cmake 3.1+ package has a different name on Ubuntu 14.04 -if [ "${UBUNTU_VERSION}" = "14.04" ]; then - apt-get install -qq -y --no-install-recommends cmake3 >/dev/null 2>&1; -else - apt-get install -qq -y --no-install-recommends cmake >/dev/null 2>&1; -fi - -# install googletest, work around SSL CA cert issue... -/bin/bash /root/install-gtest.sh -git config --global http.sslVerify false - -# cleanup -rm /root/install-gtest.sh -rm -rf /var/lib/apt/lists/* diff --git a/util/docker/open3d-test/setup/setup-deps.sh b/util/docker/open3d-test/setup/setup-deps.sh deleted file mode 100755 index 934d74f5128..00000000000 --- a/util/docker/open3d-test/setup/setup-deps.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash - -# install Open3D dependencies -apt-get update -qq -apt-get install -qq -y --no-install-recommends \ - libeigen3-dev \ - libglew-dev \ - libpng-dev >/dev/null 2>&1 - -# GLFW is not available as a package on Ubuntu 14.04 -if [ "${UBUNTU_VERSION}" != "14.04" ]; then - apt-get install -qq -y --no-install-recommends libglfw3-dev >/dev/null 2>&1 -fi - -# cleanup -rm -rf /var/lib/apt/lists/* diff --git a/util/docker/open3d-test/setup/setup-mc.sh b/util/docker/open3d-test/setup/setup-mc.sh deleted file mode 100755 index 7ad5ed51a82..00000000000 --- a/util/docker/open3d-test/setup/setup-mc.sh +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/bash - -# display help on the required command line arguments -if [ $# -eq 0 ] || [ $# -eq 1 ] || [ "${1}" = "--help" ]; then - echo "./setyp-py.sh " - echo - echo "Required:" - echo " Miniconda installer file name" - echo " Install directory" - echo - exit 1 -fi - -MC_INSTALLER=${1} -CONDA_DIR=${2} - -# install miniconda -/bin/bash "/root/${MC_INSTALLER}" -bfp "${CONDA_DIR}" >/dev/null 2>&1 - -# install conda-build & conda-verify -"${CONDA_DIR}/bin/conda" install -qy conda-build conda-verify >/dev/null 2>&1 - -# conda update -"${CONDA_DIR}/bin/conda" update --all -qy >/dev/null 2>&1 -"${CONDA_DIR}/bin/conda" config --set auto_update_conda False - -# enable the 'conda' command -ln -s "${CONDA_DIR}/etc/profile.d/conda.sh" /etc/profile.d/conda.sh -echo ". ${CONDA_DIR}/etc/profile.d/conda.sh" >> ~/.bashrc - -# activate when bash starts -echo "conda activate" >> ~/.bashrc - -# cleanup -rm -rf "/root/${MC_INSTALLER}" -"${CONDA_DIR}/bin/conda" clean -aqy diff --git a/util/docker/open3d-test/setup/setup-py.sh b/util/docker/open3d-test/setup/setup-py.sh deleted file mode 100755 index 66279306d1e..00000000000 --- a/util/docker/open3d-test/setup/setup-py.sh +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/bash - -# options for the 1st argument -declare -a python_version=(python python3) - -# display help on the required command line arguments -if [ $# -eq 0 ] || [ "${1}" = "--help" ]; then - echo "./setyp-py.sh " - echo - echo "Required:" - echo " Python version: ${python_version[*]}" - echo - exit 1 -fi - -# display help on the first required argument -if [[ ! " ${python_version[@]} " =~ " ${1} " ]]; then - echo " options for the the 1st argument: ${python_version[*]}" - echo " argument provided: '${1}'" - echo - exit 1 -fi - -PYTHON=${1} - -# install native python dependencies -apt-get update -qq -apt-get install -qq -y --no-install-recommends \ - ${PYTHON}-dev \ - ${PYTHON}-pip \ - ${PYTHON}-setuptools \ - ${PYTHON}-wheel >/dev/null 2>&1 - -# cleanup -rm -rf /var/lib/apt/lists/* diff --git a/util/docker/open3d-test/setup/test.sh b/util/docker/open3d-test/setup/test.sh deleted file mode 100755 index 8c5d3818ade..00000000000 --- a/util/docker/open3d-test/setup/test.sh +++ /dev/null @@ -1,147 +0,0 @@ -#!/bin/bash - -set -e - -declare -a build_type=(Debug Release) -declare -a link_type=(STATIC SHARED) -declare -a env_type=(py2 py3 mc2 mc3) - -OPEN3D_INSTALL_DIR=~/open3d_install - -# display help on the required command line arguments -if [ $# -eq 0 ] || [ "$1" = "--help" ]; then - echo "./build.sh " - echo - echo "Required:" - echo " Build type: ${build_type[*]}" - echo " Link type: ${link_type[*]}" - echo " Environment type: ${env_type[*]}" - echo - exit 1 -fi - -# display help on the first required argument -if [[ ! " ${build_type[@]} " =~ " $1 " ]]; then - echo " options for the 1st argument: ${build_type[*]}" - echo " argument provided: '$1'" - echo - exit 1 -fi - -# display help on the second required argument -if [[ ! " ${link_type[@]} " =~ " $2 " ]]; then - echo " options for the 2nd argument: ${link_type[*]}" - echo " argument provided: '$2'" - echo - exit 1 -fi - -# display help on the third required argument -if [[ ! " ${env_type[@]} " =~ " $3 " ]]; then - echo " options for the 3rd argument: ${env_type[*]}" - echo " argument provided: '$3'" - echo - exit 1 -fi -echo - -cd open3d -echo - -echo "building $2..." -date - -# set the library link mode to OFF (STATIC) or ON (SHARED) -SHARED=OFF -if [ "$2" = "STATIC" ]; then - SHARED="OFF" -elif [ "$2" = "SHARED" ]; then - SHARED="ON" -fi - -# set the python executable -PYTHON="" -if [ "$3" = "py2" ]; then - PYTHON="/usr/bin/python2" -elif [ "$3" = "py3" ]; then - PYTHON="/usr/bin/python3" -elif [ "$3" = "mc2" ]; then - PYTHON="/root/miniconda2/bin/python2" -elif [ "$3" = "mc3" ]; then - PYTHON="/root/miniconda3/bin/python3" -fi - -echo "cmake configure the Open3D project..." -date -mkdir -p build -cd build -cmake -DCMAKE_BUILD_TYPE=${1} \ - -DBUILD_SHARED_LIBS=${SHARED} \ - -DPYTHON_EXECUTABLE=${PYTHON} \ - -DBUILD_UNIT_TESTS=ON \ - -DCMAKE_INSTALL_PREFIX=${OPEN3D_INSTALL_DIR} \ - .. -echo - -echo "build & install Open3D..." -date -make install -j$(nproc) -echo - -if [ "$3" = "py2" ]; then - echo "building python2 pip package..." - date - - make pip-package - #make install-pip-package -elif [ "$3" = "py3" ]; then - echo "building python3 pip package..." - date - - make pip-package - #make install-pip-package -elif [ "$3" = "mc2" ]; then - echo "building python2 conda package..." - date - - make conda-package -elif [ "$3" = "mc3" ]; then - echo "building python3 conda package..." - date - - make conda-package -fi -date -echo - -echo "running the Open3D unit tests..." -date -./bin/tests -echo - -echo "test building a C++ example with installed Open3D..." -date -cd ../docs/_static/C++ -mkdir build -cd build -cmake -DCMAKE_INSTALL_PREFIX=${OPEN3D_INSTALL_DIR} .. -make -./TestVisualizer -echo - -echo "cleanup the C++ example..." -date -cd ../ -rm -rf build - -echo "uninstall Open3D..." -date -cd ../../../build -make uninstall - -echo "cleanup Open3D..." -date -cd ../ -rm -rf build -rm -rf ${OPEN3D_INSTALL_DIR} -echo diff --git a/util/docker/open3d-test/tools/arguments.sh b/util/docker/open3d-test/tools/arguments.sh deleted file mode 100755 index 0c040e0de5a..00000000000 --- a/util/docker/open3d-test/tools/arguments.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash - -# list of the supported ubuntu versions -declare -a ubuntu_version=(14.04 16.04 18.04) - -# base builds don't install Open3D 3rdparty dependencies -# deps builds install the Open3D 3rdparty dependencies -declare -a bundle_type=(base deps) - -# py2/3 represent the native environment with python2/3 -# mc2/3 represent the miniconda2/3 environment -declare -a env_type=(py2 py3 mc2 mc3) - -# type of linking to be used at build time -declare -a link_type=(STATIC SHARED) diff --git a/util/docker/open3d-test/tools/build-all.sh b/util/docker/open3d-test/tools/build-all.sh deleted file mode 100755 index ee4a0404357..00000000000 --- a/util/docker/open3d-test/tools/build-all.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash - -REAL_PATH=$(dirname $(realpath ${0})) - -. ${REAL_PATH}/arguments.sh - -echo "building all images..." -echo - -for ubuntu in ${ubuntu_version[@]}; do - for bundle in ${bundle_type[@]}; do - for env in ${env_type[@]}; do - ${REAL_PATH}/build.sh $ubuntu $bundle $env - echo - done - done -done - -# display images in order to check image size -docker image ls -echo diff --git a/util/docker/open3d-test/tools/build.sh b/util/docker/open3d-test/tools/build.sh deleted file mode 100755 index c44ead03e52..00000000000 --- a/util/docker/open3d-test/tools/build.sh +++ /dev/null @@ -1,51 +0,0 @@ -#!/bin/bash - -REAL_PATH=$(dirname $(realpath ${0})) - -. ${REAL_PATH}/set_variables.sh - -# build the image only if not found locally -if [ 0 -eq ${IMAGE_EXISTS} ]; then - echo "skipping ${IMAGE_NAME}, already exists." - exit 0 -fi - -# build the images this image depends on -if [ "${2}" = "${bundle_type[1]}" ]; then - ${REAL_PATH}/build.sh ${1} ${bundle_type[0]} -fi -if [ "${3}" != "" ]; then - ${REAL_PATH}/build.sh ${1} ${2} -fi - -# copy the googletest source code to the Docker context/folder -GTEST_ARCHIVE=googletest-release-1.8.0.tar.gz -if [ ! -f "${REAL_PATH}/../setup/${GTEST_ARCHIVE}" ]; then - echo "${GTEST_ARCHIVE} not found, copying..." - cp "${REAL_PATH}/../../../../3rdparty/googletest/${GTEST_ARCHIVE}" \ - "${REAL_PATH}/../setup" -fi - -# download miniconda installer once -if [ "${MC_INSTALLER}" != "" ]; then - if [ ! -f "${REAL_PATH}/../setup/${MC_INSTALLER}" ]; then - echo "${MC_INSTALLER} not found, downloading..." - wget -P "${REAL_PATH}/../setup" \ - "https://repo.anaconda.com/miniconda/${MC_INSTALLER}" - fi -fi - -echo "building ${IMAGE_NAME}..." -date -docker image build \ - --build-arg REPOSITORY="${REPOSITORY}" \ - --build-arg UBUNTU_VERSION="${1}" \ - --build-arg BUNDLE_TYPE="${2}" \ - --build-arg PYTHON="${PYTHON}" \ - --build-arg MC_INSTALLER="${MC_INSTALLER}" \ - --build-arg CONDA_DIR="${CONDA_DIR}" \ - -t ${IMAGE_NAME} -f "${REAL_PATH}/../Dockerfiles/${DOCKERFILE}" \ - ${REAL_PATH}/.. -date -echo "done building ${IMAGE_NAME}..." -echo diff --git a/util/docker/open3d-test/tools/cleanup.sh b/util/docker/open3d-test/tools/cleanup.sh deleted file mode 100755 index 2639e7ccca5..00000000000 --- a/util/docker/open3d-test/tools/cleanup.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/bash - -REAL_PATH=$(dirname $(realpath ${0})) - -. ${REAL_PATH}/arguments.sh - -echo "cleaning up images..." -echo - -for ubuntu in ${ubuntu_version[@]}; do - for bundle in ${bundle_type[@]}; do - . ${REAL_PATH}/set_variables.sh ${ubuntu} ${bundle} - - # remove the image only if found locally - if [ 0 -eq ${IMAGE_EXISTS} ]; then - printf "removing ${IMAGE_NAME}..." - docker image rm ${IMAGE_NAME} >/dev/null 2>&1 - printf "done\n" - fi - - for env in ${env_type[@]}; do - . ${REAL_PATH}/set_variables.sh ${ubuntu} ${bundle} ${env} - - # remove the image only if found locally - if [ 0 -eq ${IMAGE_EXISTS} ]; then - printf "removing ${IMAGE_NAME}..." - docker image rm ${IMAGE_NAME} >/dev/null 2>&1 - printf "done\n" - fi - done - done -done -echo diff --git a/util/docker/open3d-test/tools/name.sh b/util/docker/open3d-test/tools/name.sh deleted file mode 100755 index ec42349567c..00000000000 --- a/util/docker/open3d-test/tools/name.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash - -REAL_PATH=$(dirname $(realpath ${0})) - -# use the name of the upper level directory as the image name -NAME=$(basename $(realpath ${REAL_PATH}/..)) - -export NAME diff --git a/util/docker/open3d-test/tools/prune.sh b/util/docker/open3d-test/tools/prune.sh deleted file mode 100755 index 50c57b871bb..00000000000 --- a/util/docker/open3d-test/tools/prune.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -docker container prune -f -docker image prune -f - -docker image ls -echo diff --git a/util/docker/open3d-test/tools/run.sh b/util/docker/open3d-test/tools/run.sh deleted file mode 100755 index 35800a99b27..00000000000 --- a/util/docker/open3d-test/tools/run.sh +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/bash - -REAL_PATH=$(dirname $(realpath ${0})) - -. ${REAL_PATH}/set_variables.sh - -# download the image only if not found locally -if [ 1 -eq ${IMAGE_EXISTS} ]; then - echo "downloading ${IMAGE_NAME}..." - date - docker pull ${IMAGE_NAME} - echo -fi - -# helps sync the container clock with the host clock -TIMEZONE=$(cat /etc/timezone) - -echo "running the ${CONTAINER_NAME} container..." -date -docker container run \ - --rm \ - -d \ - -t \ - -e ENV_TYPE="${3}" \ - -e TZ="${TIMEZONE}" \ - -h ${CONTAINER_HOSTNAME} \ - --name ${CONTAINER_NAME} \ - ${IMAGE_NAME} -echo - -echo "attaching to the ${CONTAINER_NAME} container..." -date -echo - -docker container exec -it -w /root ${CONTAINER_NAME} bash -c '\ - git clone --recursive https://github.com/intel-isl/Open3D.git open3d && \ - bash' -echo - -echo "stopping the ${CONTAINER_NAME} container..." -date -docker container stop -t 0 ${CONTAINER_NAME} >/dev/null 2>&1 -echo diff --git a/util/docker/open3d-test/tools/set_variables.sh b/util/docker/open3d-test/tools/set_variables.sh deleted file mode 100755 index aa12289225f..00000000000 --- a/util/docker/open3d-test/tools/set_variables.sh +++ /dev/null @@ -1,135 +0,0 @@ -#!/bin/bash - -REAL_PATH=$(dirname $(realpath ${0})) - -. ${REAL_PATH}/name.sh -. ${REAL_PATH}/arguments.sh - -# display help on the required command line arguments -if [ $# -eq 0 ] || [ "${1}" = "--help" ]; then - echo "./build.sh " - echo - echo "Required:" - echo " Ubuntu version: ${ubuntu_version[*]}" - echo " Bundle type: ${bundle_type[*]}" - echo "Optional:" - echo " Environment type: ${env_type[*]}" - echo " Link type: ${link_type[*]}" - echo - exit 1 -fi - -# display help on the first required argument -if [[ ! " ${ubuntu_version[@]} " =~ " ${1} " ]]; then - echo " options for the the 1st argument: ${ubuntu_version[*]}" - echo " argument provided: '${1}'" - echo - exit 1 -fi - -# display help on the second required argument -if [[ ! " ${bundle_type[@]} " =~ " ${2} " ]]; then - echo " options for the 2nd argument: ${bundle_type[*]}" - echo " argument provided: '${2}'" - echo - exit 1 -fi - -# display help on the third required argument -if [ "${3}" != "" ]; then - if [[ ! " ${env_type[@]} " =~ " ${3} " ]]; then - echo " options for the 3rd argument: ${env_type[*]}" - echo " argument provided: '${3}'" - echo - exit 1 - fi -fi - -# display help on the fourth required argument -if [ "${4}" != "" ]; then - if [[ ! " ${link_type[@]} " =~ " ${4} " ]]; then - echo " options for the 4th argument: ${link_type[*]}" - echo " argument provided: '${4}'" - echo - exit 1 - fi -fi - -# the name of the repository where the images will be uploaded to -REPOSITORY=intelvcl - -# build the tag of the image -TAG=${1}-${2} -if [ "${3}" != "" ]; then - TAG=${TAG}-${3} -fi - -# build image name complete with tag -IMAGE_NAME=${REPOSITORY}/${NAME}:${TAG} - -# check if the image already exists or not -docker image inspect ${IMAGE_NAME} >/dev/null 2>&1 -IMAGE_EXISTS=$? - -# build the Dockerfile name -DOCKERFILE="" -if [ "${3}" = "" ]; then - DOCKERFILE=Dockerfile-${2} -elif [[ "${3}" =~ "py" ]]; then - DOCKERFILE=Dockerfile-py -elif [[ "${3}" =~ "mc" ]]; then - DOCKERFILE=Dockerfile-mc -fi - -# build the container host name -# remove the dot in the TAG/Ubuntu version number -# in order to use the full hostname in the bash prompt -# otherwise the text after the dot is not displayed -CONTAINER_HOSTNAME=${NAME}-${TAG//.} - -# build the container name -# suffix with the link type in order to avoid container name collisions -CONTAINER_NAME=${NAME}-${TAG//.} -if [ "${4}" != "" ]; then - CONTAINER_NAME=${NAME}-${TAG//.}-${4} -fi - -# python version -PYTHON="" - -# the miniconda2/3 installer filename -MC_INSTALLER="" - -# miniconda2/3 install dir -CONDA_DIR="" - -if [ "${3}" = "py2" ]; then - PYTHON="python" -elif [ "${3}" = "py3" ]; then - PYTHON="python3" -elif [ "${3}" = "mc2" ]; then - MC_INSTALLER=Miniconda2-latest-Linux-x86_64.sh - CONDA_DIR="/root/miniconda2" -elif [ "${3}" = "mc3" ]; then - MC_INSTALLER=Miniconda3-latest-Linux-x86_64.sh - CONDA_DIR="/root/miniconda3" -fi - -# the host/docker Open3D clone locations -Open3D_HOST=~/${NAME}-${1} -Open3D_DOCK=/root/${NAME}-${1} - -# link type, default STATIC -LINK_TYPE=${4} - -export IMAGE_NAME -export IMAGE_EXISTS -export DOCKERFILE -export CONTAINER_HOSTNAME -export CONTAINER_NAME -export PYTHON -export MC_INSTALLER -export CONDA_DIR -export Open3D_HOST -export Open3D_DOCK -export LINK_TYPE diff --git a/util/docker/open3d-test/tools/stop-all.sh b/util/docker/open3d-test/tools/stop-all.sh deleted file mode 100755 index e9cf1282c58..00000000000 --- a/util/docker/open3d-test/tools/stop-all.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash - -REAL_PATH=$(dirname $(realpath ${0})) - -. ${REAL_PATH}/arguments.sh - -echo "stopping containers..." -echo - -for ubuntu in ${ubuntu_version[@]}; do - for bundle in ${bundle_type[@]}; do - ${REAL_PATH}/stop.sh ${ubuntu} ${bundle} - - for env in ${env_type[@]}; do - for link in ${link_type[@]}; do - ${REAL_PATH}/stop.sh ${ubuntu} ${bundle} ${env} ${link} - done - done - done -done - -echo diff --git a/util/docker/open3d-test/tools/stop.sh b/util/docker/open3d-test/tools/stop.sh deleted file mode 100755 index acd23d58ae6..00000000000 --- a/util/docker/open3d-test/tools/stop.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -REAL_PATH=$(dirname $(realpath ${0})) - -. ${REAL_PATH}/set_variables.sh - -printf "stopping ${CONTAINER_NAME}..." -docker container stop -t 0 ${CONTAINER_NAME} >/dev/null 2>&1 -printf "done\n" diff --git a/util/docker/open3d-test/tools/test-all.sh b/util/docker/open3d-test/tools/test-all.sh deleted file mode 100755 index cbbaa69afe8..00000000000 --- a/util/docker/open3d-test/tools/test-all.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash - -REAL_PATH=$(dirname $(realpath ${0})) - -. ${REAL_PATH}/arguments.sh - -echo "testing all images..." -echo - -for ubuntu in ${ubuntu_version[@]}; do - for bundle in ${bundle_type[@]}; do - for env in ${env_type[@]}; do - for link in ${link_type[@]}; do - ${REAL_PATH}/test.sh $ubuntu $bundle $env $link - echo - done - done - done -done diff --git a/util/docker/open3d-test/tools/test.sh b/util/docker/open3d-test/tools/test.sh deleted file mode 100755 index e345b2e75d3..00000000000 --- a/util/docker/open3d-test/tools/test.sh +++ /dev/null @@ -1,58 +0,0 @@ -#!/bin/bash - -REAL_PATH=$(dirname $(realpath ${0})) - -. ${REAL_PATH}/set_variables.sh - -# download the image only if not found locally -if [ 1 -eq ${IMAGE_EXISTS} ]; then - echo "downloading ${IMAGE_NAME}..." - date - docker pull ${IMAGE_NAME} - echo -fi - -# helps sync the container clock with the host clock -TIMEZONE=$(cat /etc/timezone) - -echo "running the ${CONTAINER_HOSTNAME} container..." -date -docker container run \ - --rm \ - -d \ - -t \ - -e ENV_TYPE="${3}" \ - -e TZ="${TIMEZONE}" \ - -e LINK_TYPE="${LINK_TYPE}" \ - -h ${CONTAINER_HOSTNAME} \ - --name ${CONTAINER_NAME} \ - ${IMAGE_NAME} -echo - -# attach to the running container, clone/build/test Open3D -echo "testing ${IMAGE_NAME}..." -date -echo - -if [ "${3}" = "py2" ] || [ "${3}" = "py3" ]; then - docker container exec -it ${CONTAINER_NAME} /bin/bash -c '\ - git clone --recursive https://github.com/intel-isl/Open3D.git open3d && \ - ./test.sh Release ${LINK_TYPE} $ENV_TYPE' -elif [ "${3}" = "mc2" ] || [ "${3}" = "mc3" ]; then - # the conda settings in .bashrc only work with interactive shells - # for this reason we need to explicitly activate conda here - docker container exec -e CONDA_DIR="${CONDA_DIR}" -it ${CONTAINER_NAME} /bin/bash -c '\ - git clone --recursive https://github.com/intel-isl/Open3D.git open3d && \ - source ${CONDA_DIR}/bin/activate && \ - ./test.sh Release ${LINK_TYPE} $ENV_TYPE' -fi - -# docker exec is returning the result of the tests -TEST_RESULT=$? - -echo "stopping the ${CONTAINER_HOSTNAME} container..." -date -docker container stop -t 0 ${CONTAINER_NAME} >/dev/null 2>&1 -echo - -exit ${TEST_RESULT} diff --git a/util/docker/open3d-test/tools/upload-all.sh b/util/docker/open3d-test/tools/upload-all.sh deleted file mode 100755 index afb3c215898..00000000000 --- a/util/docker/open3d-test/tools/upload-all.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash - -REAL_PATH=$(dirname $(realpath ${0})) - -. ${REAL_PATH}/arguments.sh - -echo "uploading all images..." -echo - -for ubuntu in ${ubuntu_version[@]}; do - for bundle in ${bundle_type[@]}; do - ${REAL_PATH}/upload.sh ${ubuntu} ${bundle} - - for env in ${env_type[@]}; do - ${REAL_PATH}/upload.sh ${ubuntu} ${bundle} ${env} - done - done -done -echo diff --git a/util/docker/open3d-test/tools/upload.sh b/util/docker/open3d-test/tools/upload.sh deleted file mode 100755 index dbbdd7b2f7e..00000000000 --- a/util/docker/open3d-test/tools/upload.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash - -REAL_PATH=$(dirname $(realpath ${0})) - -. ${REAL_PATH}/set_variables.sh - -# upload the image only if found locally -if [ 0 -eq ${IMAGE_EXISTS} ]; then - printf "uploading ${IMAGE_NAME}..." - docker push ${IMAGE_NAME} >/dev/null 2>&1 - printf "done\n" -else - echo "image ${IMAGE_NAME} not found" -fi diff --git a/util/docker/open3d-xvfb/Dockerfile b/util/docker/open3d-xvfb/Dockerfile deleted file mode 100644 index ea7e5344f3f..00000000000 --- a/util/docker/open3d-xvfb/Dockerfile +++ /dev/null @@ -1,64 +0,0 @@ -FROM ubuntu:18.04 - -# ENV http_proxy "" -# ENV HTTP_PROXY "" -# ENV https_proxy "" -# ENV HTTPS_PROXY "" -# ENV ftp_proxy "" -# ENV socks_proxy "" -# ENV no_proxy "" -# ENV ALL_PROXY "" - -ENV DEBIAN_FRONTEND noninteractive - -# install Open3D dependencies -RUN apt-get update && \ - apt-get upgrade -y && \ - apt-get install -y --no-install-recommends \ - apt-utils \ - build-essential \ - cmake \ - git \ - gdb \ - libeigen3-dev \ - libgl1-mesa-dev \ - libgl1-mesa-glx \ - libglew-dev \ - libglfw3-dev \ - libglu1-mesa-dev \ - libosmesa6-dev \ - libpng-dev \ - lxde \ - mesa-utils \ - ne \ - python3 \ - python3-dev \ - python3-pip \ - python3-tk \ - python3-dbg \ - pybind11-dev \ - software-properties-common \ - x11vnc \ - xorg-dev \ - xterm \ - xvfb && \ - rm -rf /var/lib/apt/lists/* - -RUN pip3 install --upgrade pip -RUN pip3 install \ - matplotlib \ - numpy \ - opencv-python - -EXPOSE 5920 - -ENV HOME=/root - -WORKDIR $HOME -COPY ./setup/.xinitrc . -RUN chmod a+x .xinitrc -COPY ./setup/entrypoint.sh . - -WORKDIR $HOME/open3d - -CMD ["bash", "/root/entrypoint.sh"] diff --git a/util/docker/open3d-xvfb/setup/.xinitrc b/util/docker/open3d-xvfb/setup/.xinitrc deleted file mode 100644 index dc759749fe4..00000000000 --- a/util/docker/open3d-xvfb/setup/.xinitrc +++ /dev/null @@ -1 +0,0 @@ -exec startlxde diff --git a/util/docker/open3d-xvfb/setup/docker_sample.sh b/util/docker/open3d-xvfb/setup/docker_sample.sh deleted file mode 100644 index a8e9695e437..00000000000 --- a/util/docker/open3d-xvfb/setup/docker_sample.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -Xvfb :99 -screen 0 1920x1080x24 & -DISPLAY=:99.0 -export DISPLAY - -python3 ./headless_rendering.py diff --git a/util/docker/open3d-xvfb/setup/entrypoint.sh b/util/docker/open3d-xvfb/setup/entrypoint.sh deleted file mode 100644 index 21377ac4d3e..00000000000 --- a/util/docker/open3d-xvfb/setup/entrypoint.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -# Setup a password -mkdir ~/.vnc -x11vnc -storepasswd 1234 ~/.vnc/passwd - -# start vnc -x11vnc -forever -usepw -create diff --git a/util/docker/open3d-xvfb/tools/attach.sh b/util/docker/open3d-xvfb/tools/attach.sh deleted file mode 100755 index 11cbff290b0..00000000000 --- a/util/docker/open3d-xvfb/tools/attach.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -. ./name.sh - -docker container exec -it $NAME bash diff --git a/util/docker/open3d-xvfb/tools/build.sh b/util/docker/open3d-xvfb/tools/build.sh deleted file mode 100755 index e7458327568..00000000000 --- a/util/docker/open3d-xvfb/tools/build.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -. ./name.sh -./stop.sh - -docker image build -t $NAME .. diff --git a/util/docker/open3d-xvfb/tools/delete.sh b/util/docker/open3d-xvfb/tools/delete.sh deleted file mode 100755 index 1a65fda9834..00000000000 --- a/util/docker/open3d-xvfb/tools/delete.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -. ./name.sh -./stop.sh - -docker image rm $NAME:latest diff --git a/util/docker/open3d-xvfb/tools/name.sh b/util/docker/open3d-xvfb/tools/name.sh deleted file mode 100755 index 307eeed24fc..00000000000 --- a/util/docker/open3d-xvfb/tools/name.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -# get the name of the upper level directory -NAME=$(bash -c 'basename $(cd .. ; pwd)') - -export NAME diff --git a/util/docker/open3d-xvfb/tools/prune.sh b/util/docker/open3d-xvfb/tools/prune.sh deleted file mode 100755 index ec3ab5c5307..00000000000 --- a/util/docker/open3d-xvfb/tools/prune.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -./stop.sh - -docker container prune -docker image prune diff --git a/util/docker/open3d-xvfb/tools/run.sh b/util/docker/open3d-xvfb/tools/run.sh deleted file mode 100755 index 52b98202e82..00000000000 --- a/util/docker/open3d-xvfb/tools/run.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh - -. ./name.sh -./stop.sh - -Open3D_HOST=~/open3d_docker -Open3D_DOCK=/root/open3d - -# create shared folder -mkdir -p $Open3D_HOST - -# clone into existing non-empty directory -# clone Open3D from the host side, build later inside the container -cd $Open3D_HOST -git init -q -git remote add origin https://github.com/intel-isl/Open3D.git -git fetch -git checkout master - -# run container with the shared folder as a bind mount -docker container run \ - --rm \ - -d \ - -v $Open3D_HOST:$Open3D_DOCK \ - -p 5920:5900 \ - -h $NAME \ - --name $NAME \ - $NAME - -docker container exec -it -w $Open3D_DOCK $NAME bash -c 'mkdir -p build && cd build && cmake .. -DCMAKE_INSTALL_PREFIX=~/open3d_install && make -j && make install && bash' diff --git a/util/docker/open3d-xvfb/tools/stop.sh b/util/docker/open3d-xvfb/tools/stop.sh deleted file mode 100755 index 19eb809ec19..00000000000 --- a/util/docker/open3d-xvfb/tools/stop.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -. ./name.sh - -docker container stop -t 0 $NAME diff --git a/util/scripts/install-deps-osx.sh b/util/install_deps_macos.sh similarity index 100% rename from util/scripts/install-deps-osx.sh rename to util/install_deps_macos.sh diff --git a/util/scripts/install-deps-ubuntu.sh b/util/install_deps_ubuntu.sh similarity index 100% rename from util/scripts/install-deps-ubuntu.sh rename to util/install_deps_ubuntu.sh diff --git a/util/scripts/make-documentation.sh b/util/make_documentation.sh similarity index 76% rename from util/scripts/make-documentation.sh rename to util/make_documentation.sh index 3b0cda58353..c7b5c7897df 100755 --- a/util/scripts/make-documentation.sh +++ b/util/make_documentation.sh @@ -1,8 +1,6 @@ #!/usr/bin/env bash # Documentation build scripts for CI # -# To build documentation locally, ignore the xvfb-run and arguments. -# # Prerequisites: # pip install sphinx sphinx-autobuild # sudo apt-get -y install doxygen @@ -10,6 +8,6 @@ set -e curr_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" -pushd ${curr_dir}/../../docs +pushd ${curr_dir}/../docs python make_docs.py --clean_notebooks --execute_notebooks=auto --sphinx --doxygen popd diff --git a/util/scripts/run-ci.sh b/util/run_ci.sh similarity index 100% rename from util/scripts/run-ci.sh rename to util/run_ci.sh diff --git a/util/scripts/build.sh b/util/scripts/build.sh deleted file mode 100755 index 929f7af778a..00000000000 --- a/util/scripts/build.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/usr/bin/env bash -set -e - -echo -echo building... - -./generate.sh - -cd ../../ -cd build -make -j - -# this will copy the libs and headers to ~/open3d_install/lib & ~/open3d_install/include -# make install - -echo diff --git a/util/scripts/clean.sh b/util/scripts/clean.sh deleted file mode 100755 index 02a19ac4f69..00000000000 --- a/util/scripts/clean.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/bin/env bash -set -e - -echo -echo cleaning open3d_install... - -cd ../../ -cd build -make uninstall -cd .. -rm -rf ~/open3d_install/ - -echo -echo cleaning... - -rm -rf build - -# remove the CMake cache -find . -name CMakeFiles -type d -exec rm -rf {} + -find . -name CMakeCache.txt -exec rm -rf {} + -find . -name cmake_install.cmake -exec rm -rf {} + - -echo diff --git a/util/scripts/generate.sh b/util/scripts/generate.sh deleted file mode 100755 index 6130574f23d..00000000000 --- a/util/scripts/generate.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash -set -e - -echo -echo generating... - -cd ../../ -mkdir -p build -cd build - -# you can specify a custom install location and the python version -cmake -DCMAKE_INSTALL_PREFIX=~/open3d_install .. #-DPYTHON_EXECUTABLE=/usr/bin/python3.5 - -echo diff --git a/util/scripts/generate_macos.sh b/util/scripts/generate_macos.sh deleted file mode 100755 index a9aeeca61a7..00000000000 --- a/util/scripts/generate_macos.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/usr/bin/env bash -set -e - -echo -echo generating... - -cd ../../ - -rm -rf build-xcode -mkdir build-xcode -cd build-xcode - -# you can specify a custom install location and the python version -cmake .. -G Xcode -DCMAKE_INSTALL_PREFIX=~/open3d_install/ #-DPYTHON_EXECUTABLE=/usr/bin/python3.5 - -open Open3D.xcodeproj - -echo diff --git a/util/scripts/install-deps-python.sh b/util/scripts/install-deps-python.sh deleted file mode 100755 index 558c0a46e7b..00000000000 --- a/util/scripts/install-deps-python.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env bash -set -e - -# Open3D's Python Tutorial require following packages -# - numpy -# - matplotlib -# - opencv - -# To install these package, try one of the following -while true; do - read -p "Install Python dependencies using pip or conda? (p: pip, c: conda, q: quit) : " pcq - case $pcq in - [Pp]* ) - # for pip users - python -m pip install --user numpy matplotlib opencv-python; - break;; - - [Cc]* ) - # for anaconda users - conda create --name py36_open3d python=3.6 - source activate py36_open3d - conda install -y numpy matplotlib - conda install -y -c conda-forge opencv - break;; - - [Qq]* ) - # quit - exit;; - - * ) - echo "Please answer p or c.";; - esac -done diff --git a/util/scripts/install.sh b/util/scripts/install.sh deleted file mode 100755 index 907a4b59402..00000000000 --- a/util/scripts/install.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash -set -e - -echo -echo installing... - -cd ../../build - -make install - -echo diff --git a/util/scripts/uninstall.sh b/util/scripts/uninstall.sh deleted file mode 100755 index d7aa539869a..00000000000 --- a/util/scripts/uninstall.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash -set -e - -echo -echo installing... - -cd ../../build - -make uninstall - -echo