conda build and install from local working on osx

tomvanmele · tomvanmele · commit 337102790e2b · 2020-04-30T16:22:27.000+02:00
diff --git a/AUTHORS.md b/AUTHORS.md
@@ -1,3 +1,3 @@
+# Authors
+
 - Tom Van Mele <<van.mele@arch.ethz.ch>> [@brgcode](https://github.com/brgcode), [@tomvanmele](https://github.com/tomvanmele)
-- Tomás Méndez Echenagucia <<mendez@arch.ethz.ch>> [@tmsmendez](https://github.com/tmsmendez)
-- Matthias Rippmann <<rippmann@arch.ethz.ch>> [@Rippmann](https://github.com/Rippmann)
diff --git a/modules/CMakeLists.txt b/modules/CMakeLists.txt
@@ -5,4 +5,4 @@ add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/isolines)
 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/triangulation)
 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/geodistance)
 # add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/csgtree)
-# add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/booleans)
+add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/booleans)
diff --git a/modules/booleans/CMakeLists.txt b/modules/booleans/CMakeLists.txt
@@ -1,13 +1,8 @@
 cmake_minimum_required(VERSION 3.14)
-project(booleans)
+project(compas_libigl_booleans)
 set(CMAKE_CXX_STANDARD 11)
 
-pybind11_add_module(booleans MODULE booleans.cpp)
+pybind11_add_module(compas_libigl_booleans MODULE booleans.cpp)
 
