Merge branch 'v4'

Geode-solutions · Jan 30, 2020 · 0d677d7 · 0d677d7
2 parents c53eec7 + 4a912e6
commit 0d677d7
Show file tree

Hide file tree

Showing 397 changed files with 9,280 additions and 2,103 deletions.
diff --git a/.github/workflows/CD.yml b/.github/workflows/CD.yml
@@ -7,7 +7,13 @@ on:
 jobs:      
   release-ubuntu:
     runs-on: ubuntu-18.04
-
+    container: ${{ matrix.config.container }}
+    strategy:
+      matrix:
+        config:
+        - {container: "geodesolutions/ubuntu", system: "ubuntu", doc: true}
+        - {container: "geodesolutions/centos", system: "RHEL", doc: false}
+
     steps:
     - uses: actions/checkout@v1
     - name: Generate package
@@ -18,17 +24,18 @@ jobs:
         cd build
         version="${GITHUB_REF##*/*/}"
         echo ::set-output name=version::$version
-        cmake -DCMAKE_BUILD_TYPE=Release -DOPENGEODE_WITH_TESTS:BOOL=OFF -DCPACK_PACKAGE_VERSION:STRING=$version ..
+        cmake -DCMAKE_BUILD_TYPE=Release -DOPENGEODE_WITH_PYTHON:BOOL=ON -DOPENGEODE_WITH_TESTS:BOOL=OFF -DCPACK_PACKAGE_VERSION:STRING=$version -DCPACK_SYSTEM_NAME:STRING=${{ matrix.config.system }} ..
         cmake --build . -- -j2
         cd opengeode
         cmake --build . --target package
     - name: Upload
       uses: softprops/action-gh-release@v1
       with:
-        files: "build/opengeode/OpenGeode-${{ steps.package.outputs.version }}-Linux.tar.gz"
+        files: "build/opengeode/OpenGeode-${{ steps.package.outputs.version }}-${{ matrix.config.system }}.tar.gz"
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     - name: Doc
+      if: matrix.config.doc
       run: curl -s https://raw.githubusercontent.com/Geode-solutions/actions/master/doc/doc.sh | bash -s -- ${GITHUB_WORKSPACE}/build/opengeode
       env:
         GITHUB_TOKEN: ${{ secrets.TOKEN }}
@@ -53,7 +60,7 @@ jobs:
         cd build
         version="${GITHUB_REF##*/*/}"
         echo ::set-output name=version::$version
-        cmake -G "Xcode" -DCMAKE_BUILD_TYPE=Release -DOPENGEODE_WITH_TESTS:BOOL=OFF -DCPACK_PACKAGE_VERSION:STRING=$version ..
+        cmake -G "Xcode" -DCMAKE_BUILD_TYPE=Release -DOPENGEODE_WITH_PYTHON:BOOL=ON -DOPENGEODE_WITH_TESTS:BOOL=OFF -DCPACK_PACKAGE_VERSION:STRING=$version ..
         cmake --build . --config Release
         cd opengeode
         cmake --build . --target package --config Release
@@ -84,7 +91,7 @@ jobs:
         cd build
         version="${GITHUB_REF##*/*/}"
         echo ::set-output name=version::$version
-        cmake -G "Visual Studio 15 2017 Win64" -DOPENGEODE_WITH_TESTS:BOOL=OFF -DCPACK_PACKAGE_VERSION:STRING=$version ..
+        cmake -G "Visual Studio 15 2017 Win64" -DOPENGEODE_WITH_PYTHON:BOOL=ON -DOPENGEODE_WITH_TESTS:BOOL=OFF -DCPACK_PACKAGE_VERSION:STRING=$version ..
         cmake --build . --config Release
         cd opengeode
         cmake --build . --target PACKAGE --config Release

diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -18,44 +18,33 @@ jobs:
 
   build-ubuntu:
     runs-on: ubuntu-18.04
+    container: ${{ matrix.config.container }}
     needs: format
     strategy:
       matrix:
         config:
-        - {cc: gcc, cxx: g++, cmake_args: "-DCMAKE_BUILD_TYPE=Debug", coverage: true, benchmark: false}
-        - {cc: gcc, cxx: g++, cmake_args: "-DCMAKE_BUILD_TYPE=Release -DUSE_BENCHMARK=ON", coverage: false, benchmark: true}
-        - {cc: clang, cxx: clang++, cmake_args: "-DCMAKE_BUILD_TYPE=Debug", coverage: false, benchmark: false}
-        - {cc: clang, cxx: clang++, cmake_args: "-DCMAKE_BUILD_TYPE=Release", coverage: false, benchmark: false}
+        - {container: "geodesolutions/ubuntu", cmake_args: "-DCMAKE_BUILD_TYPE=Debug", benchmark: false}
+        - {container: "geodesolutions/ubuntu", cmake_args: "-DCMAKE_BUILD_TYPE=Release -DUSE_BENCHMARK=ON", benchmark: true}
+        - {container: "geodesolutions/centos", cmake_args: "-DCMAKE_BUILD_TYPE=Debug", benchmark: false}
+        - {container: "geodesolutions/centos", cmake_args: "-DCMAKE_BUILD_TYPE=Release", benchmark: false}
 
     steps:
     - uses: actions/checkout@v1
     - name: Compile
       run: |
         mkdir -p build
         cd build
