Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

clean up util folder #2146

Merged
merged 3 commits into from
Aug 7, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions .github/workflows/ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
14 changes: 3 additions & 11 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
8 changes: 4 additions & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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}."
)

Expand All @@ -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.
Expand All @@ -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)
Expand Down
8 changes: 4 additions & 4 deletions docs/compilation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand Down Expand Up @@ -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 <https://brew.sh/>`_
Run ``util/install_deps_macos.sh``. We use `homebrew <https://brew.sh/>`_
to manage dependencies. Follow the instructions from the script.

2. Setup Python binding environments
Expand Down Expand Up @@ -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.

Expand Down
2 changes: 1 addition & 1 deletion docs/getting_started.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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.
1 change: 0 additions & 1 deletion docs/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
146 changes: 0 additions & 146 deletions docs/tutorial/docker/docker-gui.rst

This file was deleted.

Loading