4 3d

Author: Teseo Schneider

.appveyor.yml

@@ -27,19 +27,20 @@ install:
   - "python --version"
   - "python -c \"import struct; print(struct.calcsize('P') * 8)\""
   - "python -m pip install numpy"
-build:
-  parallel: true
+  - "python -c \"import numpy as np;import sys;print(np.get_include())\""
+
+  # - "dir C:\\Python36-x64\\lib\\site-packages\\numpy\\core\\include"
+  # - "dir C:\\Python36-x64\\lib\\site-packages\\numpy\\core\\include\\numpy"
+# build:
+  # parallel: true
 build_script:
-  - "MSBuild /help"
   - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
   - cd c:\projects\polyfempy
-  - "python --version"
+  # - set MSBuildLogger="C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
+  # - set MSBuildOptions=/v:m /p:Configuration=%config% /logger:%MSBuildLogger%
   - python setup.py install
 
 test_script:
+  - "python -m pip install plotly"
   - cd c:\projects\polyfempy
-  - python tests/bending.py
-  - python tests/gravity.py
-  - python tests/inflation.py
-  - python tests/plane_hole.py
-  - python tests/torsion.py
+  - python setup.py test

.travis.yml

@@ -28,10 +28,10 @@ script:
   - python tests/inflation.py
   - python tests/plane_hole.py
   - python tests/torsion.py
-# deploy:
-#   provider: pypi
-#   user: "teseoch"
-#   password:
-#     secure: SBFTnlltZ+CsskcX+qILNOnEIQzK9fwnQKkZGKsxWuKn4VBA/M6olmTl/wOEzfYnrTdY3A9LrCX7b9D+/3CDCOhGkdFw6x1VRYySqkHtxk4UjdzXBnIPi9bf5GFDjIg/lOcKhR6bIhcRjEAu2bAYQTegyi936jHJuSglaLiK9S3/gWSH/fGbS22PFL0Nuh5o4o82MKeR9simNA9uXxTWdMr4SATEm/oOs2Itpmg9cKolizWPzRBT7WMMe9I61ULPkxFjMLtU1C+kXBB0ctE4FBIndZbEUnwYsceXw+gRrWTA+auc3ZvNbF7ilaAIYYXPPlWEewjt1Ib0vPZP1g/jpeLT0uDfpDuin5bJjDbdrjkD9mReBnpinbQU0o0KXX3IJWwcN+LW1r8NUB8K6T6iEiWQmy7D/9vX5jPRXe2zt7O63JWY61cD1VzPrKIeKY/CC0X4TP0PyujbsSpBI6O/5UE8VRZX1hp0YJOEywLqj3YRJ0HcSSanHccUI+sJlbZEGZaH/dJCbWqS25IGN6sXoXD1sfyS2d5XtD1758Sg7+5SLZoXa9fSGLntVhZ72kZjvRgJULirVEqbUqXjdtf3TMO6EtAQMWKgVVguqF9gqO/44R3omQa03bhnZNm9WDIft8ZyIRGk5On2OwVWvFb2ud/5PgmuOdw+auEat9oziNM=
-#   on:
-#     all_branches: true
+deploy:
+  provider: pypi
+  user: "teseoch"
+  password:
+    secure: SBFTnlltZ+CsskcX+qILNOnEIQzK9fwnQKkZGKsxWuKn4VBA/M6olmTl/wOEzfYnrTdY3A9LrCX7b9D+/3CDCOhGkdFw6x1VRYySqkHtxk4UjdzXBnIPi9bf5GFDjIg/lOcKhR6bIhcRjEAu2bAYQTegyi936jHJuSglaLiK9S3/gWSH/fGbS22PFL0Nuh5o4o82MKeR9simNA9uXxTWdMr4SATEm/oOs2Itpmg9cKolizWPzRBT7WMMe9I61ULPkxFjMLtU1C+kXBB0ctE4FBIndZbEUnwYsceXw+gRrWTA+auc3ZvNbF7ilaAIYYXPPlWEewjt1Ib0vPZP1g/jpeLT0uDfpDuin5bJjDbdrjkD9mReBnpinbQU0o0KXX3IJWwcN+LW1r8NUB8K6T6iEiWQmy7D/9vX5jPRXe2zt7O63JWY61cD1VzPrKIeKY/CC0X4TP0PyujbsSpBI6O/5UE8VRZX1hp0YJOEywLqj3YRJ0HcSSanHccUI+sJlbZEGZaH/dJCbWqS25IGN6sXoXD1sfyS2d5XtD1758Sg7+5SLZoXa9fSGLntVhZ72kZjvRgJULirVEqbUqXjdtf3TMO6EtAQMWKgVVguqF9gqO/44R3omQa03bhnZNm9WDIft8ZyIRGk5On2OwVWvFb2ud/5PgmuOdw+auEat9oziNM=
+  on:
+    tags: true

cmake/PolyfemPythonDownloadExternal.cmake

@@ -27,7 +27,7 @@ endfunction()
 function(polyfem_python_download_polyfem)
     polyfem_python_download_project(polyfem
         GIT_REPOSITORY https://github.com/polyfem/polyfem.git
-        GIT_TAG         7ade2351dd5dcbba200ca1e83c499d1ab8783942
+        GIT_TAG         263ce74e59a0a207d2e42ac5fe6fdb5cbd947597
     )
 endfunction()
 

setup.py

@@ -60,7 +60,7 @@ 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 += ['--', '/m4']
+            build_args += ['--', '/m:4']
         else:
             cmake_args += ['-DCMAKE_BUILD_TYPE=' + cfg]
             build_args += ['--', '-j2']