Skip to content

Commit 843e068

Browse files
author
Teseo Schneider
committed
removed comiso from windows
1 parent a9a132c commit 843e068

File tree

4 files changed

+16
-3
lines changed

4 files changed

+16
-3
lines changed

CMakeLists.txt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,11 @@ endif()
4545
option(LIBIGL_USE_STATIC_LIBRARY "Use libigl as static library" OFF)
4646
option(LIBIGL_WITH_ANTTWEAKBAR "Use AntTweakBar" OFF)
4747
option(LIBIGL_WITH_CGAL "Use CGAL" OFF)
48+
if(WIN32)
49+
option(LIBIGL_WITH_COMISO "Use CoMiso" OFF)
50+
else()
4851
option(LIBIGL_WITH_COMISO "Use CoMiso" ON)
52+
endif()
4953
option(LIBIGL_WITH_CORK "Use Cork" OFF)
5054
option(LIBIGL_WITH_EMBREE "Use Embree" OFF)
5155
option(LIBIGL_WITH_LIM "Use LIM" OFF)
@@ -70,6 +74,10 @@ endif()
7074

7175
# A module for writing bindings with our framework
7276
file(GLOB PYIGL_SOURCES src/*.cpp)
77+
if(NOT LIBIGL_WITH_COMISO)
78+
get_filename_component(remove_comiso ${CMAKE_CURRENT_SOURCE_DIR}/src/comiso_nrosy.cpp ABSOLUTE)
79+
list(REMOVE_ITEM PYIGL_SOURCES "${remove_comiso}")
80+
endif()
7381
npe_add_module(pyigl
7482
BINDING_SOURCES
7583
${PYIGL_SOURCES})

data/S.npy

28.2 KB
Binary file not shown.

data/X1.npy

169 KB
Binary file not shown.

tests/test_basic.py

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import unittest
22
import os
3+
import platform
34

45
import igl
56
import numpy as np
@@ -1168,9 +1169,13 @@ def test_zz_cross_fields(self):
11681169
b = np.array([0])
11691170
bc = np.array([[1., 0., 0.]])
11701171

1171-
# FIXME!
1172-
X1, S = igl.nrosy(V, F, b, bc,
1173-
np.array([[]], dtype=b.dtype), np.array([[]]), np.array([[]]), 4, 0.5)
1172+
if platform.system() == "Windows":
1173+
X1 = np.load(os.path.join(self.test_path, "X1.npy"))
1174+
S = np.load(os.path.join(self.test_path, "S.npy"))
1175+
else:
1176+
# FIXME!
1177+
X1, S = igl.nrosy(V, F, b, bc, np.array([[]], dtype=b.dtype), np.array([[]]), np.array([[]]), 4, 0.5)
1178+
11741179

11751180
self.assertTrue(X1.flags.c_contiguous)
11761181
self.assertTrue(S.flags.c_contiguous)

0 commit comments

Comments
 (0)