-target_link_libraries(booleans PRIVATE igl::core)
-target_link_libraries(booleans PRIVATE igl::cgal)
-
-set_target_properties(booleans PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/src/compas_libigl/booleans")
-set_target_properties(booleans PROPERTIES LIBRARY_OUTPUT_DIRECTORY_RELEASE "${CMAKE_SOURCE_DIR}/src/compas_libigl/booleans")
-
-configure_file(__init__.py "${CMAKE_SOURCE_DIR}/src/compas_libigl/booleans/__init__.py" COPYONLY)
+target_link_libraries(compas_libigl_booleans PRIVATE igl::core)
+target_link_libraries(compas_libigl_booleans PRIVATE igl::cgal)
diff --git a/modules/booleans/__init__.py b/modules/booleans/__init__.py
@@ -4,10 +4,10 @@
 
 import numpy as np
 
-from .booleans import mesh_union as _mesh_union
-from .booleans import mesh_difference as _mesh_difference
-from .booleans import mesh_symmetric_difference as _mesh_symmetric_difference
-from .booleans import mesh_intersection as _mesh_intersection
+from compas_libigl_booleans import mesh_union as _mesh_union
+from compas_libigl_booleans import mesh_difference as _mesh_difference
+from compas_libigl_booleans import mesh_symmetric_difference as _mesh_symmetric_difference
+from compas_libigl_booleans import mesh_intersection as _mesh_intersection
 
 
 def mesh_union(A, B):
diff --git a/modules/booleans/booleans.cpp b/modules/booleans/booleans.cpp
@@ -73,7 +73,7 @@ Mesh mesh_symmetric_difference(RowMatrixXd VA, RowMatrixXi FA, RowMatrixXd VB, R
 
     igl::copyleft::cgal::mesh_boolean(VA, FA, VB, FB, igl::MESH_BOOLEAN_TYPE_XOR, VC, FC, J);
 
-    Mesh mesh; 
+    Mesh mesh;
 
     mesh.vertices = VC;
     mesh.faces = FC;
@@ -83,7 +83,7 @@ Mesh mesh_symmetric_difference(RowMatrixXd VA, RowMatrixXi FA, RowMatrixXd VB, R
 
 using namespace pybind11::literals;
 
-PYBIND11_MODULE(booleans, m) {
+PYBIND11_MODULE(compas_libigl_booleans, m) {
     m.def("mesh_union", &mesh_union, "VA"_a.noconvert(), "FA"_a.noconvert(), "VB"_a.noconvert(), "FB"_a.noconvert());
     m.def("mesh_difference", &mesh_difference, "VA"_a.noconvert(), "FA"_a.noconvert(), "VB"_a.noconvert(), "FB"_a.noconvert());
     m.def("mesh_intersection", &mesh_intersection, "VA"_a.noconvert(), "FA"_a.noconvert(), "VB"_a.noconvert(), "FB"_a.noconvert());
diff --git a/modules/geodistance/CMakeLists.txt b/modules/geodistance/CMakeLists.txt
@@ -1,12 +1,11 @@
 cmake_minimum_required(VERSION 3.14)
-project(geodistance)
+project(compas_libigl_geodistance)
 set(CMAKE_CXX_STANDARD 11)
 
-pybind11_add_module(geodistance MODULE geodistance.cpp)
+pybind11_add_module(compas_libigl_geodistance MODULE geodistance.cpp)
 
-target_link_libraries(geodistance PRIVATE igl::core)
+target_link_libraries(compas_libigl_geodistance PRIVATE igl::core)
 
-set_target_properties(geodistance PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/src/compas_libigl/geodistance")
-set_target_properties(geodistance PROPERTIES LIBRARY_OUTPUT_DIRECTORY_RELEASE "${CMAKE_SOURCE_DIR}/src/compas_libigl/geodistance")
-
-configure_file(__init__.py "${CMAKE_SOURCE_DIR}/src/compas_libigl/geodistance/__init__.py" COPYONLY)
+#set_target_properties(geodistance PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/src/compas_libigl/geodistance")
+#set_target_properties(geodistance PROPERTIES LIBRARY_OUTPUT_DIRECTORY_RELEASE "${CMAKE_SOURCE_DIR}/src/compas_libigl/geodistance")
+#configure_file(__init__.py "${CMAKE_SOURCE_DIR}/src/compas_libigl/geodistance/__init__.py" COPYONLY)
diff --git a/modules/geodistance/__init__.py b/modules/geodistance/__init__.py
@@ -4,8 +4,8 @@
 
 import numpy as np
 
-from .geodistance import trimesh_geodistance_exact as _exact
-from .geodistance import trimesh_geodistance_heat as _heat
+from compas_libigl_geodistance import trimesh_geodistance_exact as _exact
+from compas_libigl_geodistance import trimesh_geodistance_heat as _heat
 
 
 def trimesh_geodistance(M, source, method='exact'):
diff --git a/modules/geodistance/geodistance.cpp b/modules/geodistance/geodistance.cpp
@@ -45,7 +45,7 @@ Eigen::VectorXd trimesh_geodistance_heat(RowMatrixXd V, RowMatrixXi F, int vid)
 
 using namespace pybind11::literals;
 
-PYBIND11_MODULE(geodistance, m) {
+PYBIND11_MODULE(compas_libigl_geodistance, m) {
     m.def("trimesh_geodistance_exact", &trimesh_geodistance_exact, "V"_a.noconvert(), "F"_a.noconvert(), "vid"_a);
     m.def("trimesh_geodistance_heat", &trimesh_geodistance_heat, "V"_a.noconvert(), "F"_a.noconvert(), "vid"_a);
 }
diff --git a/modules/isolines/CMakeLists.txt b/modules/isolines/CMakeLists.txt
@@ -1,15 +1,11 @@
 cmake_minimum_required(VERSION 3.14)
-project(isolines)
+project(compas_libigl_isolines)
 set(CMAKE_CXX_STANDARD 11)
 
-pybind11_add_module(isolines MODULE isolines.cpp)
+pybind11_add_module(compas_libigl_isolines MODULE isolines.cpp)
 
-target_link_libraries(isolines PRIVATE igl::core)
+target_link_libraries(compas_libigl_isolines PRIVATE igl::core)
 
-set_target_properties(isolines PROPERTIES
-    LIBRARY_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/src/compas_libigl/isolines")
-
-set_target_properties(isolines PROPERTIES
-    LIBRARY_OUTPUT_DIRECTORY_RELEASE "${CMAKE_SOURCE_DIR}/src/compas_libigl/isolines")
-
-configure_file(__init__.py "${CMAKE_SOURCE_DIR}/src/compas_libigl/isolines/__init__.py" COPYONLY)
+#set_target_properties(isolines PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/src/compas_libigl/isolines")
+#set_target_properties(isolines PROPERTIES LIBRARY_OUTPUT_DIRECTORY_RELEASE "${CMAKE_SOURCE_DIR}/src/compas_libigl/isolines")
+#configure_file(__init__.py "${CMAKE_SOURCE_DIR}/src/compas_libigl/isolines/__init__.py" COPYONLY)
diff --git a/modules/isolines/__init__.py b/modules/isolines/__init__.py
@@ -5,7 +5,7 @@
 import numpy as np
 from itertools import groupby
 
-from .isolines import trimesh_isolines as _trimesh_isolines
+from compas_libigl_isolines import trimesh_isolines as _trimesh_isolines
 
 
 def trimesh_isolines(M, S, N=50):
diff --git a/modules/isolines/isolines.cpp b/modules/isolines/isolines.cpp
@@ -31,7 +31,7 @@ Isolines trimesh_isolines(RowMatrixXd V, RowMatrixXi F, Eigen::VectorXd z, int n
 
 using namespace pybind11::literals;
 
-PYBIND11_MODULE(isolines, m) {
+PYBIND11_MODULE(compas_libigl_isolines, m) {
     m.def("trimesh_isolines", &trimesh_isolines, "V"_a.noconvert(), "F"_a.noconvert(), "z"_a, "n"_a);
 
     py::class_<Isolines>(m, "Isolines")
diff --git a/modules/planarize/CMakeLists.txt b/modules/planarize/CMakeLists.txt
@@ -1,15 +1,11 @@
 cmake_minimum_required(VERSION 3.14)
-project(planarize)
+project(compas_libigl_planarize)
 set(CMAKE_CXX_STANDARD 11)
 
-pybind11_add_module(planarize MODULE planarize.cpp)
+pybind11_add_module(compas_libigl_planarize MODULE planarize.cpp)
 
-target_link_libraries(planarize PRIVATE igl::core)
+target_link_libraries(compas_libigl_planarize PRIVATE igl::core)
 
-set_target_properties(planarize PROPERTIES
-    LIBRARY_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/src/compas_libigl/planarize")
-
-set_target_properties(planarize PROPERTIES
-    LIBRARY_OUTPUT_DIRECTORY_RELEASE "${CMAKE_SOURCE_DIR}/src/compas_libigl/planarize")
-
-configure_file(__init__.py "${CMAKE_SOURCE_DIR}/src/compas_libigl/planarize/__init__.py" COPYONLY)
+#set_target_properties(planarize PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/src/compas_libigl/planarize")
+#set_target_properties(planarize PROPERTIES LIBRARY_OUTPUT_DIRECTORY_RELEASE "${CMAKE_SOURCE_DIR}/src/compas_libigl/planarize")
+#configure_file(__init__.py "${CMAKE_SOURCE_DIR}/src/compas_libigl/planarize/__init__.py" COPYONLY)
diff --git a/modules/planarize/__init__.py b/modules/planarize/__init__.py
@@ -3,7 +3,7 @@
 from __future__ import print_function
 
 import numpy as np
-from .planarize import planarize_quads as _planarize_quads
+from compas_libigl_planarize import planarize_quads as _planarize_quads
 
 
 def planarize_quads(M, kmax=500, maxdev=0.005):
diff --git a/modules/planarize/planarize.cpp b/modules/planarize/planarize.cpp
@@ -18,7 +18,7 @@ RowMatrixXd planarize_quads(RowMatrixXd V, RowMatrixXi F, int maxiter = 100, dou
 
 using namespace pybind11::literals;
 
-PYBIND11_MODULE(planarize, m) {
+PYBIND11_MODULE(compas_libigl_planarize, m) {
     m.def("planarize_quads",
           &planarize_quads,
           "V"_a.noconvert(),
diff --git a/modules/triangulation/CMakeLists.txt b/modules/triangulation/CMakeLists.txt
@@ -1,16 +1,12 @@
 cmake_minimum_required(VERSION 3.14)
-project(triangulation)
+project(compas_libigl_triangulation)
 set(CMAKE_CXX_STANDARD 11)
 
-pybind11_add_module(triangulation MODULE triangulation.cpp)
+pybind11_add_module(compas_libigl_triangulation MODULE triangulation.cpp)
 
-target_link_libraries(triangulation PRIVATE igl::core)
-target_link_libraries(triangulation PRIVATE igl::triangle)
+target_link_libraries(compas_libigl_triangulation PRIVATE igl::core)
+target_link_libraries(compas_libigl_triangulation PRIVATE igl::triangle)
 
-set_target_properties(triangulation PROPERTIES
-    LIBRARY_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/src/compas_libigl/triangulation")
-
-set_target_properties(triangulation PROPERTIES
-    LIBRARY_OUTPUT_DIRECTORY_RELEASE "${CMAKE_SOURCE_DIR}/src/compas_libigl/triangulation")
-
-configure_file(__init__.py "${CMAKE_SOURCE_DIR}/src/compas_libigl/triangulation/__init__.py" COPYONLY)
+#set_target_properties(triangulation PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/src/compas_libigl/triangulation")
+#set_target_properties(triangulation PROPERTIES LIBRARY_OUTPUT_DIRECTORY_RELEASE "${CMAKE_SOURCE_DIR}/src/compas_libigl/triangulation")
+#configure_file(__init__.py "${CMAKE_SOURCE_DIR}/src/compas_libigl/triangulation/__init__.py" COPYONLY)
diff --git a/modules/triangulation/__init__.py b/modules/triangulation/__init__.py
@@ -4,7 +4,7 @@
 
 import numpy as np
 
-from .triangulation import triangulate_points
+from compas_libigl_triangulation import triangulate_points
 
 
 def delaunay_triangulation(V):
diff --git a/modules/triangulation/triangulation.cpp b/modules/triangulation/triangulation.cpp
@@ -34,7 +34,7 @@ Triangulation triangulate_points(RowMatrixXd V, RowMatrixXi E, RowMatrixXd H, co
 }
 
 
-PYBIND11_MODULE(triangulation, m) {
+PYBIND11_MODULE(compas_libigl_triangulation, m) {
     m.def("triangulate_points", &triangulate_points, py::arg("V").noconvert(), py::arg("E").noconvert(), py::arg("H").noconvert(), py::arg("opts"));
 
     py::class_<Triangulation>(m, "Triangulation")
diff --git a/recipe/build.sh b/recipe/build.sh
@@ -0,0 +1,11 @@
+$PYTHON -m pip install . -vv
+mkdir $SP_DIR/compas_libigl/booleans
+mkdir $SP_DIR/compas_libigl/geodistance
+mkdir $SP_DIR/compas_libigl/isolines
+mkdir $SP_DIR/compas_libigl/planarize
+mkdir $SP_DIR/compas_libigl/triangulation
+cp $RECIPE_DIR/../modules/booleans/__init__.py $SP_DIR/compas_libigl/booleans/__init__.py
+cp $RECIPE_DIR/../modules/geodistance/__init__.py $SP_DIR/compas_libigl/geodistance/__init__.py
+cp $RECIPE_DIR/../modules/isolines/__init__.py $SP_DIR/compas_libigl/isolines/__init__.py
+cp $RECIPE_DIR/../modules/planarize/__init__.py $SP_DIR/compas_libigl/planarize/__init__.py
+cp $RECIPE_DIR/../modules/triangulation/__init__.py $SP_DIR/compas_libigl/triangulation/__init__.py
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -10,12 +10,12 @@ source:
   # git_depth: 1
   # url: https://github.com/blockresearchgroup/compas_libigl/archive/alpha-{{ version }}.tar.gz
   # sha256: f90b39d88ea003bc2ca7925146babb20320cedebe096e4c276835490be8e10a0
-  # path: $RECIPE_DIR/../../
-  git_url: ../
+  path: $RECIPE_DIR/../../
+  # git_url: ../
 
 build:
   number: 0
-  script: "{{ PYTHON }} -m pip install . -vv"
+  # script: "{{ PYTHON }} -m pip install . -vv"
   # script: "{{ PYTHON }} -m pip install . --no-deps --ignore-installed --no-cache-dir -vv"
 
 requirements:
diff --git a/setup.py b/setup.py
@@ -19,13 +19,11 @@
 
 
 def read(*names, **kwargs):
-    return io.open(
-        path.join(here, *names),
-        encoding=kwargs.get('encoding', 'utf8')
-    ).read()
+    return io.open(path.join(here, *names), encoding=kwargs.get('encoding', 'utf8')).read()
 
 
 class CMakeExtension(Extension):
+
     def __init__(self, name, sourcedir=''):
         Extension.__init__(self, name, sources=[])
         self.sourcedir = os.path.abspath(sourcedir)
@@ -37,8 +35,7 @@ def run(self):
         try:
             out = subprocess.check_output(['cmake', '--version'])
         except OSError:
-            raise RuntimeError("CMake must be installed to build the following extensions: " +
-                               ", ".join(e.name for e in self.extensions))
+            raise RuntimeError("CMake must be installed to build the following extensions: " + ", ".join(e.name for e in self.extensions))
 
         if platform.system() == "Windows":
             cmake_version = LooseVersion(re.search(r'version\s*([\d.]+)', out.decode()).group(1))
@@ -50,16 +47,18 @@ def run(self):
 
     def build_extension(self, ext):
         extdir = os.path.abspath(os.path.dirname(self.get_ext_fullpath(ext.name)))
-        cmake_args = ['-DCMAKE_LIBRARY_OUTPUT_DIRECTORY=' + extdir,
-                      '-DPYTHON_EXECUTABLE=' + sys.executable,
-                      # For MacOS.
-                      # During compiling stage, the python module always links to a temporary generated library which is going to be destroyed.
-                      # Then importing the final installed module will return a link error
-                      # The following commands will force the module to look up the its dynmaic linked library in the same folder
-                      # '-DCMAKE_INSTALL_RPATH=@loader_path',
-                      # '-DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=ON',
-                      # '-DCMAKE_INSTALL_RPATH_USE_LINK_PATH:BOOL=OFF'
-                      ]
+        cmake_args = [
+            '-DCMAKE_LIBRARY_OUTPUT_DIRECTORY=' + extdir,
+            '-DPYTHON_EXECUTABLE=' + sys.executable,
+            # For MacOS.
+            # During compiling stage, the python module always links to a temporary generated library which is going to be destroyed.
+            # Then importing the final installed module will return a link error
+            # The following commands will force the module to look up the its dynmaic linked library in the same folder
+            # '-DCMAKE_INSTALL_RPATH=@loader_path',
+            # '-DCMAKE_INSTALL_RPATH=$ORIGIN',
+            # '-DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=ON',
+            # '-DCMAKE_INSTALL_RPATH_USE_LINK_PATH:BOOL=OFF'
+        ]
 
         cfg = 'Debug' if self.debug else 'Release'
         build_args = ['--config', cfg]
@@ -68,14 +67,15 @@ def build_extension(self, ext):
             cmake_args += ['-DCMAKE_LIBRARY_OUTPUT_DIRECTORY_{}={}'.format(cfg.upper(), extdir)]
             if sys.maxsize > 2**32:
                 cmake_args += ['-A', 'x64']
-            build_args += ['--', '/m']
+            # build_args += ['--', '/m']
         else:
             cmake_args += ['-DCMAKE_BUILD_TYPE=' + cfg]
             build_args += ['--', '-j2']
 
+        print(self.build_temp)
+
         env = os.environ.copy()
-        env['CXXFLAGS'] = '{} -DVERSION_INFO=\\"{}\\"'.format(env.get('CXXFLAGS', ''),
-                                                              self.distribution.get_version())
+        env['CXXFLAGS'] = '{} -DVERSION_INFO=\\"{}\\"'.format(env.get('CXXFLAGS', ''), self.distribution.get_version())
         if not os.path.exists(self.build_temp):
             os.makedirs(self.build_temp)
         subprocess.check_call(['cmake', ext.sourcedir] + cmake_args, cwd=self.build_temp, env=env)
@@ -122,9 +122,6 @@ def build_extension(self, ext):
     install_requires=requirements,
     python_requires='>=3.6',
     extras_require=optional_requirements,
-    entry_points={
-        'console_scripts': [],
-    },
     ext_modules=[CMakeExtension('compas_libigl')],
     cmdclass=dict(build_ext=CMakeBuild),
 )
diff --git a/src/compas_libigl/__init__.py b/src/compas_libigl/__init__.py
@@ -2,7 +2,7 @@
 from __future__ import division
 from __future__ import print_function
 
-# from .booleans import *
+from .booleans import *
 # from .csgtree import *
 from .geodistance import *
 from .isolines import *

-Original file line number
+Diff line change
@@ @@ -1,3 +1,3 @@ @@
 +# Authors
++
 - Tom Van Mele <<[email protected]>> [@brgcode](https://github.com/brgcode), [@tomvanmele](https://github.com/tomvanmele)
 -- Tomás Méndez Echenagucia <<[email protected]>> [@tmsmendez](https://github.com/tmsmendez)
 -- Matthias Rippmann <<[email protected]>> [@Rippmann](https://github.com/Rippmann)
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ Eigen::VectorXd trimesh_geodistance_heat(RowMatrixXd V, RowMatrixXi F, int vid)`
`45`	`45`
`46`	`46`	`using namespace pybind11::literals;`
`47`	`47`
`48`		`-PYBIND11_MODULE(geodistance, m) {`
	`48`	`+PYBIND11_MODULE(compas_libigl_geodistance, m) {`
`49`	`49`	`m.def("trimesh_geodistance_exact", &trimesh_geodistance_exact, "V"_a.noconvert(), "F"_a.noconvert(), "vid"_a);`
`50`	`50`	`m.def("trimesh_geodistance_heat", &trimesh_geodistance_heat, "V"_a.noconvert(), "F"_a.noconvert(), "vid"_a);`
`51`	`51`	`}`