Skip to content

Commit a72e616

Browse files
sanguinariojoesanguinariojoe
authored
v2.6.0
2 parents a51fc28 + f5469ca commit a72e616

46 files changed

Lines changed: 2164 additions & 1284 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/build-mingw.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
mkdir -p ${{github.workspace}}/build
3030
3131
- name: Configure CMake
32-
run: cmake -B ${{github.workspace}}/build -G "MinGW Makefiles" -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_INSTALL_PREFIX=${{github.workspace}}/install -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DEXTERNAL_EIGEN:BOOL=OFF -DPYTHON_WRAPPER:BOOL=OFF -DFORTRAN_WRAPPER:BOOL=ON -DRUST_WRAPPER:BOOL=OFF -DUSE_VTK=OFF -DBUILD_TESTING=ON
32+
run: cmake -B ${{github.workspace}}/build -G "MinGW Makefiles" -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_INSTALL_PREFIX=${{github.workspace}}/install -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DEXTERNAL_EIGEN:BOOL=OFF -DPYTHON_WRAPPER:BOOL=OFF -DFORTRAN_WRAPPER:BOOL=ON -DRUST_WRAPPER:BOOL=OFF -DBUILD_TESTING=ON
3333

3434
- name: Build
3535
run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}

‎.github/workflows/build-test.yml‎

Lines changed: 3 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,6 @@ permissions: write-all
1212
env:
1313
# Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
1414
BUILD_TYPE: Release
15-
VTK_VERSION_MAJOR: 9
16-
VTK_VERSION_MINOR: 3
17-
VTK_VERSION_PATCH: 1
1815

1916
jobs:
2017
create_release:
@@ -108,48 +105,20 @@ jobs:
108105
sudo apt-get -qq -y install bindgen
109106
if: runner.os == 'Linux'
110107

111-
- name: Install VTK (Linux)
112-
run: |
113-
sudo apt-get -qq update
114-
sudo apt-get -qq -y install libvtk9-dev
115-
if: runner.os == 'Linux'
116-
117-
- name: Install VTK (MacOS)
118-
run: |
119-
brew install vtk
120-
if: runner.os == 'MacOS'
121-
122-
- name: download pre-built VTK static library
123-
uses: suisei-cn/actions-download-file@v1.6.1
124-
with:
125-
url: https://github.com/sanguinariojoe/vtk-builds/releases/download/VTK-${{env.VTK_VERSION_MAJOR}}.${{env.VTK_VERSION_MINOR}}.${{env.VTK_VERSION_PATCH}}-static/vtk-${{runner.os}}-x86_64.tar.gz
126-
target: ${{github.workspace}}/
127-
if: runner.os == 'Windows'
128-
129-
- name: Create VTK folder
130-
run: |
131-
mkdir -p ${{github.workspace}}/vtk
132-
if: runner.os == 'Windows'
133-
134-
- name: Extract VTK tgz
135-
run: |
136-
tar -xvzf vtk-${{runner.os}}-x86_64.tar.gz -C vtk/
137-
if: runner.os == 'Windows'
138-
139108
- name: Create install folder
140109
run: |
141110
mkdir -p ${{github.workspace}}/install
142111
143112
- name: Configure CMake (Linux)
144-
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_INSTALL_PREFIX=${{github.workspace}}/install -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DEXTERNAL_EIGEN:BOOL=OFF -DPYTHON_WRAPPER:BOOL=OFF -DFORTRAN_WRAPPER:BOOL=ON -DRUST_WRAPPER:BOOL=ON -DUSE_VTK=ON -DBUILD_TESTING=ON
113+
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_INSTALL_PREFIX=${{github.workspace}}/install -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DEXTERNAL_EIGEN:BOOL=OFF -DPYTHON_WRAPPER:BOOL=OFF -DFORTRAN_WRAPPER:BOOL=ON -DRUST_WRAPPER:BOOL=ON -DBUILD_TESTING=ON
145114
if: runner.os == 'Linux'
146115

