Skip to content

Commit 0c3214b

Browse files
nawazishkhan1-nknawazishkhan1-nk
authored
Merge branch 'master' into regressionv2
2 parents b1ad5a1 + c73a9e2 commit 0c3214b

44 files changed

Lines changed: 718 additions & 621 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-linux-debug.yml‎

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,6 @@ jobs:
2828

2929
steps:
3030

31-
- name: Install SSH Key
32-
uses: shimataro/ssh-key-action@v2.7.0
33-
with:
34-
key: ${{ secrets.SSH_PRIVATE_KEY }}
35-
known_hosts: ${{ secrets.KNOWN_HOSTS }}
36-
3731
- name: Conda info
3832
run: conda info
3933

@@ -60,10 +54,6 @@ jobs:
6054
- name: Get tags
6155
run: git fetch --unshallow origin +refs/tags/*:refs/tags/*
6256

63-
- name: Restore Caches
64-
shell: bash -l {0}
65-
run: .github/workflows/restore_caches.sh
66-
6757
- name: Check space3
6858
run: df -h
6959

@@ -83,7 +73,7 @@ jobs:
8373

8474
- name: cmake
8575
shell: bash -l {0}
86-
run: conda activate shapeworks && mkdir build && cd build && cmake -DCMAKE_CXX_FLAGS=-g -DITK_DIR=$HOME/install/lib/cmake/ITK-5.2 -DVTK_DIR=$HOME/install/lib/cmake/vtk-9.1 -DXLNT_DIR=$HOME/install -DLIBIGL_DIR=$HOME/install -DOpenVDB_DIR=$HOME/install/lib/cmake/OpenVDB -DGEOMETRYCENTRAL_DIR=$HOME/install -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DBuild_Studio=ON -DJKQTCommonSharedLib_DIR=$HOME/install/lib/cmake/JKQTCommonSharedLib -DJKQTMathTextSharedLib_DIR=$HOME/install/lib/cmake/JKQTMathTextSharedLib -DJKQTPlotterSharedLib_DIR=$HOME/install/lib/cmake/JKQTPlotterSharedLib -DACVD_DIR=$HOME/install -DCMAKE_PREFIX_PATH=${CONDA_PREFIX} -DCMAKE_INSTALL_PREFIX=${GITHUB_WORKSPACE}/shapeworks-install -DUSE_ORIGIN_RPATH=ON ..
76+
run: conda activate shapeworks && mkdir build && cd build && cmake -DCMAKE_CXX_FLAGS=-g -DITK_DIR=$HOME/install/lib/cmake/ITK-5.3 -DVTK_DIR=$HOME/install/lib/cmake/vtk-9.1 -DXLNT_DIR=$HOME/install -DLIBIGL_DIR=$HOME/install -DOpenVDB_DIR=$HOME/install/lib/cmake/OpenVDB -DGEOMETRYCENTRAL_DIR=$HOME/install -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DBuild_Studio=ON -DJKQTCommonSharedLib_DIR=$HOME/install/lib/cmake/JKQTCommonSharedLib -DJKQTMathTextSharedLib_DIR=$HOME/install/lib/cmake/JKQTMathTextSharedLib -DJKQTPlotterSharedLib_DIR=$HOME/install/lib/cmake/JKQTPlotterSharedLib -DACVD_DIR=$HOME/install -DCMAKE_PREFIX_PATH=${CONDA_PREFIX} -DCMAKE_INSTALL_PREFIX=${GITHUB_WORKSPACE}/shapeworks-install -DUSE_ORIGIN_RPATH=ON ..
8777

8878
- name: Check space6
8979
run: df -h
@@ -106,9 +96,4 @@ jobs:
10696
- name: make test
10797
shell: bash -l {0}
10898
run: conda activate shapeworks && source ./devenv.sh ./build/bin && cd build && ctest -VV
109-
110-
- name: Store ccache
111-
shell: bash -l {0}
112-
run: .github/workflows/store_ccache.sh
113-
11499

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

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,6 @@ jobs:
2929

3030
steps:
3131

32-
- name: Install SSH Key
33-
uses: shimataro/ssh-key-action@v2.7.0
34-
with:
35-
key: ${{ secrets.SSH_PRIVATE_KEY }}
36-
known_hosts: ${{ secrets.KNOWN_HOSTS }}
37-
3832
- name: Conda info
3933
run: conda info
4034

@@ -61,10 +55,6 @@ jobs:
6155
- name: Check space3
6256
run: df -h
6357

64-
- name: Restore Caches
65-
shell: bash -l {0}
66-
run: .github/workflows/restore_caches.sh
67-
6858
- name: Conda Installs
6959
shell: bash -l {0}
7060
run: .github/workflows/gha_conda.sh
@@ -82,7 +72,7 @@ jobs:
8272

8373
- name: cmake
8474
shell: bash -l {0}
85-
run: conda activate shapeworks && mkdir build && cd build && cmake -DCMAKE_CXX_FLAGS=-g -DITK_DIR=$HOME/install/lib/cmake/ITK-5.2 -DVTK_DIR=$HOME/install/lib/cmake/vtk-9.1 -DXLNT_DIR=$HOME/install -DLIBIGL_DIR=$HOME/install -DOpenVDB_DIR=$HOME/install/lib/cmake/OpenVDB -DGEOMETRYCENTRAL_DIR=$HOME/install -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DBuild_Studio=ON -DJKQTCommonSharedLib_DIR=$HOME/install/lib/cmake/JKQTCommonSharedLib -DJKQTMathTextSharedLib_DIR=$HOME/install/lib/cmake/JKQTMathTextSharedLib -DJKQTPlotterSharedLib_DIR=$HOME/install/lib/cmake/JKQTPlotterSharedLib -DACVD_DIR=$HOME/install -DCMAKE_PREFIX_PATH=${CONDA_PREFIX} -DCMAKE_INSTALL_PREFIX=${GITHUB_WORKSPACE}/shapeworks-install -DUSE_ORIGIN_RPATH=ON -DGA_MEASUREMENT_ID=$GA_MEASUREMENT_ID -DGA_API_SECRET=$GA_API_SECRET ..
75+
run: conda activate shapeworks && mkdir build && cd build && cmake -DCMAKE_CXX_FLAGS=-g -DITK_DIR=$HOME/install/lib/cmake/ITK-5.3 -DVTK_DIR=$HOME/install/lib/cmake/vtk-9.1 -DXLNT_DIR=$HOME/install -DLIBIGL_DIR=$HOME/install -DOpenVDB_DIR=$HOME/install/lib/cmake/OpenVDB -DGEOMETRYCENTRAL_DIR=$HOME/install -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DBuild_Studio=ON -DJKQTCommonSharedLib_DIR=$HOME/install/lib/cmake/JKQTCommonSharedLib -DJKQTMathTextSharedLib_DIR=$HOME/install/lib/cmake/JKQTMathTextSharedLib -DJKQTPlotterSharedLib_DIR=$HOME/install/lib/cmake/JKQTPlotterSharedLib -DACVD_DIR=$HOME/install -DCMAKE_PREFIX_PATH=${CONDA_PREFIX} -DCMAKE_INSTALL_PREFIX=${GITHUB_WORKSPACE}/shapeworks-install -DUSE_ORIGIN_RPATH=ON -DGA_MEASUREMENT_ID=$GA_MEASUREMENT_ID -DGA_API_SECRET=$GA_API_SECRET ..
8676

8777
- name: Check space5
8878
run: df -h
@@ -115,10 +105,6 @@ jobs:
115105
shell: bash -l {0}
116106
run: conda activate shapeworks && source ./devenv.sh ./build/bin && cd build && ctest -VV
117107

118-
- name: Copy artifact
119-
shell: bash -l {0}
120-
run: cd /__w/ShapeWorks/ShapeWorks/artifacts && ${GITHUB_WORKSPACE}/.github/workflows/copy_artifact.sh artifact-${{github.sha}}-linux *
121-
122108
- uses: actions/upload-artifact@v2
123109
with:
124110
name: artifact-${{github.sha}}-linux
@@ -135,9 +121,4 @@ jobs:
135121
title: "Development Build for Linux"
136122
files: |
137123
${{runner.workspace}}/ShapeWorks/artifacts/*.tar.gz
138-
139-
- name: Store ccache
140-
shell: bash -l {0}
141-
run: .github/workflows/store_ccache.sh
142-
143124

‎.github/workflows/build-mac-arm64.yml‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,6 @@ jobs:
2828

2929
steps:
3030

31-
- name: Install SSH Key
32-
uses: shimataro/ssh-key-action@v2
33-
with:
34-
key: ${{ secrets.SSH_PRIVATE_KEY }}
35-
known_hosts: ${{ secrets.KNOWN_HOSTS }}
36-
3731
- name: Setup Miniconda
3832
uses: conda-incubator/setup-miniconda@v3.0.4
3933

@@ -52,10 +46,6 @@ jobs:
5246
- name: Get tags
5347
run: git fetch --unshallow origin +refs/tags/*:refs/tags/*
5448

55-
- name: Restore Caches
56-
shell: bash -l {0}
57-
run: .github/workflows/restore_caches.sh
58-
5949
- name: Conda Installs
6050
shell: bash -l {0}
6151
run: .github/workflows/gha_conda.sh
@@ -115,12 +105,4 @@ jobs:
115105
env:
116106
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
117107
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
118-
119-
- name: Store ccache
120-
shell: bash -l {0}
121-
run: .github/workflows/store_ccache.sh
122-
123-
- name: Copy artifact
124-
shell: bash -l {0}
125-
run: cd ${{runner.workspace}}/ShapeWorks && ${GITHUB_WORKSPACE}/.github/workflows/copy_artifact.sh artifact-${{github.sha}}-mac-arm64 artifacts
126108

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

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,6 @@ jobs:
2828

2929
steps:
3030

31-
- name: Install SSH Key
32-
uses: shimataro/ssh-key-action@v2
33-
with:
34-
key: ${{ secrets.SSH_PRIVATE_KEY }}
35-
known_hosts: ${{ secrets.KNOWN_HOSTS }}
36-
3731
- name: OS Setup
3832
run: |
3933
ls /usr/local
@@ -57,10 +51,6 @@ jobs:
5751
- name: Get tags
5852
run: git fetch --unshallow origin +refs/tags/*:refs/tags/*
5953

60-
- name: Restore Caches
61-
shell: bash -l {0}
62-
run: .github/workflows/restore_caches.sh
63-
6454
- name: Conda Installs
6555
shell: bash -l {0}
6656
run: .github/workflows/gha_conda.sh
@@ -120,12 +110,3 @@ jobs:
120110
env:
121111
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
122112
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
123-
124-
- name: Store ccache
125-
shell: bash -l {0}
126-
run: .github/workflows/store_ccache.sh
127-
128-
- name: Copy artifact
129-
shell: bash -l {0}
130-
run: cd ${{runner.workspace}}/ShapeWorks && ${GITHUB_WORKSPACE}/.github/workflows/copy_artifact.sh artifact-${{github.sha}}-mac artifacts
131-

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

Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
- name: Init conda
4040
shell: bash -l {0}
4141
run: /c/Miniconda/condabin/conda.bat init --all
42-
42+
4343
# - name: link
4444
# shell: bash -l {0}
4545
# run: cd /usr/bin && ln -s /c/Miniconda/condabin/conda.bat conda
@@ -65,12 +65,6 @@ jobs:
6565
# with:
6666
# miniconda-version: 'latest'
6767

68-
- name: Install SSH Key
69-
uses: shimataro/ssh-key-action@v2
70-
with:
71-
key: ${{ secrets.SSH_PRIVATE_KEY }}
72-
known_hosts: ${{ secrets.KNOWN_HOSTS }}
73-
7468
- name: Checkout code
7569
uses: actions/checkout@v3
7670
with:
@@ -79,16 +73,16 @@ jobs:
7973
- name: Get tags
8074
run: git fetch --unshallow origin +refs/tags/*:refs/tags/*
8175

76+
- name: Download test data
77+
shell: bash -l {0}
78+
run: .github/workflows/download_test_data.sh
79+
8280
- name: Get NSIS
8381
working-directory: ${{runner.workspace}}
8482
run: |
8583
curl -o nsis.zip http://www.sci.utah.edu/~amorris/NSISPortable_3.04.zip
8684
Expand-Archive -LiteralPath nsis.zip -DestinationPath .
8785
88-
- name: Restore Caches
89-
shell: bash -l {0}
90-
run: .github/workflows/restore_caches.sh
91-
9286
- name: Conda Installs
9387
shell: bash -l {0}
9488
run: .github/workflows/gha_conda.sh
@@ -115,7 +109,7 @@ jobs:
115109
# Note the current convention is to use the -S and -B options here to specify source
116110
# and build directories, but this is only available with CMake 3.13 and higher.
117111
# The CMake binaries on the Github Actions machines are (as of this writing) 3.12
118-
run: conda activate shapeworks && cmake $GITHUB_WORKSPACE -DCMAKE_CXX_FLAGS="-FS" -DCMAKE_C_FLAGS="-FS" -DCMAKE_CXX_FLAGS_RELEASE="-FS /Zm500 /Zi /GL /MD /O2 /Ob3 /DNDEBUG /EHsc" -DCMAKE_C_FLAGS_RELEASE="-FS /Zi /GL /MD /O2 /Ob3 /DNDEBUG /EHsc" -DCMAKE_SHARED_LINKER_FLAGS_RELEASE="-LTCG /DEBUG" -DCMAKE_EXE_LINKER_FLAGS_RELEASE="-LTCG /DEBUG" -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DITK_DIR="C:\deps\lib\cmake\ITK-5.2" -DVTK_DIR="C:\deps\lib\cmake\vtk-9.1" -DXLNT_DIR="C:\deps" -DLIBIGL_DIR="C:\deps" -DJKQTCommonSharedLib_DIR="C:/deps/lib/cmake/JKQTCommonSharedLib" -DJKQTMathTextSharedLib_DIR="C:/deps/lib/cmake/JKQTMathTextSharedLib" -DJKQTPlotterSharedLib_DIR="C:/deps/lib/cmake/JKQTPlotterSharedLib" -DOpenVDB_DIR="C:\deps\lib\cmake\OpenVDB" -DGEOMETRYCENTRAL_DIR="C:\deps" -DACVD_DIR="C:\deps" -DBuild_Studio=ON -DGA_MEASUREMENT_ID=$GA_MEASUREMENT_ID -DGA_API_SECRET=$GA_API_SECRET
112+
run: conda activate shapeworks && cmake $GITHUB_WORKSPACE -DCMAKE_CXX_FLAGS="-FS" -DCMAKE_C_FLAGS="-FS" -DCMAKE_CXX_FLAGS_RELEASE="-FS /Zm500 /Zi /GL /MD /O2 /Ob3 /DNDEBUG /EHsc" -DCMAKE_C_FLAGS_RELEASE="-FS /Zi /GL /MD /O2 /Ob3 /DNDEBUG /EHsc" -DCMAKE_SHARED_LINKER_FLAGS_RELEASE="-LTCG /DEBUG" -DCMAKE_EXE_LINKER_FLAGS_RELEASE="-LTCG /DEBUG" -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DITK_DIR="C:\deps\lib\cmake\ITK-5.3" -DVTK_DIR="C:\deps\lib\cmake\vtk-9.1" -DXLNT_DIR="C:\deps" -DLIBIGL_DIR="C:\deps" -DJKQTCommonSharedLib_DIR="C:/deps/lib/cmake/JKQTCommonSharedLib" -DJKQTMathTextSharedLib_DIR="C:/deps/lib/cmake/JKQTMathTextSharedLib" -DJKQTPlotterSharedLib_DIR="C:/deps/lib/cmake/JKQTPlotterSharedLib" -DOpenVDB_DIR="C:\deps\lib\cmake\OpenVDB" -DGEOMETRYCENTRAL_DIR="C:\deps" -DACVD_DIR="C:\deps" -DBuild_Studio=ON -DGA_MEASUREMENT_ID=$GA_MEASUREMENT_ID -DGA_API_SECRET=$GA_API_SECRET
119113

120114
- name: Build
121115
working-directory: "C:/build"
@@ -174,8 +168,3 @@ jobs:
174168
title: "Development Build for Windows"
175169
files: |
176170
d:/a/ShapeWorks/ShapeWorks/artifacts/*.exe
177-
178-
- name: Copy artifact
179-
shell: bash -l {0}
180-
run: cd /d/a/ShapeWorks/ShapeWorks/artifacts && ${GITHUB_WORKSPACE}/.github/workflows/copy_artifact.sh artifact-${{github.sha}}-windows *
181-

‎.github/workflows/download_test_data.sh‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,16 @@ BASE=`pwd`
1313
# based on root folder
1414
cd /
1515

16+
# if platform is windows, install wget
17+
if [ "$PLATFORM" == "windows" ]; then
18+
choco install wget --no-progress
19+
fi
1620

1721
# Tiny test data downloads
1822
for run in {1..5}; do
1923
if [ ! -f /tmp/tiny_test_cache.tar.gz ] ; then
20-
scp runner@${CACHE_HOST}:github/tiny_test_cache.tar.gz /tmp || true
24+
cd /tmp
25+
wget https://www.sci.utah.edu/~shapeworks/doc-resources/zips/tiny_test_cache.tar.gz || true
2126
sleep 1
2227
fi
2328
done

‎.github/workflows/gha_conda.sh‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,6 @@ else
1515
# run install
1616
source ./install_shapeworks.sh --developer
1717
conda clean -p -t -y
18-
19-
echo "Create and store cache"
20-
cd /
21-
compress_file /tmp/${CONDA_FILE} "${CONDA_PATH}"
22-
scp /tmp/${CONDA_FILE} runner@${CACHE_HOST}:github
23-
rm /tmp/${CONDA_FILE}
2418
fi
2519

2620
conda init bash

‎.github/workflows/gha_deps.sh‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,4 @@ else
3838

3939
./build_dependencies.sh --build-type=$BUILD_TYPE --num-procs=$NPROCS --clean-after
4040
rm -rf $BUILD_DIR
41-
42-
echo "Create and store cache"
43-
cd /
44-
compress_file ${FILE} "${DEP_PATH}"
45-
scp ${FILE} runner@${CACHE_HOST}:github
46-
rm ${FILE}
4741
fi

‎CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ endif()
135135
find_package (Eigen3 3.3 REQUIRED NO_MODULE)
136136

137137
### ITK
138-
FIND_PACKAGE(ITK 5.2.1 REQUIRED)
138+
FIND_PACKAGE(ITK 5.3.0 REQUIRED)
139139
IF (ITK_FOUND)
140140
INCLUDE(${ITK_USE_FILE})
141141
ELSE()

‎Examples/Python/Data/femur_pvalues.zip‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
version https://git-lfs.github.com/spec/v1
2+
oid sha256:9105d2c3e61ffd4cbff59584258807ee2250b8723ceff519a37694cbcad8033b
3+
size 350473

0 commit comments

Comments
 (0)