Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Wms fix transpose #38

Merged
merged 12 commits into from
Jun 23, 2023
Merged

Wms fix transpose #38

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
9656381
fix: no longer have to transpose (next add backwards compat)
william-silversmith Jun 20, 2023
a08003d
feat: adds new function w/ fix and cython binding
william-silversmith Jun 20, 2023
1ca6d55
install: switch to compiling pyx files
william-silversmith Jun 21, 2023
7a6d9f2
chore: add names to parameters
william-silversmith Jun 21, 2023
7eaf651
fix: cython bug triggered by binding
william-silversmith Jun 21, 2023
21878a8
docs: update simplify docstring
william-silversmith Jun 21, 2023
8535be1
test: add get to some tests
william-silversmith Jun 21, 2023
7246e3a
docs: fixed erroneous string
william-silversmith Jun 21, 2023
e8d473f
test: check that get and get_mesh are transposed
william-silversmith Jun 22, 2023
b937dad
docs: added docstring to Mesher
william-silversmith Jun 23, 2023
ab4b3e3
fix: use proper resolution for untransposed
william-silversmith Jun 23, 2023
1e6a07e
test: fewer iterations might fix windows test runner
william-silversmith Jun 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
install: switch to compiling pyx files
  • Loading branch information
@william-silversmith
william-silversmith committed Jun 21, 2023
commit 1ca6d55eeed1b44f3937ed45b3ce7ba01eab15c9
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,3 +46,5 @@ __pycache__

# mesh files
*.ply

zmesh/_zmesh.cpp
4 changes: 2 additions & 2 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,14 @@ def __repr__(self):
include_dirs = [ NumpyImport(), 'zi_lib/', './' ]

setuptools.setup(
setup_requires=['pbr', 'numpy'],
setup_requires=['pbr', 'numpy', 'cython'],
python_requires=">=3.7", # >= 3.6 < 4.0
pbr=True,
define_macros=[ ("NDEBUG", 1) ],
ext_modules=[
setuptools.Extension(
'zmesh._zmesh',
sources=[ 'zmesh/_zmesh.cpp' ],
sources=[ 'zmesh/_zmesh.pyx' ],
depends=[ 'cMesher.hpp' ],
language='c++',
include_dirs=include_dirs,
Expand Down
Loading