147116
- name: Configure CMake (MacOS)
148-
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_INSTALL_PREFIX=${{github.workspace}}/install -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DEXTERNAL_EIGEN:BOOL=OFF -DPYTHON_WRAPPER:BOOL=OFF -DFORTRAN_WRAPPER:BOOL=OFF -DRUST_WRAPPER:BOOL=OFF -DUSE_VTK=ON -DBUILD_TESTING=ON
117+
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_INSTALL_PREFIX=${{github.workspace}}/install -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DEXTERNAL_EIGEN:BOOL=OFF -DPYTHON_WRAPPER:BOOL=OFF -DFORTRAN_WRAPPER:BOOL=OFF -DRUST_WRAPPER:BOOL=OFF -DBUILD_TESTING=ON
149118
if: runner.os == 'MacOS'
150119

151120
- name: Configure CMake (Windows)
152-
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_INSTALL_PREFIX=${{github.workspace}}/install -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DEXTERNAL_EIGEN:BOOL=OFF -DPYTHON_WRAPPER:BOOL=OFF -DFORTRAN_WRAPPER:BOOL=OFF -DRUST_WRAPPER:BOOL=OFF -DUSE_VTK=ON -DVTK_DIR=${{github.workspace}}/vtk/lib/cmake/vtk-${{env.VTK_VERSION_MAJOR}}.${{env.VTK_VERSION_MINOR}}/ -DMOORDYN_PACKAGE_IGNORE_VTK_DEPENDENCY=ON -DBUILD_TESTING=ON
121+
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_INSTALL_PREFIX=${{github.workspace}}/install -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DEXTERNAL_EIGEN:BOOL=OFF -DPYTHON_WRAPPER:BOOL=OFF -DFORTRAN_WRAPPER:BOOL=OFF -DRUST_WRAPPER:BOOL=OFF -DBUILD_TESTING=ON
153122
if: runner.os == 'Windows'
154123

155124
- name: Build

‎.github/workflows/matlab.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
mkdir -p ${{github.workspace}}/install
3333
3434
- name: Configure CMake (Linux)
35-
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_INSTALL_PREFIX=${{github.workspace}}/install -DEXTERNAL_EIGEN:BOOL=OFF -DPYTHON_WRAPPER:BOOL=OFF -DFORTRAN_WRAPPER:BOOL=OFF -DRUST_WRAPPER:BOOL=OFF -DMATLAB_WRAPPER:BOOL=OFF -DUSE_VTK=OFF -DBUILD_TESTING=OFF
35+
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_INSTALL_PREFIX=${{github.workspace}}/install -DEXTERNAL_EIGEN:BOOL=OFF -DPYTHON_WRAPPER:BOOL=OFF -DFORTRAN_WRAPPER:BOOL=OFF -DRUST_WRAPPER:BOOL=OFF -DMATLAB_WRAPPER:BOOL=OFF -DBUILD_TESTING=OFF
3636

3737
- name: Build
3838
id: build

‎.github/workflows/mdf_verification.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ jobs:
6464
mkdir -p ${{github.workspace}}/install
6565
6666
- name: Configure CMake
67-
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_INSTALL_PREFIX=${{github.workspace}}/install -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DEXTERNAL_EIGEN:BOOL=OFF -DPYTHON_WRAPPER:BOOL=ON -DFORTRAN_WRAPPER:BOOL=OFF -DRUST_WRAPPER:BOOL=OFF -DUSE_VTK=OFF -DBUILD_TESTING=ON
67+
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_INSTALL_PREFIX=${{github.workspace}}/install -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DEXTERNAL_EIGEN:BOOL=OFF -DPYTHON_WRAPPER:BOOL=ON -DFORTRAN_WRAPPER:BOOL=OFF -DRUST_WRAPPER:BOOL=OFF -DBUILD_TESTING=ON
6868

6969
- name: Build
7070
id: build

