We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
1 parent 3099454 commit c97de09Copy full SHA for c97de09
6 files changed
.appveyor.yml
.github/workflows/continuous.yml
@@ -0,0 +1,65 @@
1
+name: Build
2
+
3
+on:
4
+ push:
5
+ branches:
6
+ - master
7
+ pull_request:
8
9
10
11
+env:
12
+ CTEST_OUTPUT_ON_FAILURE: ON
13
+ CTEST_PARALLEL_LEVEL: 2
14
15
+jobs:
16
+ Build:
17
+ name: ${{ matrix.name }} (${{ matrix.config }})
18
+ runs-on: ${{ matrix.os }}
19
+ strategy:
20
+ fail-fast: false
21
+ matrix:
22
+ os: [ubuntu-18.04, windows-2019]
23
+ config: [Debug, Release]
24
+ include:
25
+ - os: ubuntu-18.04
26
+ name: Linux
27
+ - os: windows-2019
28
+ name: Windows
29
+ steps:
30
+ - name: Checkout repository
31
+ uses: actions/checkout@v1
32
+ with:
33
+ fetch-depth: 10
34
35
+ - name: Setup NMake (Windows)
36
+ if: runner.os == 'Windows'
37
+ uses: ilammy/msvc-dev-cmd@v1
38
39
+ - name: Stetup Conda
40
+ uses: s-weigand/setup-conda@v1
41
42
+ conda-channels: anaconda, conda-forge
43
+ python-version: 3.6
44
45
+ - name: Install Dependencies
46
+ run: conda install numpy libblas libcblas suitesparse plotly -y
47
48
+ - name: Envs (Windows)
49
50
+ run: echo "CMAKE_GENERATOR=NMake Makefiles" >> $GITHUB_ENV
51
52
+ - name: Build (Debug)
53
+ if: matrix.config == 'Debug'
54
+ run: python setup.py build --debug install
55
56
+ - name: Build (Release)
57
+ if: matrix.config == 'Release'
58
+ run: python setup.py build install
59
60
+ - name: Tests
61
+ run: |
62
+ python test/test_bending.py
63
+ python test/test_gravity.py
64
+ python test/test_inflation.py
65
+ python test/test_plane_hole.py
.travis.yml
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:
66
build_args += ['--', '-j2']
67
0 commit comments