Merge branch 'master' into alecjacobson-patch-1

Author: alecjacobson

.gitignore

@@ -33,3 +33,6 @@ ttt.py
 htmlcov
 junit
 .ipynb_checkpoints/tutorials-checkpoint.ipynb
+.*.un~
+.*.swp
+.*.swo

CMakeLists.txt

@@ -1,8 +1,4 @@
-# set(CMAKE_TRY_COMPILE_TARGET_TYPE "STATIC_LIBRARY")
-# SET(CMAKE_C_COMPILER_WORKS 1)
-# SET(CMAKE_CXX_COMPILER_WORKS 1)
-
-cmake_minimum_required(VERSION 3.2)
+cmake_minimum_required(VERSION 3.16.0)
 project(pyigl)
 
 if (NOT DEFINED ${PYLIBIGL_EXTERNAL})
@@ -19,85 +15,39 @@ include(Warnings)
 # Use C++11/14
 include(CXXFeatures)
 
-
-
-
-MESSAGE(STATUS "I am here!")
-
-
-
-# LibIGL
-option(LIBIGL_USE_STATIC_LIBRARY    "Use libigl as static library" OFF)
-option(LIBIGL_WITH_ANTTWEAKBAR      "Use AntTweakBar"    OFF)
-option(LIBIGL_WITH_CGAL             "Use CGAL"           OFF)
-option(LIBIGL_WITH_COMISO           "Use CoMiso"         OFF)
-option(LIBIGL_WITH_CORK             "Use Cork"           OFF)
-option(LIBIGL_WITH_EMBREE           "Use Embree"         OFF)
-option(LIBIGL_WITH_LIM              "Use LIM"            OFF)
-option(LIBIGL_WITH_MATLAB           "Use Matlab"         OFF)
-option(LIBIGL_WITH_MOSEK            "Use MOSEK"          OFF)
-option(LIBIGL_WITH_NANOGUI          "Use Nanogui menu"   OFF)
-option(LIBIGL_WITH_OPENGL           "Use OpenGL"         OFF)
-option(LIBIGL_WITH_OPENGL_GLFW      "Use GLFW"           OFF)
-option(LIBIGL_WITH_PNG              "Use PNG"            OFF)
-option(LIBIGL_WITH_TETGEN           "Use Tetgen"         OFF)
-option(LIBIGL_WITH_TRIANGLE         "Use Triangle"       OFF)
-option(LIBIGL_WITH_PREDICATES       "Use exact predicates"   ON)
-option(LIBIGL_WITH_VIEWER           "Use OpenGL viewer"  OFF)
-option(LIBIGL_WITH_XML              "Use XML"            OFF)
-
 option(PY_IGL_PYTHON_TESTS          "Run Python tests"   ON)
-option(PY_IGL_COPYLEFT              "Builds Copyleft"    OFF)
-
-if(PY_IGL_COPYLEFT)
-  SET(LIBIGL_WITH_TETGEN ON CACHE BOOL "" FORCE)
-  SET(LIBIGL_WITH_TRIANGLE ON CACHE BOOL "" FORCE)
-endif()
 
 include(PyiglDependencies)
 
-
 if(NOT TARGET igl::core)
   include(libigl)
 endif()
 
-
 # NumpyEigen
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PYLIBIGL_EXTERNAL}/numpyeigen/cmake)
 # Generate position independent code by default
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 include(numpyeigen)
 