-        cmake ${{ matrix.config.cmake_args }} ..
+        cmake ${{ matrix.config.cmake_args }} -DOPENGEODE_WITH_PYTHON:BOOL=ON ..
         cmake --build . -- -j2
-      env:
-        CC: ${{ matrix.config.cc }}
-        CXX: ${{ matrix.config.cxx }}
+        cd opengeode        
+        ctest --output-on-failure
     - name: Test
       run: |
         mkdir -p test
         cd test
         cmake ${{ matrix.config.cmake_args }} -DCMAKE_PREFIX_PATH:PATH=$GITHUB_WORKSPACE/build/opengeode/install ../tests
         cmake --build . -- -j2
         ctest --output-on-failure
-      env:
-        CC: ${{ matrix.config.cc }}
-        CXX: ${{ matrix.config.cxx }}
-    - name: Kcov
-      run: curl -s https://raw.githubusercontent.com/Geode-solutions/actions/master/kcov.sh | bash -s -- ${GITHUB_WORKSPACE}/build/opengeode/bin
-      if: matrix.config.coverage && (github.event_name == 'pull_request' || github.ref == 'refs/heads/master')
-    - uses: codecov/[email protected]
-      if: matrix.config.coverage && (github.event_name == 'pull_request' || github.ref == 'refs/heads/master')
-      with: 
-        token: ${{ secrets.CODECOV_TOKEN }}
-        file: kcov/kcov-merged/cobertura.xml
     - uses: Geode-solutions/actions/benchmark@master
       if: matrix.config.benchmark && github.ref == 'refs/heads/master' && github.event_name == 'push'
       with:
@@ -71,31 +60,33 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
 
-  build-mac:
-    runs-on: macos-latest
+  coverage:
+    runs-on: ubuntu-18.04
     needs: format
-    strategy:
-      matrix:
-        config: [Debug, Release]
+    if: (github.event_name == 'pull_request' || github.ref == 'refs/heads/master')
 
     steps:
     - uses: actions/checkout@v1
-    - name: Compile & Test
+    - name: Compile
       run: |
         mkdir -p build
         cd build
-        cmake -DCMAKE_BUILD_TYPE=${{ matrix.config }} ..
-        cmake --build .
-        cd opengeode
-        ctest --output-on-failure
+        cmake -DCMAKE_BUILD_TYPE=Debug ..
+        cmake --build . -- -j2
+    - name: Kcov
+      run: curl -s https://raw.githubusercontent.com/Geode-solutions/actions/master/kcov.sh | bash -s -- ${GITHUB_WORKSPACE}/build/opengeode/bin
+    - uses: codecov/[email protected]
+      with: 
+        token: ${{ secrets.CODECOV_TOKEN }}
+        file: kcov/kcov-merged/cobertura.xml
     - name: Notify slack
       if: failure() && github.ref == 'refs/heads/master'
       uses: 8398a7/action-slack@v2
       with:
         status: failure
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} 
+        SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
 
   build-mac-xcode:
     runs-on: macos-latest
@@ -110,7 +101,7 @@ jobs:
       run: |
         mkdir -p build
         cd build
-        cmake -G "Xcode" ..
+        cmake -G "Xcode"  -DOPENGEODE_WITH_PYTHON:BOOL=ON ..
         cmake --build . --config ${{ matrix.config }}
         cd opengeode
         ctest -C ${{ matrix.config }} --output-on-failure
@@ -136,7 +127,7 @@ jobs:
       run: |
         mkdir -p build
         cd build
-        cmake -G "Visual Studio 15 2017 Win64" ..
+        cmake -G "Visual Studio 15 2017 Win64" -DOPENGEODE_WITH_PYTHON:BOOL=ON ..
         cmake --build . --config ${{ matrix.config }}
         cd opengeode
         ctest -C ${{ matrix.config }} --output-on-failure
@@ -151,7 +142,7 @@ jobs:
 
   semantic-release:
     runs-on: ubuntu-18.04