‎.github/workflows/memcheck.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
sudo apt-get -qq -y install valgrind
2828
2929
- name: Configure CMake
30-
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DEXTERNAL_EIGEN:BOOL=OFF -DPYTHON_WRAPPER:BOOL=OFF -DRUST_WRAPPER:BOOL=OFF -DUSE_VTK=OFF -DBUILD_TESTING=ON
30+
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DEXTERNAL_EIGEN:BOOL=OFF -DPYTHON_WRAPPER:BOOL=OFF -DRUST_WRAPPER:BOOL=OFF -DBUILD_TESTING=ON
3131

3232
- name: Build
3333
id: build

‎.github/workflows/python-wheels-emulated.yml‎

Lines changed: 3 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -12,21 +12,6 @@ on:
1212
description: 'Architecture target'
1313
required: true
1414
type: string
15-
vtk_major:
16-
description: 'VTK major version'
17-
required: false
18-
type: string
19-
default: '9'
20-
vtk_minor:
21-
description: 'VTK minor version'
22-
required: false
23-
type: string
24-
default: '3'
25-
vtk_patch:
26-
description: 'VTK patch version'
27-
required: false
28-
type: string
29-
default: '1'
3015

3116
permissions: write-all
3217

@@ -43,33 +28,20 @@ jobs:
4328
CIBW_ARCHS: ${{inputs.arch}}
4429
CIBW_ENVIRONMENT_LINUX: "LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/project/install/lib"
4530
CIBW_BEFORE_ALL_LINUX: >
46-
if pip debug --verbose | grep -q 'musllinux'; then
47-
DISTRO=musllinux_1_2
48-
else
49-
DISTRO=manylinux2014
50-
fi &&
51-
echo "Considering vtk-${DISTRO}_`uname -m`.tar.gz..." &&
52-
mkdir -p vtk &&
53-
tar -xvzf vtk-${DISTRO}_`uname -m`.tar.gz -C vtk/ &&
54-
if [ -d "vtk/lib" ]; then
55-
VTK_DIR=vtk/lib/cmake/vtk-${{inputs.vtk_major}}.${{inputs.vtk_minor}}
56-
else
57-
VTK_DIR=vtk/lib64/cmake/vtk-${{inputs.vtk_major}}.${{inputs.vtk_minor}}
58-
fi &&
59-
cmake -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=install -DEXTERNAL_EIGEN:BOOL=OFF -DPYTHON_WRAPPER:BOOL=OFF -DFORTRAN_WRAPPER:BOOL=OFF -DRUST_WRAPPER:BOOL=OFF -DUSE_VTK=ON -DVTK_DIR=$VTK_DIR -DMOORDYN_PACKAGE_IGNORE_VTK_DEPENDENCY=ON -DBUILD_TESTING=OFF &&
31+
cmake -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=install -DEXTERNAL_EIGEN:BOOL=OFF -DPYTHON_WRAPPER:BOOL=OFF -DFORTRAN_WRAPPER:BOOL=OFF -DRUST_WRAPPER:BOOL=OFF -DBUILD_TESTING=OFF &&
6032
cmake --build build --config Release &&
6133
cmake --install build --config Release &&
6234
rm -rf docs extern source tests
6335
CIBW_BEFORE_BUILD_WINDOWS: "pip install delvewheel"
6436
CIBW_BEFORE_ALL_WINDOWS: >
65-
cmake -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=install -DEXTERNAL_EIGEN:BOOL=OFF -DPYTHON_WRAPPER:BOOL=OFF -DFORTRAN_WRAPPER:BOOL=OFF -DRUST_WRAPPER:BOOL=OFF -DUSE_VTK=ON -DVTK_DIR=vtk/lib/cmake/vtk-${{inputs.vtk_major}}.${{inputs.vtk_minor}} -DMOORDYN_PACKAGE_IGNORE_VTK_DEPENDENCY=ON -DBUILD_TESTING=OFF &&
37+
cmake -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=install -DEXTERNAL_EIGEN:BOOL=OFF -DPYTHON_WRAPPER:BOOL=OFF -DFORTRAN_WRAPPER:BOOL=OFF -DRUST_WRAPPER:BOOL=OFF -DBUILD_TESTING=OFF &&
6638
cmake --build build --config Release &&
6739
cmake --install build --config Release &&
6840
rm -rf docs extern source tests
6941
CIBW_REPAIR_WHEEL_COMMAND_WINDOWS: "delvewheel repair --add-path install/bin -w {dest_dir} {wheel}"
7042
CIBW_ENVIRONMENT_MACOS: 'MACOSX_DEPLOYMENT_TARGET="10.15"'
7143
CIBW_BEFORE_ALL_MACOS: >
72-
cmake -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=install -DEXTERNAL_EIGEN:BOOL=OFF -DPYTHON_WRAPPER:BOOL=OFF -DFORTRAN_WRAPPER:BOOL=OFF -DRUST_WRAPPER:BOOL=OFF -DUSE_VTK=ON -DVTK_DIR=vtk/lib/cmake/vtk-${{inputs.vtk_major}}.${{inputs.vtk_minor}} -DMOORDYN_PACKAGE_IGNORE_VTK_DEPENDENCY=ON -DBUILD_TESTING=OFF -DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 -DCMAKE_INSTALL_NAME_DIR:PATH=$(pwd)/install/lib &&
44+
cmake -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=install -DEXTERNAL_EIGEN:BOOL=OFF -DPYTHON_WRAPPER:BOOL=OFF -DFORTRAN_WRAPPER:BOOL=OFF -DRUST_WRAPPER:BOOL=OFF -DBUILD_TESTING=OFF -DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 -DCMAKE_INSTALL_NAME_DIR:PATH=$(pwd)/install/lib &&
7345
cmake --build build --config Release &&
7446
cmake --install build --config Release &&
7547
rm -rf docs extern source tests
@@ -91,50 +63,11 @@ jobs:
9163
cat pyproject.toml
9264
shell: bash
9365