-
 # A module for writing bindings with our framework
 file(GLOB PYIGL_SOURCES src/*.cpp)
 
-if(PY_IGL_COPYLEFT)
-  file(GLOB PYIGL_SOURCES_COPYLEFT copyleft/*.cpp)
-endif()
-
 npe_add_module(pyigl
   BINDING_SOURCES
   ${PYIGL_SOURCES}
   ${PYIGL_SOURCES_COPYLEFT})
 
 #TODO move additional libs to variable
-target_link_libraries(pyigl PRIVATE igl::core igl::predicates)
-if(PY_IGL_COPYLEFT)
-  target_link_libraries(pyigl PRIVATE igl::triangle igl::tetgen)
-endif()
+target_link_libraries(pyigl PRIVATE igl::core)
 target_include_directories(pyigl PRIVATE "src/include")
 
-
 add_library(pyigl_classes MODULE classes/classes.cpp)
 target_link_libraries(pyigl_classes PRIVATE npe igl::core)
 target_link_libraries(pyigl_classes PRIVATE pybind11::module)
 set_target_properties(pyigl_classes PROPERTIES PREFIX "${PYTHON_MODULE_PREFIX}" SUFFIX "${PYTHON_MODULE_EXTENSION}")
 target_include_directories(pyigl_classes PRIVATE "src/include")
 target_include_directories(pyigl_classes PRIVATE "${PYLIBIGL_EXTERNAL}/numpyeigen/src")
 
-
-
 # Sort projects inside the solution
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 
@@ -110,7 +60,6 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
 	endforeach()
 endif()
 
-
 # set(Python_ADDITIONAL_VERSIONS 3.4 3.5 3.6)
 # find_package(PythonLibs REQUIRED)
 # find_package(PythonInterp REQUIRED)

README.md

@@ -1,4 +1,4 @@
-# *New* LibIGL Python Bindings
+# libigl Python Bindings
 [![Build Status](https://travis-ci.com/libigl/libigl-python-bindings.svg?branch=master)](https://travis-ci.com/libigl/libigl-python-bindings)
 [![Build Status](https://dev.azure.com/libigl/Libigl/_apis/build/status/libigl.libigl-python-bindings?branchName=master)](https://dev.azure.com/libigl/Libigl/_build/latest?definitionId=1&branchName=master)
 
@@ -26,9 +26,9 @@ python setup.py install
 * A *temporary* tutorial on how to use the bindings can be found [here](https://libigl.github.io/libigl-python-bindings/tutorials/)
 * A *temporary* function reference can be found [here](https://libigl.github.io/libigl-python-bindings/igl_docs/)
 
-
 ## Compiling and modifying the bindiings
 After installing numpy & scipy and then cloning this repository, you can compile the bindings from scratch by running:
+
 ```
 python setup.py develop
 ```
@@ -46,4 +46,3 @@ python setup.py test
 ```
 
 
-

azure-pipelines.yml

@@ -7,24 +7,36 @@ jobs:
   timeoutInMinutes: 0
   strategy:
     matrix:
-      mac35:
-        imageName: 'macos-10.14'
-        python.version: '3.5'
       mac36:
-        imageName: 'macos-10.14'
+        imageName: 'macos-10.15'
         python.version: '3.6'
       mac37:
-        imageName: 'macos-10.14'
+        imageName: 'macos-10.15'
         python.version: '3.7'
-      windows35:
-        imageName: 'vs2017-win2016'
-        python.version: '3.5'
+      mac38:
+        imageName: 'macos-10.15'
+        python.version: '3.8'
+      mac39:
+        imageName: 'macos-10.15'
+        python.version: '3.9'
+      mac310:
+        imageName: 'macos-10.15'
+        python.version: '3.10'
       windows36:
-        imageName: 'vs2017-win2016'
+        imageName: 'windows-2019'
         python.version: '3.6'
       windows37:
-        imageName: 'vs2017-win2016'
+        imageName: 'windows-2019'
         python.version: '3.7'
+      windows38:
+        imageName: 'windows-2019'
+        python.version: '3.8'
+      windows39:
+        imageName: 'windows-2019'
+        python.version: '3.9'
+      windows310:
+        imageName: 'windows-2019'
+        python.version: '3.10'
 
   pool:
     vmImage: $(imageName)

cmake/PyiglDependencies.cmake

@@ -16,8 +16,14 @@ include(PyiglDownloadExternal)
 
 SET(NPE_WITH_EIGEN ${PYLIBIGL_EXTERNAL}/libigl/external/eigen)
 
-pyigl_download_igl()
-find_package(LIBIGL REQUIRED)
+include(FetchContent)
+FetchContent_Declare(
+    libigl
+    GIT_REPOSITORY https://github.com/libigl/libigl.git
+    GIT_TAG 238a607032d725cbf1b99cad2077516b1ee066d8
+)
+FetchContent_MakeAvailable(libigl)
+
 pyigl_download_numpyeigen()
 pyigl_download_tutorial_data()
 

cmake/PyiglDownloadExternal.cmake

@@ -23,15 +23,6 @@ endfunction()
 
 ################################################################################
 
-## libigl
-function(pyigl_download_igl)
-    pyigl_download_project(libigl
-        GIT_REPOSITORY https://github.com/libigl/libigl.git
-        GIT_TAG        c60a948e7d1434b8ab7b792cdb606095ad7cd894
-    )
-endfunction()
-
-
 ## numpyeigen
 function(pyigl_download_numpyeigen)
     pyigl_download_project(numpyeigen

setup.py

@@ -46,35 +46,37 @@ def build_extension(self, ext):
 
         if platform.system() == "Windows":
             cmake_args += ['-DCMAKE_LIBRARY_OUTPUT_DIRECTORY_{}={}'.format(cfg.upper(), extdir)]
-            if os.environ.get('CMAKE_GENERATOR') != "NMake Makefiles" and "Ninja" not in os.environ.get('CMAKE_GENERATOR'):
+            cmake_generator = os.environ.get('CMAKE_GENERATOR', '')
+            if cmake_generator != "NMake Makefiles" and "Ninja" not in cmake_generator:
                 if sys.maxsize > 2**32:
                     cmake_args += ['-A', 'x64']
                 # build_args += ['--', '/m']
         else:
             build_args += ['--', '-j2']
 
-        tmp = os.environ.get("AR")
+
+        tmp = os.environ.get("AR", "")
         if "arm64-apple" in tmp:
-            tmp = os.environ.get("CMAKE_ARGS")
+            tmp = os.environ.get("CMAKE_ARGS", "")
             if tmp:
                 cmake_args += tmp.split(" ")
 
-            tmp = os.environ.get("CC")
+            tmp = os.environ.get("CC", "")
             print("C compiler", tmp)
             if tmp:
                 cmake_args += ["-DCMAKE_C_COMPILER={}".format(tmp)]
 
-            tmp = os.environ.get("CXX")
+            tmp = os.environ.get("CXX", "")
             print("CXX compiler", tmp)
             if tmp:
                 cmake_args += ["-DCMAKE_CXX_COMPILER={}".format(tmp)]
         else:
-            tmp = os.getenv('CC_FOR_BUILD')
+            tmp = os.getenv('CC_FOR_BUILD', '')
             if tmp:
                 print("Setting c compiler to", tmp)
                 cmake_args += ["-DCMAKE_C_COMPILER=" + tmp]
 
-            tmp = os.getenv('CXX_FOR_BUILD')
+            tmp = os.getenv('CXX_FOR_BUILD', '')
             if tmp:
                 print("Setting cxx compiler to", tmp)
                 cmake_args += ["-DCMAKE_CXX_COMPILER="+ tmp]
@@ -84,14 +86,14 @@ def build_extension(self, ext):
 
 
 
-        tmp = os.getenv("target_platform")
+        tmp = os.getenv("target_platform", "")
         if tmp:
             print("target platfrom", tmp)
             if "arm" in tmp:
                 cmake_args += ["-DCMAKE_OSX_ARCHITECTURES=arm64"]
 
         # print(cmake_args)
-        # tmp = os.getenv('CMAKE_ARGS')
+        # tmp = os.getenv('CMAKE_ARGS', '')
 
         # if tmp:
         #     tmp = tmp.split(" ")

src/delaunay_triangulation.cpp

@@ -58,7 +58,7 @@ npe_doc(ds_flip_avoiding_line_search)
 npe_arg(f, dense_int, dense_long)
 npe_arg(cur_v, dense_float, dense_double)
 npe_arg(dst_v, npe_matches(cur_v))
-npe_arg(energy, std::function<double(Eigen::MatrixXd)>)
+npe_arg(energy, std::function<double(Eigen::MatrixXd&)>)
 npe_arg(cur_energy, double)
 
 npe_begin_code()