-    needs: [build-ubuntu, build-mac, build-mac-xcode, build-windows]
+    needs: [build-ubuntu, coverage, build-mac-xcode, build-windows]
     steps:
     - uses: actions/checkout@v1
     - run: npx semantic-release

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -3,11 +3,13 @@
     "C_Cpp.default.includePath": [
         "${workspaceFolder}/include",
         "${workspaceFolder}/build/opengeode",
+        "${workspaceFolder}/build/third_party/abseil/install/include",
+        "${workspaceFolder}/build/third_party/asyncplusplus/install/include",
         "${workspaceFolder}/build/third_party/bitsery/install/include",
         "${workspaceFolder}/build/third_party/ghcFilesystem/install/include",
         "${workspaceFolder}/build/third_party/minizip/install/include",
         "${workspaceFolder}/build/third_party/nanoflann/install/include",
-        "${workspaceFolder}/build/third_party/asyncplusplus/install/include",
+        "${workspaceFolder}/build/third_party/pybind11/install/include",
         "${workspaceFolder}/build/third_party/spdlog/install/include"
     ],
     "files.watcherExclude": {

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (c) 2019 Geode-solutions
+# Copyright (c) 2019 - 2020 Geode-solutions
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -18,13 +18,14 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-cmake_minimum_required(VERSION 3.7.2)
+cmake_minimum_required(VERSION 3.11)
 
 #-------------------------------------------------------------------------------
 # Project options
 
 # Optional components
 option(OPENGEODE_WITH_TESTS "Compile test projects" ON)
+option(OPENGEODE_WITH_PYTHON "Compile Python bindings" OFF)
 
 # Internal options
 option(USE_SUPERBUILD "Whether or not a superbuild should be invoked" ON)

diff --git a/COPYLEFT b/COPYLEFT
@@ -1,43 +1,35 @@
 ## Dependencies
 
+Abseil: Apache-2.0
+Copyright 2017 The Abseil Authors.
+
 Async++: MIT
+Copyright (c) 2015 Amanieu d'Antras
+
 Bitsery: MIT
+Copyright (c) 2018 Mindaugas Vinkelis
+
 Filesystem: BSD-3-Clause
+Copyright (c) 2018, Steffen Schümann <[email protected]>. All rights reserved.
+
 Minizip: Zlib
+Copyright (C) 2010-2019 Nathan Moinvaziri
+
 Nanoflann: BSD
+Copyright 2008-2009  Marius Muja ([email protected]). All rights reserved.
+Copyright 2008-2009  David G. Lowe ([email protected]). All rights reserved.
+Copyright 2011 Jose L. Blanco ([email protected]). All rights reserved.
+
 Spdlog: MIT
+Copyright (c) 2016 Gabi Melman. 
+
+## Bindings
+
+Pybind11: BSD-3-Clause
+Copyright (c) 2016 The Pybind Development Team, All rights reserved.
 
 ## Legacy
+
 RINGMesh: BSD-3-Clause
 Copyright (c) 2012-2018, Association Scientifique pour la Geologie et ses
 Applications (ASGA). All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-    * Neither the name of ASGA nor the
-      names of its contributors may be used to endorse or promote products
-      derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL ASGA BE LIABLE FOR ANY DIRECT,
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-    http://www.ring-team.org
-
-    RING Project
-    Ecole Nationale Superieure de Geologie - GeoRessources
-    2 Rue du Doyen Marcel Roubault - TSA 70605
-    54518 VANDOEUVRE-LES-NANCY
-    FRANCE
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2019 Geode-solutions
+Copyright (c) 2019 - 2020 Geode-solutions
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/README.md b/README.md
@@ -10,7 +10,8 @@
 
 <p align="center">
   <img src="https://img.shields.io/static/v1?label=Windows&logo=windows&logoColor=white&message=support&color=success" alt="Windows support">
-  <img src="https://img.shields.io/static/v1?label=Linux&logo=linux&logoColor=white&message=support&color=success" alt="Linux support">
+  <img src="https://img.shields.io/static/v1?label=Ubuntu&logo=Ubuntu&logoColor=white&message=support&color=success" alt="Ubuntu support">
+  <img src="https://img.shields.io/static/v1?label=Red%20Hat&logo=Red-Hat&logoColor=white&message=support&color=success" alt="Red Hat support">
   <img src="https://img.shields.io/static/v1?label=macOS&logo=apple&logoColor=white&message=support&color=success" alt="macOS support">
 </p>
 
@@ -71,4 +72,4 @@ Detailed changes for each release are documented in the [release notes](https://
 
 [MIT](https://opensource.org/licenses/MIT)
 
-Copyright (c) 2019-present, Geode-solutions
+Copyright (c) 2019 - 2020-present, Geode-solutions
diff --git a/bindings/python/CMakeLists.txt b/bindings/python/CMakeLists.txt
@@ -0,0 +1,27 @@
+# Copyright (c) 2019 - 2020 Geode-solutions
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+find_package(pybind11 REQUIRED CONFIG NO_DEFAULT_PATH PATHS ${PYBIND11_INSTALL_PREFIX})
+
+add_subdirectory(src)
+
+if(OPENGEODE_WITH_TESTS)
+    add_subdirectory(tests)
+endif()
diff --git a/bindings/python/src/CMakeLists.txt b/bindings/python/src/CMakeLists.txt
@@ -0,0 +1,24 @@
+# Copyright (c) 2019 - 2020 Geode-solutions
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+add_subdirectory(basic)
+add_subdirectory(geometry)
+add_subdirectory(mesh)
+add_subdirectory(model)
diff --git a/bindings/python/src/basic/CMakeLists.txt b/bindings/python/src/basic/CMakeLists.txt
@@ -0,0 +1,30 @@
+# Copyright (c) 2019 - 2020 Geode-solutions
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+add_geode_python_binding(
+    NAME "py_basic"
+    SOURCES
+        "basic.cpp"
+        "attribute.h"
+        "attribute_manager.h"
+        "uuid.h"
+    DEPENDENCIES
+        ${PROJECT_NAME}::basic
+)