94-
- name: download pre-built VTK static library (ManyLinux)
95-
uses: suisei-cn/actions-download-file@v1.6.1
96-
with:
97-
url: https://github.com/sanguinariojoe/vtk-builds/releases/download/VTK-${{inputs.vtk_major}}.${{inputs.vtk_minor}}.${{inputs.vtk_patch}}-static/vtk-manylinux2014_${{inputs.arch}}.tar.gz
98-
target: ${{github.workspace}}/
99-
if: runner.os == 'Linux'
100-
101-
- name: download pre-built VTK static library (MUSLLinux)
102-
uses: suisei-cn/actions-download-file@v1.6.1
103-
with:
104-
url: https://github.com/sanguinariojoe/vtk-builds/releases/download/VTK-${{inputs.vtk_major}}.${{inputs.vtk_minor}}.${{inputs.vtk_patch}}-static/vtk-musllinux_1_2_${{inputs.arch}}.tar.gz
105-
target: ${{github.workspace}}/
106-
if: runner.os == 'Linux'
107-
108-
- name: download pre-built VTK static library (Windows)
109-
uses: suisei-cn/actions-download-file@v1.6.1
110-
with:
111-
url: https://github.com/sanguinariojoe/vtk-builds/releases/download/VTK-${{inputs.vtk_major}}.${{inputs.vtk_minor}}.${{inputs.vtk_patch}}-static/vtk-Windows-x86_64.tar.gz
112-
target: ${{github.workspace}}/
113-
if: runner.os == 'Windows'
114-
115-
- name: download pre-built VTK static library (MacOS)
116-
uses: suisei-cn/actions-download-file@v1.6.1
117-
with:
118-
url: https://github.com/sanguinariojoe/vtk-builds/releases/download/VTK-${{inputs.vtk_major}}.${{inputs.vtk_minor}}.${{inputs.vtk_patch}}-static/vtk-macOS-${{inputs.arch}}.tar.gz
119-
target: ${{github.workspace}}/
120-
if: runner.os == 'MacOS'
121-
12266
- name: Create folders
12367
run: |
124-
mkdir -p ${{github.workspace}}/vtk
12568
mkdir -p ${{github.workspace}}/build
12669
mkdir -p ${{github.workspace}}/install
12770
128-
- name: Extract VTK tgz (Windows)
129-
run: |
130-
tar -xvzf vtk-Windows-x86_64.tar.gz -C vtk/
131-
if: runner.os == 'Windows'
132-
133-
- name: Extract VTK tgz (MacOS)
134-
run: |
135-
tar -xvzf vtk-macOS-${{inputs.arch}}.tar.gz -C vtk/
136-
if: runner.os == 'MacOS'
137-
13871
- name: Set up QEMU
13972
uses: docker/setup-qemu-action@v3
14073
with:

