Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support for compiling FreeSurfer from source #445

Open
wants to merge 98 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
98 commits
Select commit Hold shift + click to select a range
997931e
[WIP] working in freesurfer from source
pwighton Feb 26, 2021
2bc36ec
[WIP] trying to port mcr template
pwighton Feb 26, 2021
2122231
[WIP] env vars for fs from source
pwighton Feb 26, 2021
e04b2ca
[WIP] tweaks
pwighton Feb 26, 2021
e389f8c
[WIP] up to `make install`
pwighton Mar 2, 2021
2dad8b5
[WIP] having issues with git annex
pwighton Mar 4, 2021
c35aa7f
[WIP] working verison?
pwighton Mar 4, 2021
0bebb04
[FIX] tweaks
pwighton Mar 4, 2021
63d1bb8
[WIP] this builds fs
pwighton Mar 4, 2021
ca16170
[WIP] a lot more params
pwighton Mar 4, 2021
c181b65
[FIX] tweaks
pwighton Mar 4, 2021
db108aa
[WIP] working on infant stream from source
pwighton Mar 5, 2021
57bfc55
[FIX] installs python reqs
pwighton Apr 27, 2021
716ffeb
[FIX] typo
pwighton Apr 27, 2021
e764a3a
[WIP] aws buildspec
pwighton May 3, 2021
080f7ed
[WIP] fix
pwighton May 3, 2021
8044d6e
[WIP] fix
pwighton May 3, 2021
10a81b5
[FIX] wrap around martinos specific niftireg install
pwighton May 7, 2021
40fad5e
[FIX] var rename
pwighton May 7, 2021
071f480
[WIP] adding unzip
pwighton May 7, 2021
a5625b4
[FIX] upgrating fs python env to 3.6.8
pwighton May 11, 2021
7c029d8
[GIT] manual merge
pwighton May 13, 2021
943679f
[WIP] install python env for non infant stream
pwighton May 13, 2021
5a3f2e5
[WIP] re-arrange cause git annex is slow
pwighton May 13, 2021
ecc824f
[WIP] debug echos
pwighton May 13, 2021
294f31e
[FIX] bash bugfix
pwighton May 20, 2021
efcea8c
[WIP]
pwighton May 20, 2021
c6f5fd3
[WIP] syntax
pwighton May 20, 2021
16a2378
[FIX] to support samseg vis
pwighton May 26, 2021
05701e1
[WIP] to support samseg atlas building utils
pwighton Jun 8, 2021
b572b5b
[WIP] re-arrange
pwighton Jun 8, 2021
955b927
[WIP] samseg atlas utils
pwighton Jun 8, 2021
3922ff7
[FIX] unlocking git annex before `make install`
pwighton Jun 15, 2021
216af34
[WIP] using -DGEMS_BUILD_EXECUTABLES to build samseg atlas tools
pwighton Jun 23, 2021
8d6abc0
[WIP] test..
pwighton Jun 23, 2021
19d4678
[FIX] moving default fs pkg dir, so /tmp can safely be removed
pwighton Jul 2, 2021
6d672ba
[FIX] adds pythonpath env var for fs packages
pwighton Jul 7, 2021
72a9c8c
[WIP] the beginnings of dev options
pwighton Jul 13, 2021
358f9d8
[FIX] fs path stomp fix
pwighton Jul 13, 2021
04d1a8a
[FIX] path stomp bug take 2: electric boogaloo
pwighton Jul 13, 2021
3a1d539
[WIP] tweaks for jupyter
pwighton Aug 11, 2021
1a87d27
Merge branch 'master' into 20210513-fs-source-and-infant-merge
pwighton Aug 11, 2021
e728e7a
[WIP] prereqs for jupyter
pwighton Aug 13, 2021
ba3eb99
[WIP] New Params
pwighton Aug 13, 2021
396248c
[WIP] refactor to use jinja conditionals
pwighton Aug 25, 2021
aeac0d0
[FIX] syntax
pwighton Aug 26, 2021
244e913
[WIP] test
pwighton Aug 26, 2021
38fdf90
[WIP] debug
pwighton Aug 26, 2021
e7a2113
[WIP] adding license stuff back
pwighton Aug 27, 2021
d0005e9
[FIX]
pwighton Aug 31, 2021
a352ac2
[FIX] formatting
pwighton Sep 8, 2021
510a9e7
[FIX] formatting
pwighton Sep 8, 2021
5236bfd
[WIP] syntax text
pwighton Sep 8, 2021
4b57ea8
[WIP] test
pwighton Sep 8, 2021
0ea929f
[WIP] test
pwighton Sep 8, 2021
21fa66a
[FIX] wip
pwighton Sep 8, 2021
a44107e
[FIX] wip
pwighton Sep 8, 2021
79b02f6
[WIP] adding awscli as a dev tool (prolly not the best palce)
pwighton Sep 9, 2021
319d14b
[WIP] updating mni envs
pwighton Sep 10, 2021
bb0d615
[WIP] adding the ability to select indv commit
pwighton Sep 22, 2021
ed37f87
[FIX] dropping --single-branch from git clone
pwighton Sep 22, 2021
7f17fa1
[WIP] test..
pwighton Sep 23, 2021
e5fc06e
[WIP] full test
pwighton Sep 23, 2021
e412c5c
[WIP] syntax test
pwighton Sep 23, 2021
c8b87cf
[FIX] adding back matlabmcr
pwighton Sep 24, 2021
93f689e
[FIX] applying @kaczmarj's diff
pwighton Oct 15, 2021
00c665a
[FIX] merging matlabmcr
pwighton Oct 15, 2021
e174eb5
[WIP] infant tensorflow fix
pwighton Oct 16, 2021
9939378
[WIP] not installing extra reqs with dev tools
pwighton Oct 18, 2021
6f1aa33
[WIP] tweaks for singularity
pwighton Nov 5, 2021
da4c72a
[FIX] moving from /tmp to /stage for singularity
pwighton Nov 16, 2021
94e704f
[WIP] changing fs source dir to /stage and symlinking infant aws entr…
pwighton Nov 17, 2021
7e0885a
[WIP] merging in support for fs720
pwighton Nov 23, 2021
9da3823
[WIP] trying to support deb and rpm installations
pwighton Feb 15, 2022
84636a3
[DOC]
pwighton Feb 15, 2022
300796f
[WIP] infant model inside container
pwighton Mar 28, 2022
cda0118
[WIP] copying the infant model into the container, but not by default
pwighton Mar 29, 2022
f2721cc
[FIX] syntax tweak
pwighton Apr 8, 2022
95055e0
[WIP] syntax tweak
pwighton Apr 8, 2022
a9071f9
[WIP] syntax tweak
pwighton Apr 8, 2022
7eabc6d
[FIX] syntax
pwighton Apr 11, 2022
632b11e
[WIP]
pwighton Apr 12, 2022
669fbaf
[WIP]
pwighton Apr 12, 2022
68dc87a
[FIX] defining SSCNN_MODEL_DIR
pwighton Apr 13, 2022
ca592a3
[FIX] defining SSCNN_MODEL_DIR
pwighton Apr 13, 2022
a05eef7
[ENH] making `branch` optional
pwighton Apr 14, 2022
fccfac4
Merge branch 'master' into 20220414-fs-source
pwighton Apr 14, 2022
12d0f21
[GIT] removing buildspec before PR
pwighton Apr 14, 2022
1fd938c
[FIX] remove whitespace
pwighton Jun 9, 2022
368b2f7
[WIP] adding back buildspec
pwighton Jun 9, 2022
e6a2af8
[WIP] syntax tweak to support commit param
pwighton Jun 9, 2022
2900180
[GIT] removing buildspec before pushing upstream
pwighton Jun 9, 2022
730aff3
[WIP] updating fs python to 3.6.8
pwighton Jun 10, 2022
2625184
[FIX] fix for issue #449
pwighton Aug 3, 2022
5ae1a83
Merge branch 'master' of github.com:ReproNim/neurodocker
pwighton Aug 22, 2022
8f94055
Merge pull request #1 from ReproNim/master
Oct 21, 2023
cfc0060
Bringing Freesurfer-from-source up to date with master branch
Oct 21, 2023
3f586d0
Merge pull request #1 from Alafia-Ai/20220414-fs-source
pwighton Oct 23, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
[FIX] defining SSCNN_MODEL_DIR
pwighton committed Apr 13, 2022
commit 68dc87a3340d365d5a56e5e978fc5c03e4a729cf
9 changes: 6 additions & 3 deletions neurodocker/templates/freesurfer.yaml
Original file line number Diff line number Diff line change
@@ -7,6 +7,9 @@ binaries:
- version
optional:
install_path: /opt/freesurfer-{{ self.version }}
license_base64: ""
license_path: "/opt"
license_file: license.txt
exclude_paths: |
average/mult-comp-cor
lib/cuda
@@ -120,6 +123,8 @@ source:
optional:
commit: ""
license_base64: ""
license_path: "/opt"
license_file: license.txt
# The subject dir is not in /opt, like everything else FreeSurfer-related
# Because if we want to run `neurodocker minify` we want to operate over the `/opt`
# dir and have the subjects dir excluded
@@ -149,9 +154,6 @@ source:
source_path: /stage/freesurfer/freesurfer-{{ self.branch }}
pkg_path: /opt/freesurfer-pkg
install_path: /opt/freesurfer-{{ self.branch }}
# This one has to be quoted with \"s for some reason
license_path: "/opt"
license_file: license.txt
cxx_flags: "-msse2 -mfpmath=sse -fPIC -fpermissive"
c_flags: "-msse2 -mfpmath=sse -fPIC"
cmake_opts: -DCMAKE_INSTALL_PREFIX={{ self.install_path }} -DBUILD_GUIS={{ self.build_guis }} -DMINIMAL={{ self.minimal }} -DINFANT_MODULE={{ self.infant_module }} -DFS_PACKAGES_DIR={{ self.pkg_path }} -DGFORTRAN_LIBRARIES={{ self.fortran_libs }} -DINSTALL_PYTHON_DEPENDENCIES={{ self.install_python_deps }} -DDISTRIBUTE_FSPYTHON={{ self.distribute_fspython }} -DMARTINOS_BUILD={{ self.martinos_build }} -DGEMS_BUILD_EXECUTABLES={{ self.samseg_atlas_build }} -DCMAKE_CXX_COMPILER=/usr/bin/g++ -DCMAKE_CXX_COMPILER_AR=/usr/bin/ar -DCMAKE_CXX_COMPILER_RANLIB=/usr/bin/ranlib -DCMAKE_CXX_FLAGS="{{ self.cxx_flags }}" -DCMAKE_C_COMPILER=/usr/bin/cc -DCMAKE_C_COMPILER_AR=/usr/bin/ar -DCMAKE_C_COMPILER_RANLIB=/usr/bin/ranlib -DCMAKE_C_FLAGS="{{ self.c_flags }}"
@@ -160,6 +162,7 @@ source:
FS_LICENSE: "{{ self.license_path }}/{{ self.license_file }}"
SUBJECTS_DIR: "{{ self.subjects_dir }}"
FS_INFANT_MODEL: "{{ self.infant_model_dir }}"
SSCNN_MODEL_DIR: "{{ self.infant_model_dir }}"/sscnn_skullstrip
# From https://github.com/freesurfer/freesurfer/blob/54018f7d6f620d6288b28f50e14a0a4ba421757c/Dockerfile#L20-L42
OS: "Linux"
PATH: "{{ self.niftyreg_path }}/bin:{{ self.pkg_path }}/mni/current/bin:{{ self.install_path }}/bin:{{ self.install_path }}/fsfast/bin:{{ self.install_path }}/tktools:{{ self.install_path }}/mni/bin:$PATH"