gh-action

.github/workflows/continuous.yml

@@ -0,0 +1,65 @@
+name: Build
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+
+env:
+  CTEST_OUTPUT_ON_FAILURE: ON
+  CTEST_PARALLEL_LEVEL: 2
+
+jobs:
+  Build:
+    name: ${{ matrix.name }} (${{ matrix.config }})
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-18.04, windows-2019]
+        config: [Debug, Release]
+        include:
+          - os: ubuntu-18.04
+            name: Linux
+          - os: windows-2019
+            name: Windows
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v1
+        with:
+          fetch-depth: 10
+
+      - name: Setup NMake (Windows)
+        if: runner.os == 'Windows'
+        uses: ilammy/msvc-dev-cmd@v1
+
+      - name: Stetup Conda
+        uses: s-weigand/setup-conda@v1
+        with:
+          conda-channels: anaconda, conda-forge
+          python-version: 3.6
+
+      - name: Install Dependencies
+        run: conda install numpy libblas libcblas suitesparse plotly -y
+
+      - name: Envs (Windows)
+        if: runner.os == 'Windows'
+        run: echo "CMAKE_GENERATOR=NMake Makefiles" >> $GITHUB_ENV
+
+      - name: Build (Debug)
+        if: matrix.config == 'Debug'
+        run: python setup.py build --debug install
+
+      - name: Build (Release)
+        if: matrix.config == 'Release'
+        run: python setup.py build install
+
+      - name: Tests
+        run: |
+          python test/test_bending.py
+          python test/test_gravity.py
+          python test/test_inflation.py
+          python test/test_plane_hole.py

CMakeLists.txt

@@ -31,16 +31,6 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
 ################################################################################
 
-if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
-	foreach(config ${CMAKE_CONFIGURATION_TYPES})
-		string(TOUPPER ${config} config)
-		string(REPLACE /MD /MT CMAKE_C_FLAGS_${config} "${CMAKE_C_FLAGS_${config}}")
-		string(REPLACE /MD /MT CMAKE_CXX_FLAGS_${config} "${CMAKE_CXX_FLAGS_${config}}")
-	endforeach()
-endif()
-
-################################################################################
-
 
 # Setup dependencies
 include(PolyfemPythonDependencies)

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        20cc7b6d525c044b4cfe7730d5b7f52961f328eb
+        GIT_TAG        43903b617ee3439d4cfad15e3b2ea6454518dd9f
     )
 endfunction()
 

setup.py

@@ -43,13 +43,13 @@ def build_extension(self, ext):
 
         cmake_args = ['-DCMAKE_LIBRARY_OUTPUT_DIRECTORY=' + extdir,
                       '-DPYTHON_EXECUTABLE=' + sys.executable,
-                      '-DPOLYFEM_WITH_PARDISO=OFF',
+                      '-DPOLYSOLVE_WITH_PARDISO=OFF',
                       '-DPOLYFEM_NO_UI=ON',
                       '-DPOLYFEM_WITH_APPS=OFF',
                       '-DPOLYFEM_WITH_MISC=OFF',
-                      '-DPOLYFEM_WITH_AMGCL=OFF',
-                      #   '-DPOLYFEM_WITH_MKL=ON',
-                      '-DPOLYFEM_WITH_SPECTRA=OFF']
+                      '-DPOLYSOLVE_WITH_AMGCL=OFF',
+                      '-DPOLYSOLVE_WITH_MKL=OFF',
+                      '-DPOLYSOLVE_WITH_SPECTRA=OFF']
 
         cfg = 'Debug' if self.debug else 'Release'
         build_args = ['--config', cfg]
@@ -61,7 +61,7 @@ def build_extension(self, ext):
             if os.environ.get('CMAKE_GENERATOR') != "NMake Makefiles":
                 if sys.maxsize > 2**32:
                     cmake_args += ['-A', 'x64']
-                build_args += ['--', '/m']
+                # build_args += ['--', '/m']
         else:
             build_args += ['--', '-j2']