‎.github/workflows/python-wheels.yml‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -58,14 +58,6 @@ jobs:
5858
arch: "AMD64"
5959
secrets: inherit
6060

61-
build_MacOS_x86_64:
62-
name: Build MacOS_x86_64
63-
uses: FloatingArrayDesign/MoorDyn/.github/workflows/python-wheels-emulated.yml@master
64-
with:
65-
os: '["macOS-13"]'
66-
arch: "x86_64"
67-
secrets: inherit
68-
6961
build_MacOS_arm64:
7062
name: Build MacOS_arm64
7163
uses: FloatingArrayDesign/MoorDyn/.github/workflows/python-wheels-emulated.yml@master
@@ -135,7 +127,7 @@ jobs:
135127

136128
publish:
137129
runs-on: ${{ matrix.os }}
138-
needs: [build_wheels, build_Linux_x86_64, build_Windows_AMD64, build_MacOS_x86_64, build_MacOS_arm64, build_Linux_i686, build_Linux_aarch64, build_Linux_ppc64le, build_Linux_s390x, test_Linux_x86_64, test_Windows_AMD64, test_MacOS_arm64]
130+
needs: [build_wheels, build_Linux_x86_64, build_Windows_AMD64, build_MacOS_arm64, build_Linux_i686, build_Linux_aarch64, build_Linux_ppc64le, build_Linux_s390x, test_Linux_x86_64, test_Windows_AMD64, test_MacOS_arm64]
139131
strategy:
140132
matrix:
141133
os: [ubuntu-22.04]
@@ -158,3 +150,4 @@ jobs:
158150
password: ${{ secrets.MOORDYN_PYPI_API }}
159151
repository-url: https://upload.pypi.org/legacy/
160152
skip-existing: true
153+
if: github.ref == 'refs/heads/master'

‎.github/workflows/python-wrapper.yml‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,6 @@ permissions: write-all
1212
env:
1313
# Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
1414
BUILD_TYPE: Release
15-
VTK_VERSION_MAJOR: 9
16-
VTK_VERSION_MINOR: 3
17-
VTK_VERSION_PATCH: 1
1815

1916
jobs:
2017
test:
@@ -33,17 +30,12 @@ jobs:
3330
- name: Install Python dependencies
3431
run: pip install --upgrade build pytest numpy scipy
3532

36-
- name: Install VTK
37-
run: |
38-
sudo apt-get -qq update
39-
sudo apt-get -qq -y install libvtk9-dev
40-
4133
- name: Create install folder
4234
run: |
4335
mkdir -p ${{github.workspace}}/install
4436
4537
- name: Configure CMake
46-
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_INSTALL_PREFIX=${{github.workspace}}/install -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DEXTERNAL_EIGEN:BOOL=OFF -DPYTHON_WRAPPER:BOOL=ON -DFORTRAN_WRAPPER:BOOL=OFF -DRUST_WRAPPER:BOOL=OFF -DUSE_VTK=ON -DBUILD_TESTING=ON
38+
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_INSTALL_PREFIX=${{github.workspace}}/install -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DEXTERNAL_EIGEN:BOOL=OFF -DPYTHON_WRAPPER:BOOL=ON -DFORTRAN_WRAPPER:BOOL=OFF -DRUST_WRAPPER:BOOL=OFF -DBUILD_TESTING=ON
4739

4840
- name: Build
4941
id: build

0 commit comments

Comments
 (0)