Commit a014870b authored by Paul McCarthy's avatar Paul McCarthy 🚵
Browse files

Merge remote-tracking branch 'origin/master' into mnt/external

parents 2afc175f 0c966540
...@@ -74,6 +74,7 @@ installer: 1.2.3 ...@@ -74,6 +74,7 @@ installer: 1.2.3
miniconda: miniconda:
linux-64: https://github.com/conda-forge/miniforge/releases/download/4.10.3-1/Miniforge3-4.10.3-1-Linux-x86_64.sh linux-64: https://github.com/conda-forge/miniforge/releases/download/4.10.3-1/Miniforge3-4.10.3-1-Linux-x86_64.sh
macos-64: https://github.com/conda-forge/miniforge/releases/download/4.10.3-1/Miniforge3-4.10.3-1-MacOSX-x86_64.sh macos-64: https://github.com/conda-forge/miniforge/releases/download/4.10.3-1/Miniforge3-4.10.3-1-MacOSX-x86_64.sh
macos-M1: https://github.com/conda-forge/miniforge/releases/download/4.10.3-1/Miniforge3-4.10.3-1-MacOSX-arm64.sh
# Versions of CUDA for which FSL packages are # Versions of CUDA for which FSL packages are
# built (currently only available on Linux). # built (currently only available on Linux).
...@@ -114,21 +115,16 @@ packages: ...@@ -114,21 +115,16 @@ packages:
- fslpy 3.7.0 - fslpy 3.7.0
- fsl-avwutils 2007.0 - fsl-avwutils 2007.0
- fsl-base 2109.1 - fsl-base 2109.1
- fsl-eddy-cpu 2106.0 - fsl-eddy 2106.0
- fsl-sub 2.5.8 - fsl-sub 2.5.8
- libopenblas 0.3.18 *openmp* - libopenblas 0.3.18 *openmp*
... ...
# List of additional packages that # List of additional platform-specific
# are added to linux-64 installations. # packages to be installed.
linux-64-packages: [] linux-64-packages: []
macos-64-packages: []
# List of additional packages that macos-M1-packages: []
# are added to macos-64 installations.
macos-64-packages:
# Newer libffi causes FSLeyes to segfault:
# https://github.com/conda-forge/pyobjc-core-feedstock/issues/37
- libffi 3.3
``` ```
......
...@@ -13,6 +13,7 @@ installer: 1.5.0 ...@@ -13,6 +13,7 @@ installer: 1.5.0
miniconda: miniconda:
linux-64: https://github.com/conda-forge/miniforge/releases/download/4.10.3-7/Miniforge3-4.10.3-7-Linux-x86_64.sh linux-64: https://github.com/conda-forge/miniforge/releases/download/4.10.3-7/Miniforge3-4.10.3-7-Linux-x86_64.sh
macos-64: https://github.com/conda-forge/miniforge/releases/download/4.10.3-7/Miniforge3-4.10.3-7-MacOSX-x86_64.sh macos-64: https://github.com/conda-forge/miniforge/releases/download/4.10.3-7/Miniforge3-4.10.3-7-MacOSX-x86_64.sh
macos-M1: https://github.com/conda-forge/miniforge/releases/download/4.10.3-7/Miniforge3-4.10.3-7-MacOSX-arm64.sh
# Versions of CUDA for which FSL packages are # Versions of CUDA for which FSL packages are
# built (currently only available on Linux). # built (currently only available on Linux).
...@@ -41,9 +42,9 @@ internal-channel: http://${FSLCONDA_USERNAME}:${FSLCONDA_PASSWORD}@fsl.fmrib.ox. ...@@ -41,9 +42,9 @@ internal-channel: http://${FSLCONDA_USERNAME}:${FSLCONDA_PASSWORD}@fsl.fmrib.ox.
base-packages: base-packages:
- fslpy - fslpy
- fsl-base - fsl-base
- fsl-sub - fsl_sub
- fsl-sub_plugin_sge - fsl_sub_plugin_sge
- fsl-sub_plugin_slurm - fsl_sub_plugin_slurm
- libopenblas - libopenblas
# List of all packages that comprise a FSL # List of all packages that comprise a FSL
...@@ -58,21 +59,22 @@ packages: ...@@ -58,21 +59,22 @@ packages:
- fsl-add_module 0.3.2 - fsl-add_module 0.3.2
- fsl-armawrap 0.6.0 - fsl-armawrap 0.6.0
- fsl-asl_mfree v1.0.2 - fsl-asl_mfree v1.0.2
- fsl-avwutils 2101.0 - fsl-avwutils 2111.0
- fsl-base 2111.3 - fsl-base 2111.8
- fsl-basil v4.0.4 - fsl-basil v4.0.4
- fsl-basisfield 1910.0 - fsl-basisfield 2111.0
- fsl-baycest 2012.0 - fsl-baycest 2111.0
- fsl-bet2 2103.0 - fsl-bet2 2111.0
- fsl-bianca 2106.0 - fsl-bianca 2106.0
- fsl-bint 2012.0 - fsl-biancaData 2006.0
- fsl-cluster 2004.0 - fsl-bint 2111.0
- fsl-cprob 2006.0 - fsl-cluster 2111.0
- fsl-cudabasisfield-cuda-9.2 2101.0 - fsl-cprob 2111.0
- fsl-cudabasisfield-cuda-10.2 2101.0 - fsl-cudabasisfield-cuda-9.2 1.1.0
- fsl-cudabasisfield-cuda-11.0 2101.0 - fsl-cudabasisfield-cuda-10.2 1.1.0
- fsl-cudabasisfield-cuda-11.1 2101.0 - fsl-cudabasisfield-cuda-11.0 1.1.0
- fsl-cudabasisfield-cuda-11.3 2101.0 - fsl-cudabasisfield-cuda-11.1 1.1.0
- fsl-cudabasisfield-cuda-11.3 1.1.0
- fsl-cudimot 2006.0 - fsl-cudimot 2006.0
- fsl-data_atlases 2103.0 - fsl-data_atlases 2103.0
- fsl-data_atlases_xtract 1.1.0 - fsl-data_atlases_xtract 1.1.0
...@@ -83,12 +85,12 @@ packages: ...@@ -83,12 +85,12 @@ packages:
- fsl-data_standard 2006.0 - fsl-data_standard 2006.0
- fsl-deface 1.2.0 - fsl-deface 1.2.0
- fsl-discreteopt 2008.0 - fsl-discreteopt 2008.0
- fsl-eddy 2106.1 - fsl-eddy 2111.0
- fsl-eddy-cuda-9.2 2106.1 - fsl-eddy-cuda-9.2 2111.0
- fsl-eddy-cuda-10.2 2106.1 - fsl-eddy-cuda-10.2 2111.0
- fsl-eddy-cuda-11.0 2106.1 - fsl-eddy-cuda-11.0 2111.0
- fsl-eddy-cuda-11.1 2106.1 - fsl-eddy-cuda-11.1 2111.0
- fsl-eddy-cuda-11.3 2106.1 - fsl-eddy-cuda-11.3 2111.0
- fsl-eddy_qc v1.0.3 - fsl-eddy_qc v1.0.3
- fsl-fabber_core v4.0.10 - fsl-fabber_core v4.0.10
- fsl-fabber_models_asl v2.0.7 - fsl-fabber_models_asl v2.0.7
...@@ -100,80 +102,82 @@ packages: ...@@ -100,80 +102,82 @@ packages:
- fsl-fabber_models_pet v1.0.1 - fsl-fabber_models_pet v1.0.1
- fsl-fabber_models_qbold v1.0.2 - fsl-fabber_models_qbold v1.0.2
- fsl-fabber_models_t1 v2.0.2 - fsl-fabber_models_t1 v2.0.2
- fsl-fast4 2012.0 - fsl-fast4 2111.0
- fsl-fastpdlib 2012.0 - fsl-fastpdlib 2111.1
- fsl-fdt 2103.0 - fsl-fdt 2111.0
- fsl-fdt-cuda-9.2 2103.0 - fsl-fdt-cuda-9.2 2111.0
- fsl-fdt-cuda-10.2 2103.0 - fsl-fdt-cuda-10.2 2111.0
- fsl-fdt-cuda-11.0 2103.0 - fsl-fdt-cuda-11.0 2111.0
- fsl-fdt-cuda-11.1 2103.0 - fsl-fdt-cuda-11.1 2111.0
- fsl-fdt-cuda-11.3 2103.0 - fsl-fdt-cuda-11.3 2111.0
- fsl-feat5 2104.0 - fsl-feat5 2111.0
- fsl-film 2007.0 - fsl-film 2111.0
- fsl-filmbabe 2012.0 - fsl-filmbabe 2111.0
- fsl-first 2006.0 - fsl-first 2111.0
- fsl-first_lib 2012.0 - fsl-first_lib 2111.0
- fsl-flameo 2012.0 - fsl-flameo 2111.0
- fsl-flirt 2108.0 - fsl-flirt 2111.0
- fsl-fnirt 2110.0 - fsl-fnirt 2111.0
- fsl-fugue 2010.0 - fsl-fugue 2111.0
- fsl-get_standard 0.1.0 - fsl-get_standard 0.1.0
- fsl-giftiio 2110.0 - fsl-giftiio 2111.0
- fsl-gps 2012.0 - fsl-gps 2111.0
- fsl-lesions 1909.1 - fsl-lesions 2111.0
- fsl-libgdc 2006.0 - fsl-libgdc 2111.0
- fsl-libmeshutils 2012.0 - fsl-libmeshutils 2111.0
- fsl-libvis 1909.0 - fsl-libvis 2111.0
- fsl-mcflirt 2012.0 - fsl-mcflirt 2111.0
- fsl-melodic 2012.0 - fsl-melodic 2111.1
- fsl-meshclass 2102.0 - fsl-meshclass 2111.0
- fsl-misc_c 2106.0 - fsl-misc_c 2111.0
- fsl-misc_scripts 2004.0 - fsl-misc_scripts 2111.0
- fsl-misc_tcl 2109.0 - fsl-misc_tcl 2111.0
- fsl-miscmaths 2010.0 - fsl-miscmaths 2111.1
- fsl-miscvis 2007.0 - fsl-miscvis 2111.0
- fsl-mist 2010.0 - fsl-mist 2111.0
- fsl-mm 1909.0 - fsl-mm 2111.0
- fsl-mrs 1.1.8 - fsl_mrs 1.1.8
- fsl-msm 2008.0 - fsl-msm 2008.0
- fsl-msmreglib 2008.0 - fsl-msmreglib 2008.0
- fsl-mvdisc 2012.0 - fsl-mvdisc 2111.0
- fsl-newimage 2104.1 - fsl-newimage 2111.0
- fsl-newmesh 1904.0 - fsl-newmesh 2111.0
- fsl-newnifti 3.0.7 - fsl-newnifti 4.0.0
- fsl-newran 2012.0 - fsl-newran 2111.0
- fsl-oxford_asl v4.0.27 - fsl-oxford_asl v4.0.27
- fsl-possum 2111.0 - fsl-possum 2111.2
- fsl-ptx2 2101.1 - fsl-ptx2 2111.0
- fsl-ptx2-cuda-9.2 2101.1 - fsl-ptx2-cuda-9.2 2111.0
- fsl-ptx2-cuda-10.2 2101.1 - fsl-ptx2-cuda-10.2 2111.0
- fsl-ptx2-cuda-11.0 2101.1 - fsl-ptx2-cuda-11.0 2111.0
- fsl-ptx2-cuda-11.1 2101.1 - fsl-ptx2-cuda-11.1 2111.0
- fsl-ptx2-cuda-11.3 2101.1 - fsl-ptx2-cuda-11.3 2111.0
- fsl-pyfeeds 0.9.9 - fsl-pyfeeds 0.9.9
- fsl-pyfeeds-tests 2110.1 - fsl-pyfeeds-tests 2111.0
- fsl-qboot 2010.0 - fsl-qboot 2111.0
- fsl-randomise 2101.0 - fsl-randomise 2111.1
- fsl-shapemodel 2012.0 - fsl-shapemodel 2111.0
- fsl-siena 2006.0 - fsl-siena 2111.0
- fsl-slicetimer 2012.0 - fsl-slicetimer 2111.0
- fsl-sub 2.6.0 - fsl_sub 2.7.0
- fsl-sub_plugin_sge 1.5.0 - fsl_sub_plugin_sge 1.5.2
- fsl-sub_plugin_slurm 1.4.0 - fsl_sub_plugin_slurm 1.4.2
- fsl-surface 2110.0 - fsl-surface 2111.0
- fsl-susan 2012.0 - fsl-susan 2111.0
- fsl-swe v1.0.3 - fsl-swe v1.1.0
- fsl-tbss 2012.0 - fsl-tbss 2111.0
- fsl-tirl v2.2.1 - fsl-tirl v2.2.1
- fsl-topup 1911.0 - fsl-topup 2111.0
- fsl-utils 2007.0 - fsl-utils 2111.1
- fsl-vbm 2012.0 - fsl-vbm 2006.0
- fsl-verbena v4.0.3 - fsl-verbena v4.0.3
- fsl-vtkio 2012.0 - fsl-vtkio 2111.0
- fsl-warpfns 2106.0 - fsl-warpfns 2111.0
- fsl-wire 1.0.0
- fsl-xtract 1.5.1 - fsl-xtract 1.5.1
- fsl-xtract_data 1.3.4 - fsl-xtract_data 1.3.4
- fsl-znzlib 2110.0 - fsl-znzlib 2111.0
- fmrib-unpack 2.8.0
- ghalton 0.6.1 - ghalton 0.6.1
- hlsvdpropy 2.0.1 - hlsvdpropy 2.0.1
- libopenblas 0.3.18 *openmp* - libopenblas 0.3.18 *openmp*
...@@ -187,7 +191,8 @@ linux-64-packages: [] ...@@ -187,7 +191,8 @@ linux-64-packages: []
# List of additional packages that # List of additional packages that
# are added to macos-64 installations. # are added to macos-64 installations.
macos-64-packages: macos-64-packages: []
# Newer libffi causes FSLeyes to segfault:
# https://github.com/conda-forge/pyobjc-core-feedstock/issues/37 # List of additional packages that
- libffi 3.3 # are added to macos-M1 installations.
macos-M1-packages: []
...@@ -39,6 +39,12 @@ ...@@ -39,6 +39,12 @@
"sha256" : "8ed6871bbd0b24f66b2d87fd88cbcd0854142e5cf1447de5f5f246884ef9c846", "sha256" : "8ed6871bbd0b24f66b2d87fd88cbcd0854142e5cf1447de5f5f246884ef9c846",
"output" : "87" "output" : "87"
} }
"macos-M1" : {
"url" : "https://github.com/conda-forge/miniforge/releases/download/4.10.3-1/Miniforge3-4.10.3-1-MacOSX-arm64.sh",
"sha256" : "8ed6871bbd0b24f66b2d87fd88cbcd0854142e5cf1447de5f5f246884ef9c846",
"output" : "87"
}
}, },
// The "versions" section contains information // The "versions" section contains information
...@@ -54,7 +60,7 @@ ...@@ -54,7 +60,7 @@
// entry contains the following fields: // entry contains the following fields:
// //
// - "platform" Architecture/platform - currently one of // - "platform" Architecture/platform - currently one of
// "linux-64" or "macos-64" // "linux-64", "macos-64", or "macos-M1"
// - "cuda" Version of CUDA that this build was built // - "cuda" Version of CUDA that this build was built
// against. MUST NOT be present for non-CUDA // against. MUST NOT be present for non-CUDA
// builds. // builds.
...@@ -89,6 +95,16 @@ ...@@ -89,6 +95,16 @@
"6.0.6" : "11" "6.0.6" : "11"
} }
}, },
{
"platform" : "macos-M1",
"environment" : "https://fsl.fmrib.ox.ac.uk/fsldownloads/fslconda/releases/fsl-6.1.0-macos-M1.yml",
"sha256" : "952a0101fc19948e785572f8c06436c59f19c4ef92df9425f2e2033d4b986918",
"base_packages" : ["fsl-base", "libopenblas", "fslpy"],
"output" : {
"install" : "92",
"6.0.6" : "11"
}
},
{ {
"platform" : "linux-64", "platform" : "linux-64",
"cuda" : "9.2", "cuda" : "9.2",
...@@ -135,6 +151,17 @@ ...@@ -135,6 +151,17 @@
"6.1.0" : "11" "6.1.0" : "11"
} }
}, },
{
"platform" : "macos-M1",
"environment" : "https://fsl.fmrib.ox.ac.uk/fsldownloads/fslconda/releases/fsl-6.2.0-macos-M1.yml",
"sha256" : "952a0101fc19948e785572f8c06436c59f19c4ef92df9425f2e2033d4b986918",
"base_packages" : ["fsl-base", "libopenblas", "fslpy"],
"output" : {
"install" : "92",
"6.0.6" : "11",
"6.1.0" : "11"
}
},
{ {
"platform" : "linux-64", "platform" : "linux-64",
"cuda" : "9.2", "cuda" : "9.2",
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment