Merge branch 'next' of https://github.com/Geode-solutions/OpenGeode into epsilon_opti_multilayers_simplifier_integration

Author: BotellaA

.github/workflows/schedule.yml

@@ -2,28 +2,20 @@ name: Schedule
 
 on:
   workflow_dispatch:
+    inputs:
+      branch:
+        type: string
+        default: "master"
   schedule:
     - cron: 0 23 * * *
 
 jobs:
-  schedule-next:
-    if: ${{ github.event_name == 'schedule' }}
+  schedule:
     uses: Geode-solutions/actions/.github/workflows/cpp-schedule.yml@master
     with:
       name: OPENGEODE
       directory: opengeode
-      branch: next
+      branch: ${{ inputs.branch || 'next' }}
     secrets: 
       TOKEN: ${{ secrets.TOKEN }}
       SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
-
-  schedule-master:
-    if: ${{ github.event_name == 'workflow_dispatch' }}
-    uses: Geode-solutions/actions/.github/workflows/cpp-schedule.yml@master
-    with:
-      name: OPENGEODE
-      directory: opengeode
-      branch: master
-    secrets: 
-      TOKEN: ${{ secrets.TOKEN }}
-      SLACK_WEBHOOK_URL: ${{ secrets.SLACK_ECOSYSTEM }}

.gitignore

@@ -1,4 +1,5 @@
 build
 .settings
 .vscode/ipch
-examples/.ipynb*
+examples/.ipynb*
+bindings/python/requirements.txt

.vscode/settings.json

@@ -5,6 +5,7 @@
         "${workspaceFolder}/build/opengeode",
         "${workspaceFolder}/build/third_party/abseil/install/include",
         "${workspaceFolder}/build/third_party/asyncplusplus/install/include",
+        "${workspaceFolder}/build/third_party/earcut/install/include",
         "${workspaceFolder}/build/third_party/bitsery/install/include",
         "${workspaceFolder}/build/third_party/minizip/install/include",
         "${workspaceFolder}/build/third_party/nanoflann/install/include",

bindings/python/requirements.txt

@@ -70,8 +70,12 @@ namespace geode
         pybind11::class_< AttributeBase, std::shared_ptr< AttributeBase > >(
             module, "AttributeBase" )
             .def( "generic_value", &AttributeBase::generic_value )
+            .def( "generic_item_value", &AttributeBase::generic_item_value )
             .def( "properties", &AttributeBase::properties )
-            .def( "is_genericable", &AttributeBase::is_genericable );
+            .def( "is_genericable", &AttributeBase::is_genericable )
+            .def( "nb_items", &AttributeBase::nb_items )
+            .def( "type", &AttributeBase::type )
+            .def( "name", &AttributeBase::name );
         python_attribute_class< bool >( module, "Bool" );
         python_attribute_class< int >( module, "Int" );
         python_attribute_class< unsigned int >( module, "UInt" );

bindings/python/src/basic/attribute.cpp

@@ -0,0 +1,44 @@
+# Copyright (c) 2019 - 2024 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.
+
+set(EARCUT_PATH ${PROJECT_BINARY_DIR}/third_party/earcut)
+set(EARCUT_INSTALL_PREFIX ${EARCUT_PATH}/install)
+ExternalProject_Add(earcut
+    PREFIX ${EARCUT_PATH}
+    SOURCE_DIR ${EARCUT_PATH}/src
+    BINARY_DIR ${EARCUT_PATH}/build
+    STAMP_DIR ${EARCUT_PATH}/stamp
+    GIT_REPOSITORY https://github.com/mapbox/earcut.hpp
+    GIT_TAG a30c14b5676adabe4714ff4173dae8a5d568ab59
+    GIT_SHALLOW ON
+    GIT_PROGRESS ON
+    CMAKE_GENERATOR ${CMAKE_GENERATOR}
+    CMAKE_GENERATOR_PLATFORM ${CMAKE_GENERATOR_PLATFORM}
+    CMAKE_ARGS
+        -DCMAKE_INSTALL_MESSAGE=LAZY
+        -DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}
+    CMAKE_CACHE_ARGS
+        -DCMAKE_INSTALL_PREFIX:PATH=${EARCUT_INSTALL_PREFIX}
+        -DEARCUT_BUILD_TESTS:BOOL=OFF
+        -DEARCUT_BUILD_BENCH:BOOL=OFF
+        -DEARCUT_BUILD_VIZ:BOOL=OFF
+)
+
+ExternalProject_Add_StepTargets(earcut download)

