Skip to content

Commit

Permalink
Merge pull request #1 from virtualcell/FiniteVolume-only
Browse files Browse the repository at this point in the history
Finite volume solver extracted from vcell-solvers monorepo v0.8.0
  • Loading branch information
jcschaff authored May 28, 2024
2 parents 8b020bb + 90ff8fd commit e148342
Show file tree
Hide file tree
Showing 5,174 changed files with 58 additions and 2,700,463 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
64 changes: 0 additions & 64 deletions .appveyor/build.ps1

This file was deleted.

14 changes: 0 additions & 14 deletions .appveyor/copyDependencies.sh

This file was deleted.

97 changes: 18 additions & 79 deletions .github/workflows/cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -106,16 +106,9 @@ jobs:
-DCMAKE_CXX_COMPILER=/opt/homebrew/opt/llvm/bin/clang++ \
-DOPTION_MINGW=ON \
-DOPTION_TARGET_MESSAGING=OFF \
-DOPTION_TARGET_PARALLEL=OFF \
-DOPTION_TARGET_CHOMBO2D_SOLVER=OFF \
-DOPTION_TARGET_CHOMBO3D_SOLVER=OFF \
-DOPTION_TARGET_SMOLDYN_SOLVER=ON \
-DOPTION_TARGET_SMOLDYN_SOLVER=OFF \
-DOPTION_TARGET_FV_SOLVER=ON \
-DOPTION_TARGET_STOCHASTIC_SOLVER=ON \
-DOPTION_TARGET_NFSIM_SOLVER=ON \
-DOPTION_TARGET_MOVINGBOUNDARY_SOLVER=ON \
-DOPTION_TARGET_SUNDIALS_SOLVER=ON \
-DOPTION_TARGET_HY3S_SOLVERS=OFF \
-DOPTION_TARGET_DOCS=ON \
-B . -S ..
ninja
Expand All @@ -137,16 +130,9 @@ jobs:
-DCMAKE_CXX_COMPILER=/usr/local/opt/llvm/bin/clang++ \
-DOPTION_MINGW=ON \
-DOPTION_TARGET_MESSAGING=OFF \
-DOPTION_TARGET_PARALLEL=OFF \
-DOPTION_TARGET_CHOMBO2D_SOLVER=OFF \
-DOPTION_TARGET_CHOMBO3D_SOLVER=OFF \
-DOPTION_TARGET_SMOLDYN_SOLVER=ON \
-DOPTION_TARGET_SMOLDYN_SOLVER=OFF \
-DOPTION_TARGET_FV_SOLVER=ON \
-DOPTION_TARGET_STOCHASTIC_SOLVER=ON \
-DOPTION_TARGET_NFSIM_SOLVER=ON \
-DOPTION_TARGET_MOVINGBOUNDARY_SOLVER=ON \
-DOPTION_TARGET_SUNDIALS_SOLVER=ON \
-DOPTION_TARGET_HY3S_SOLVERS=OFF \
-DOPTION_TARGET_DOCS=ON \
-B . -S ..
ninja
Expand All @@ -172,10 +158,6 @@ jobs:
./bin/VCellStoch_x64 || true
echo "------ running smoldyn_x64 ------"
./bin/smoldyn_x64 || true
echo "------ running testzip ------"
./bin/testzip || true
echo "------ running ziptool ------"
./bin/ziptool || true
# - name: Setup tmate session
# uses: mxschmitt/action-tmate@v3
Expand All @@ -199,7 +181,6 @@ jobs:
mingw-w64-clang-x86_64-boost
mingw-w64-clang-x86_64-hdf5
mingw-w64-clang-x86_64-libzip
mingw-w64-clang-x86_64-netcdf
mingw-w64-clang-x86_64-zlib
mingw-w64-clang-x86_64-libaec
Expand All @@ -225,16 +206,8 @@ jobs:
-DCMAKE_C_COMPILER="clang.exe" \
-DCMAKE_CXX_COMPILER="clang++.exe" \
-DOPTION_TARGET_MESSAGING=OFF \
-DOPTION_TARGET_PARALLEL=OFF \
-DOPTION_TARGET_CHOMBO2D_SOLVER=OFF \
-DOPTION_TARGET_CHOMBO3D_SOLVER=OFF \
-DOPTION_TARGET_SMOLDYN_SOLVER=ON \
-DOPTION_TARGET_SMOLDYN_SOLVER=OFF \
-DOPTION_TARGET_FV_SOLVER=ON \
-DOPTION_TARGET_STOCHASTIC_SOLVER=ON \
-DOPTION_TARGET_NFSIM_SOLVER=ON \
-DOPTION_TARGET_MOVINGBOUNDARY_SOLVER=OFF \
-DOPTION_TARGET_SUNDIALS_SOLVER=ON \
-DOPTION_TARGET_HY3S_SOLVERS=OFF \
-DOPTION_TARGET_DOCS=OFF \
-B . -S ..
Expand All @@ -254,18 +227,6 @@ jobs:
echo "------ running FiniteVolume_x64 ------"
./bin/FiniteVolume_x64 || true
echo
echo "------ running NFsim_x64 ------"
./bin/NFsim_x64 || true
echo "------ running SundialsSolverStandalone_x64 ------"
./bin/SundialsSolverStandalone_x64 || true
echo "------ running VCellStoch_x64 ------"
./bin/VCellStoch_x64 || true
echo "------ running smoldyn_x64 ------"
./bin/smoldyn_x64 || true
echo "------ running testzip ------"
./bin/testzip || true
echo "------ running ziptool ------"
./bin/ziptool || true
- name: Install Linux Dependencies
if: matrix.platform == 'ubuntu-latest'
Expand Down Expand Up @@ -293,16 +254,9 @@ jobs:
cmake \
-G Ninja \
-DOPTION_TARGET_MESSAGING=OFF \
-DOPTION_TARGET_PARALLEL=OFF \
-DOPTION_TARGET_CHOMBO2D_SOLVER=OFF \
-DOPTION_TARGET_CHOMBO3D_SOLVER=OFF \
-DOPTION_TARGET_SMOLDYN_SOLVER=ON \
-DOPTION_TARGET_SMOLDYN_SOLVER=OFF \
-DOPTION_TARGET_FV_SOLVER=ON \
-DOPTION_TARGET_STOCHASTIC_SOLVER=ON \
-DOPTION_TARGET_NFSIM_SOLVER=ON \
-DOPTION_TARGET_MOVINGBOUNDARY_SOLVER=ON \
-DOPTION_TARGET_SUNDIALS_SOLVER=ON \
-DOPTION_TARGET_HY3S_SOLVERS=OFF \
-DOPTION_TARGET_DOCS=ON \
-B . -S ..
ninja
Expand All @@ -320,18 +274,6 @@ jobs:
echo "------ running FiniteVolume_x64 ------"
./bin/FiniteVolume_x64 || true
echo
echo "------ running NFsim_x64 ------"
./bin/NFsim_x64 || true
echo "------ running SundialsSolverStandalone_x64 ------"
./bin/SundialsSolverStandalone_x64 || true
echo "------ running VCellStoch_x64 ------"
./bin/VCellStoch_x64 || true
echo "------ running smoldyn_x64 ------"
./bin/smoldyn_x64 || true
echo "------ running testzip ------"
./bin/testzip || true
echo "------ running ziptool ------"
./bin/ziptool || true
- name: fix Macos shared object paths
Expand All @@ -340,27 +282,25 @@ jobs:
run: |
mkdir build/upload
cd build/bin
rm hello_test TestVCellStoch testzip ziptool || true
ls *_x64 | awk '{print $1}' | xargs -I '{}' otool -L '{}' | grep ")" | grep -v "build" | grep -v "System" | awk '{print $1}' | xargs -I '{}' cp -vn '{}' . || true
ls *.dylib | awk '{print $1}' | xargs -I '{}' otool -L '{}' | grep ")" | grep -v "build" | grep -v "System" | awk '{print $1}' | xargs -I '{}' cp -vn '{}' . || true
ls *.dylib | awk '{print $1}' | xargs -I '{}' otool -L '{}' | grep ")" | grep -v "build" | grep -v "System" | awk '{print $1}' | xargs -I '{}' cp -vn '{}' . || true
chmod u+w,+x *
tar czvf ../upload/mac64_bad_paths.tgz .
../../.github/scripts/install_name_tool_macos.sh
tar czvf ../upload/mac64.tgz --dereference .
tar czvf ../upload/fvsolver_mac64.tgz --dereference .
- name: handle shared object paths for Windows native build
if: matrix.platform == 'windows-latest'
shell: msys2 {0}
run: |
mkdir build/upload
cd build/bin
rm hello_test TestVCellStoch testzip ziptool || true
ls *.exe | awk '{print $1}' | xargs -I '{}' ldd '{}' | grep '=> /' | grep -v build | grep -iv windows | awk '{print $3}' | xargs -I '{}' cp -vn '{}' . || true
ls *.dll | awk '{print $1}' | xargs -I '{}' ldd '{}' | grep '=> /' | grep -v build | grep -iv windows | awk '{print $3}' | xargs -I '{}' cp -vn '{}' . || true
ls *.dll | awk '{print $1}' | xargs -I '{}' ldd '{}' | grep '=> /' | grep -v build | grep -iv windows | awk '{print $3}' | xargs -I '{}' cp -vn '{}' . || true
chmod u+w,+x *
zip ../upload/win64.zip ./*
zip ../upload/fvsolver_win64.zip ./*
cd ../..
# fi
Expand All @@ -370,41 +310,40 @@ jobs:
run: |
mkdir build/upload
cd build/bin
rm hello_test TestVCellStoch testzip ziptool || true
ls *_x64 | awk '{print $1}' | xargs -I '{}' ldd '{}' | grep "=> /" | grep -v "build" | awk '{print $3}' | xargs -I '{}' cp -vn '{}' . || true
ls *.so | awk '{print $1}' | xargs -I '{}' ldd '{}' | grep "=> /" | grep -v "build" | awk '{print $3}' | xargs -I '{}' cp -vn '{}' . || true
ls *.so | awk '{print $1}' | xargs -I '{}' ldd '{}' | grep "=> /" | grep -v "build" | awk '{print $3}' | xargs -I '{}' cp -vn '{}' . || true
chmod u+w,+x *
tar czvf ../upload/linux64.tgz --dereference .
tar czvf ../upload/fvsolver_linux64.tgz --dereference .
cd ../..
- name: Upload Intel Macos binaries
if: matrix.platform == 'macos-13'
uses: actions/upload-artifact@v4
with:
name: macos_x86_64.tgz
path: build/upload/mac64.tgz
name: fvsolver_macos_x86_64.tgz
path: build/upload/fvsolver_mac64.tgz

- name: Upload ARM Macos binaries
if: matrix.platform == 'macos-14'
uses: actions/upload-artifact@v4
with:
name: macos_arm64.tgz
path: build/upload/mac64.tgz
name: fvsolver_macos_arm64.tgz
path: build/upload/fvsolver_mac64.tgz

- name: Upload Windows binaries
if: matrix.platform == 'windows-latest'
uses: actions/upload-artifact@v4
with:
name: win64.zip
path: build/upload/win64.zip
name: fvsolver_win64.zip
path: build/upload/fvsolver_win64.zip

- name: Upload Linux binaries
if: matrix.platform == 'ubuntu-latest'
uses: actions/upload-artifact@v4
with:
name: linux64.tgz
path: build/upload/linux64.tgz
name: fvsolver_linux64.tgz
path: build/upload/fvsolver_linux64.tgz

- name: Setup tmate session
if: ${{ failure() }}
Expand Down
91 changes: 0 additions & 91 deletions .travis.yml

This file was deleted.

Loading

0 comments on commit e148342

Please sign in to comment.