Skip to content

Commit 82fa700

Browse files
committedMar 8, 2021
Merge branch 'master' of github.com:hguo/ftk
2 parents d47bc47 + 4a55203 commit 82fa700

File tree

2 files changed

+36
-4
lines changed

2 files changed

+36
-4
lines changed
 

‎.github/workflows/python3-setup.yml

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
name: python3-setup
2+
3+
on: [push]
4+
5+
jobs:
6+
build:
7+
# The CMake configure and build commands are platform agnostic and should work equally
8+
# well on Windows or Mac. You can convert this to a matrix build if you need
9+
# cross-platform coverage.
10+
# See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
11+
runs-on: ubuntu-latest
12+
13+
steps:
14+
- uses: actions/checkout@v1
15+
with:
16+
submodules: recursive
17+
18+
- name: Build
19+
working-directory: ${{github.workspace}}
20+
shell: bash
21+
# Execute the build. You can specify a specific target with "--target <NAME>"
22+
run: python setup.py build

‎docs/install.md

+14-4
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
## Spack install
44

5-
One can install FTK through [spack](https://spack.io/):
5+
One can install FTK through [spack](https://spack.io/) (we recommend to use the latest version of spack on the develop branch):
66

77
```bash
88
$ spack install ftk
@@ -70,7 +70,17 @@ $ CC=mpicc CXX=mpicxx cmake -DFTK_USE_MPI=ON
7070

7171
### Building ParaView plugins
7272

73-
FTK provides ParaView plugins to allow users track critical points (maxima, minima, and saddles) in scalar field data. In order to build the plugins, we recommend to build and use
73+
FTK provides ParaView plugins to allow users track critical points (maxima, minima, and saddles) in scalar field data. In order to build the plugins, one needs to build ParaView from source, for example:
74+
75+
```bash
76+
$ tar zxf ParaView-v5.8.0.tar.gz
77+
$ cd ParaView-v5.8.0
78+
$ mkdir build && cd build
79+
$ cmake .. # You may need to specify paths to Qt and other dependencies needed by ParaView
80+
$ make
81+
```
82+
83+
Assuming `$YOUR_ParaView_Build` is the above build directory, one can further build ParaView plugins as follows
7484

7585
```bash
7686
$ git clone https://github.com/hguo/ftk $FTK_SOURCE_DIR
@@ -79,7 +89,7 @@ $ cmake .. -DFTK_BUILD_PARAVIEW=ON -DParaView_DIR=$YOUR_ParaView_Build
7989
$ make
8090
```
8191

82-
If built successfully, you will see the plugins binary as `lib/paraview-5.8/plugins/FTK/FTK.so`. Open the "Plugin Manager" in ParaView, and load this binary with "Load New..." button, and then select and load FTK in the list. To check if ParaView plugins are correctly built by reproducing the results in the above figure, use "Sources-->FTK-->SpiralWoven2DSource", "Filters-->FTK-->CriticalPointTracker2D",followed by the "Tube" filter in ParaView.
92+
If built successfully, you will see the plugins binary as `lib/paraview-5.8/plugins/FTK/FTK.so`. Open the "Plugin Manager" in ParaView GUI, and load this binary with "Load New..." button, and then select and load FTK in the list. To check if ParaView plugins are correctly built by reproducing the results in the above figure, use "Sources-->FTK-->SpiralWoven2DSource", "Filters-->FTK-->CriticalPointTracker2D",followed by the "Tube" filter in ParaView.
8393

8494
### Building PyFTK
8595

@@ -91,7 +101,7 @@ $ git submodule update --init --recursive
91101

92102
If you downloaded a release from tarball archives on GitHub, be sure to manually download `pybind11` to the designated directory before building.
93103

94-
You may build PyFTK with `setuptools` or CMake. Notice that CMake is required to build PyFTK. Advanced build options is currently not possible to configure with `setuptools`.
104+
You may build PyFTK with `setuptools` or CMake. Notice that CMake is required to build PyFTK. We do not recommend to use Python 2. Advanced build options is currently not possible to configure with `setuptools`.
95105

96106
Build PyFTK with `setuptools`:
97107

0 commit comments

Comments
 (0)
Please sign in to comment.