cmake/ConfigureEarcut.cmake

@@ -45,7 +45,7 @@ ExternalProject_Add(opengeode
         -DUSE_SUPERBUILD:BOOL=OFF
         -DASYNCPLUSPLUS_INSTALL_PREFIX:PATH=${ASYNCPLUSPLUS_INSTALL_PREFIX}
         -DBITSERY_INSTALL_PREFIX:PATH=${BITSERY_INSTALL_PREFIX}
-        -DFILESYSTEM_INSTALL_PREFIX:PATH=${FILESYSTEM_INSTALL_PREFIX}
+        -DEARCUT_INSTALL_PREFIX:PATH=${EARCUT_INSTALL_PREFIX}
         -DMINIZIP_INSTALL_PREFIX:PATH=${MINIZIP_INSTALL_PREFIX}
         -DNANOFLANN_INSTALL_PREFIX:PATH=${NANOFLANN_INSTALL_PREFIX}
         -DSPDLOG_INSTALL_PREFIX:PATH=${SPDLOG_INSTALL_PREFIX}
@@ -61,6 +61,7 @@ ExternalProject_Add(opengeode
         abseil
         asyncplusplus
         bitsery
+        earcut
         gdal
         minizip
         nanoflann
@@ -80,6 +81,7 @@ add_custom_target(download
         abseil-download
         asyncplusplus-download
         bitsery-download
+        earcut-download
         gdal-download
         minizip-download
         nanoflann-download

cmake/ConfigureOpenGeode.cmake

@@ -229,7 +229,7 @@ endfunction()
 option(USE_BENCHMARK "Toggle benchmarking of tests" OFF)
 function(add_geode_test)
     cmake_parse_arguments(GEODE_TEST
-        "ESSENTIAL"
+        "ESSENTIAL;UNSTABLE"
         "SOURCE"
         "DEPENDENCIES"
         ${ARGN}
@@ -239,6 +239,8 @@ function(add_geode_test)
     if(${GEODE_TEST_ESSENTIAL})
         add_dependencies(essential ${target_name})
         set_tests_properties(${target_name} PROPERTIES LABELS essential) 
+    elseif(${GEODE_TEST_UNSTABLE})
+        set_tests_properties(${target_name} PROPERTIES LABELS unstable) 
     endif()
     set_tests_properties(${target_name} 
         PROPERTIES 

cmake/CppTargets.cmake

@@ -31,6 +31,7 @@ include(cmake/PythonTargets.cmake)
 find_package(absl REQUIRED CONFIG NO_DEFAULT_PATH PATHS ${ABSEIL_INSTALL_PREFIX})
 find_package(Async++ REQUIRED CONFIG NO_DEFAULT_PATH PATHS ${ASYNCPLUSPLUS_INSTALL_PREFIX})
 find_package(Bitsery REQUIRED CONFIG NO_DEFAULT_PATH PATHS ${BITSERY_INSTALL_PREFIX})
+find_package(earcut_hpp REQUIRED CONFIG NO_DEFAULT_PATH PATHS ${EARCUT_INSTALL_PREFIX})
 find_package(minizip-ng REQUIRED CONFIG NO_DEFAULT_PATH PATHS ${MINIZIP_INSTALL_PREFIX})
 find_package(nanoflann REQUIRED CONFIG NO_DEFAULT_PATH PATHS ${NANOFLANN_INSTALL_PREFIX})
 find_package(spdlog REQUIRED CONFIG NO_DEFAULT_PATH PATHS ${SPDLOG_INSTALL_PREFIX})
@@ -52,6 +53,7 @@ install(
 if(NOT BUILD_SHARED_LIBS)
     install(
         DIRECTORY
+            ${EARCUT_INSTALL_PREFIX}/
             ${MINIZIP_INSTALL_PREFIX}/
             ${NANOFLANN_INSTALL_PREFIX}/
             ${SPDLOG_INSTALL_PREFIX}/

cmake/OpenGeode.cmake

@@ -39,10 +39,10 @@ include(CMakeFindDependencyMacro)
 find_dependency(absl)
 find_dependency(Bitsery)
 find_dependency(Threads)
+find_dependency(Async++)
 
 get_target_property(library_type OpenGeode::basic TYPE)
 if(library_type STREQUAL "STATIC_LIBRARY")
-    find_dependency(Async++)
     find_dependency(minizip-ng)
     find_dependency(nanoflann)
     find_dependency(spdlog)