Code

Add cil#154

Code

Merged

paskino merged 144 commits intomasterSyneRBI/SIRF-SuperBuild:masterfrom add_cilSyneRBI/SIRF-SuperBuild:add_cilCopy head branch name to clipboardOct 8, 2019

+979-17

Commits

Commits on Jul 29, 2018

• added CIL (ccpi-framework) to the dependency

  paskino

  committed
  f6910a8

  Copy full SHA for f6910a8

• Adds CIL to the SuperBuild

  Show description for 36217fd
  paskino

  committed
  36217fd

  Copy full SHA for 36217fd

• uses version_config to set ccpi/cil versions

  paskino

  committed
  7f6955b

  Copy full SHA for 7f6955b

Commits on Aug 20, 2018

• reflects changes to CCPi-RGL

  paskino

  committed
  e54712f

  Copy full SHA for e54712f

• builds latest master

  paskino

  committed
  01b41ae

  Copy full SHA for 01b41ae

Commits on Sep 21, 2018

• points to spdhg branch

  paskino

  committed
  cc47c52

  Copy full SHA for cc47c52

• Added CCPi-FrameworkPlugins as CIL dependency

  paskino

  committed
  50830ce

  Copy full SHA for 50830ce

Commits on Oct 9, 2018

• updated Gadgetron and ISMRMRD tags

  paskino

  committed
  e244b1a

  Copy full SHA for e244b1a

• Merge branch 'master' into ubuntu18.04

  paskino

  committed
  4205dbc

  Copy full SHA for 4205dbc

Commits on Oct 23, 2018

• Merge branch 'master' into ubuntu18.04

  paskino

  committed
  a652614

  Copy full SHA for a652614

• set gadgetron version to 3.17.0

  paskino

  committed
  90740d5

  Copy full SHA for 90740d5

Commits on Oct 24, 2018

• fix typo

  paskino

  committed
  d23f78c

  Copy full SHA for d23f78c

Commits on Nov 16, 2018

• Merge branch 'master' into add_cil

  paskino

  committed
  147a557

  Copy full SHA for 147a557

• fix to CIL commit hash

  paskino

  committed
  520c70b

  Copy full SHA for 520c70b

• comments removed

  paskino

  committed
  6b1ff05

  Copy full SHA for 6b1ff05

• CCPi-Regularisation-Toolkit depends on Cython

  paskino

  committed
  2885fbc

  Copy full SHA for 2885fbc

• removed External_CIL.cmake

  paskino

  committed
  fa47308

  Copy full SHA for fa47308

• removed reference to hackathor repo

  paskino

  committed
  bb541e4

  Copy full SHA for bb541e4

Commits on Nov 23, 2018

• added date and right package name

  paskino

  authored
  c3dacbe

  Copy full SHA for c3dacbe

• added reference to LICENSE

  paskino

  authored
  1f5ad30

  Copy full SHA for 1f5ad30

• added BUILD_CIL option

  paskino

  authored
  07acf19

  Copy full SHA for 07acf19

• updated date

  paskino

  authored
  bc27a0b

  Copy full SHA for bc27a0b

Commits on Dec 8, 2018

• Merge branch 'gcc6' into ubuntu18.04

  

  Kris Thielemans

  committed
  85ca375

  Copy full SHA for 85ca375

Commits on Dec 9, 2018

• updated boost to 1.65.1 for Gadgetron

  

  Kris Thielemans

  committed
  a2f24b0

  Copy full SHA for a2f24b0

• [TRAVIS] update gcc

  Show description for edd8628
  

  Kris Thielemans

  committed
  edd8628

  Copy full SHA for edd8628

• [TRAVIS] on trusty, use gcc-7 with our own ACE

  Show description for 7bfd43f
  

  Kris Thielemans

  committed
  7bfd43f

  Copy full SHA for 7bfd43f

• Merge remote-tracking branch 'origin/master' into ubuntu18.04

  

  Kris Thielemans

  committed
  b36b0fd

  Copy full SHA for b36b0fd

• Merge branch 'master' into ubuntu18.04

  

  Kris Thielemans

  committed
  eb22e04

  Copy full SHA for eb22e04

Commits on Dec 14, 2018

• Merge branch 'master' into ubuntu18.04

  Show description for bbce834
  KrisThielemans

  committed
  bbce834

  Copy full SHA for bbce834

• [TRAVIS] forgot to replace gcc-5 with gcc-6

  Show description for 9db7f7d
  KrisThielemans

  committed
  9db7f7d

  Copy full SHA for 9db7f7d

Commits on Jan 8, 2019

• update CIL versions to master

  paskino

  committed
  3a0e11a

  Copy full SHA for 3a0e11a

• Merge branch 'add_cil' of https://github.com/CCPPETMR/SIRF-SuperBuild into add_cil

  paskino

  committed
  5617455

  Copy full SHA for 5617455

• Merge branch 'master' into add_cil

  paskino

  committed
  ceeddc0

  Copy full SHA for ceeddc0

Commits on Feb 8, 2019

• Merge remote-tracking branch 'origin' into ubuntu18.04

  paskino

  committed
  101bb79

  Copy full SHA for 101bb79

• removed names for licensing issues

  paskino

  authored
  0c6c613

  Copy full SHA for 0c6c613

• remove names for licensing

  paskino

  authored
  3a113f1

  Copy full SHA for 3a113f1

• removed names for licensing issues

  paskino

  authored
  cf32f9c

  Copy full SHA for cf32f9c

Commits on Feb 11, 2019

• Merge branch 'add_cil' of https://github.com/CCPPETMR/SIRF-SuperBuild into add_cil

  paskino

  committed
  a2e70b2

  Copy full SHA for a2e70b2

• Merge remote-tracking branch 'origin' into add_cil

  paskino

  committed
  4c66176

  Copy full SHA for 4c66176

• need to pass env variable during build

  paskino

  committed
  b431327

  Copy full SHA for b431327

Commits on Mar 4, 2019

• Merge branch 'master' into ubuntu18.04

  paskino

  committed
  17514b5

  Copy full SHA for 17514b5

Commits on Mar 14, 2019

• Merge remote-tracking branch 'origin/ubuntu18.04' into add_cil

  paskino

  committed
  97ec1a4

  Copy full SHA for 97ec1a4

• Merge remote-tracking branch 'origin/master' into add_cil

  paskino

  committed
  db0cb7b

  Copy full SHA for db0cb7b

Commits on Mar 15, 2019

• updated CIL build

  paskino

  committed
  43178e2

  Copy full SHA for 43178e2

Commits on Mar 22, 2019

• fixed text

  paskino

  authored
  3ca2531

  Copy full SHA for 3ca2531

• adds version of CIL repos

  paskino

  authored
  43cc82b

  Copy full SHA for 43cc82b

• use variable CIL_VERSION

  paskino

  authored
  de1c6bd

  Copy full SHA for de1c6bd

• use specific version of CIL for default build and master in DEVEL_BUILD

  paskino

  authored
  ada6d50

  Copy full SHA for ada6d50

• Merge branch 'master' into add_cil

  paskino

  committed
  26b9b39

  Copy full SHA for 26b9b39

• removed hard coded version

  paskino

  committed
  e581da2

  Copy full SHA for e581da2

• removed comments

  paskino

  committed
  685f0d8

  Copy full SHA for 685f0d8

• removed hard coded CIL_VERSION

  paskino

  committed
  cd996d4

  Copy full SHA for cd996d4

Commits on Mar 23, 2019

• match version config of master

  paskino

  authored
  eb3555b

  Copy full SHA for eb3555b

Commits on Mar 25, 2019

• set default version to current stable 1.1.1

  paskino

  authored
  2318d2e

  Copy full SHA for 2318d2e

• adds build of CIL modules

  Show description for 476f3cb
  paskino

  authored
  476f3cb

  Copy full SHA for 476f3cb

• added test phase

  paskino

  committed
  7e4c193

  Copy full SHA for 7e4c193

Commits on Mar 26, 2019

• add cython as dependency to build CIL modules

  paskino

  authored
  d4c6aa6

  Copy full SHA for d4c6aa6

• build command update

  paskino

  committed
  acb8f23

  Copy full SHA for acb8f23

• Merge branch 'add_cil' of https://github.com/CCPPETMR/SIRF-SuperBuild into add_cil

  paskino

  committed
  6c3c182

  Copy full SHA for 6c3c182

• remove build boost in CIL build

  paskino

  committed
  2f3f07d

  Copy full SHA for 2f3f07d

Commits on Mar 27, 2019

• simplified matrix

  paskino

  committed
  3268078

  Copy full SHA for 3268078

• not build gadgetron

  paskino

  committed
  c5bbc3b

  Copy full SHA for c5bbc3b

• add CIL Framework Test in SuperBuild

  paskino

  committed
  44eb833

  Copy full SHA for 44eb833

• add cil build

  paskino

  committed
  5e15cf1

  Copy full SHA for 5e15cf1

Commits on Mar 28, 2019

• builds boost

  paskino

  committed
  1108c0d

  Copy full SHA for 1108c0d

• build only CIL

  paskino

  committed
  9cd354a

  Copy full SHA for 9cd354a

Commits on Mar 29, 2019

• add cython for CIL

  paskino

  authored
  12c89b2

  Copy full SHA for 12c89b2

• add numpy

  paskino

  authored
  d31ad8f

  Copy full SHA for d31ad8f

• pip install cython and numpy

  paskino

  authored
  c79d9ef

  Copy full SHA for c79d9ef

• add CIL to docker, minor travis tidy

  casperdcl

  committed
  c67d2c0

  Copy full SHA for c67d2c0

• re-enable docker

  casperdcl

  committed
  20dea0c

  Copy full SHA for 20dea0c

• cython from apt numpy from pip

  paskino

  authored
  0e521a2

  Copy full SHA for 0e521a2

• to revert probably

  casperdcl

  committed
  df69306

  Copy full SHA for df69306

• pass the Python Executable

  paskino

  authored
  b004e7e

  Copy full SHA for b004e7e

• installs numpy from apt

  paskino

  authored
  9487b95

  Copy full SHA for 9487b95

• build the add_to_sirf_classes branch of SIRF

  paskino

  committed
  9e95fee

  Copy full SHA for 9e95fee

• Merge branch 'add_cil' of https://github.com/CCPPETMR/SIRF-SuperBuild into add_cil

  paskino

  committed
  a752ff6

  Copy full SHA for a752ff6

• merge master .travis.yml

  paskino

  committed
  b6a201b

  Copy full SHA for b6a201b

Commits on Apr 2, 2019

• modify FindCython and remove OSX builds

  paskino

  committed
  b1f69de

  Copy full SHA for b1f69de

• add cil build

  paskino

  committed
  11e656d

  Copy full SHA for 11e656d

• add cil build

  paskino

  committed
  dd1b643

  Copy full SHA for dd1b643

• install cython and numpy via pip

  paskino

  committed
  ce7ebff

  Copy full SHA for ce7ebff

Commits on Apr 8, 2019

• Merge branch 'master' into add_cil

  paskino

  authored
  4c8a381

  Copy full SHA for 4c8a381

• fix indent and test phase

  paskino

  committed
  642886d

  Copy full SHA for 642886d

Commits on Apr 25, 2019

• Add option Gadgetron_USE_MKL

  Show description for e7e8d95
  paskino

  committed
  e7e8d95

  Copy full SHA for e7e8d95

Commits on May 1, 2019

• moved option Gadgetron_USE_MKL

  paskino

  committed
  2aff173

  Copy full SHA for 2aff173

Commits on May 2, 2019

• Merge remote-tracking branch 'origin' into add_cil

  paskino

  committed
  7504a52

  Copy full SHA for 7504a52

• fixed conflicts

  paskino

  committed
  52314c2

  Copy full SHA for 52314c2

• removed parenthesis

  paskino

  committed
  d73b671

  Copy full SHA for d73b671

• Merge remote-tracking branch 'origin/mkl_warning' into add_cil

  paskino

  committed
  4149f78

  Copy full SHA for 4149f78

Commits on Jul 1, 2019

• Merge remote-tracking branch 'origin/master' into add_cil

  paskino

  committed
  929119a

  Copy full SHA for 929119a

Commits on Jul 2, 2019

• updated CIL versions

  paskino

  committed
  a955860

  Copy full SHA for a955860

Commits on Jul 9, 2019

• use last CIL stable version

  paskino

  committed
  ea10bcf

  Copy full SHA for ea10bcf

Commits on Jul 15, 2019

• fixed CIL versions

  paskino

  committed
  0284132

  Copy full SHA for 0284132

Commits on Sep 3, 2019

• Merge branch 'master' into add_cil

  paskino

  committed
  58455e2

  Copy full SHA for 58455e2

Commits on Sep 4, 2019

• added build for libastra

  paskino

  committed
  7c09193

  Copy full SHA for 7c09193

• added build of astra python wrapper

  paskino

  committed
  481dccd

  Copy full SHA for 481dccd

• fix build

  paskino

  committed
  66e688d

  Copy full SHA for 66e688d

• added CCPi-Astra

  paskino

  committed
  a37bd03

  Copy full SHA for a37bd03

Commits on Sep 5, 2019

• copy TestData

  paskino

  committed
  6f66a73

  Copy full SHA for 6f66a73

• added environment variable SIRF_INSTALL_PATH

  paskino

  committed
  448445d

  Copy full SHA for 448445d

Commits on Sep 9, 2019

• updated branch and add test

  paskino

  committed
  07938a2

  Copy full SHA for 07938a2

Commits on Sep 11, 2019

• does not build CUDA support if not found

  paskino

  committed
  9a800f7

  Copy full SHA for 9a800f7

• ccpi framework branch

  paskino

  committed
  29028e9

  Copy full SHA for 29028e9

• Added TomoPhantom to create CT analytical phantoms/sinograms

  paskino

  committed
  f9862cb

  Copy full SHA for f9862cb

Commits on Sep 24, 2019

• fixed build of python wrapper

  paskino

  committed
  78ececd

  Copy full SHA for 78ececd

Commits on Sep 25, 2019

• NIFTYREG to build libZ and libpng

  Show description for 5658cff
  paskino

  committed
  5658cff

  Copy full SHA for 5658cff

• renamed CCPi-RGL to CCPi-Regularisation-Toolkit

  Show description for 13d297d
  paskino

  committed
  13d297d

  Copy full SHA for 13d297d

Commits on Sep 26, 2019

• added CIL dependencies

  paskino

  committed
  1cdd2e3

  Copy full SHA for 1cdd2e3

• add dependencies for CIL

  paskino

  committed
  b0777d3

  Copy full SHA for b0777d3

• added python-pil

  paskino

  committed
  9c23601

  Copy full SHA for 9c23601

• potential CIL dependency fix

  casperdcl

  committed
  420f1cf

  Copy full SHA for 420f1cf

• tidy deps

  casperdcl

  committed
  ab75adf

  Copy full SHA for ab75adf

• travis py3 -> py3.6

  casperdcl

  committed
  5d259a7

  Copy full SHA for 5d259a7

Commits on Sep 27, 2019

• update SIRF branch

  paskino

  committed
  9f46c85

  Copy full SHA for 9f46c85

• Merge branch 'add_cil' of https://github.com/CCPPETMR/SIRF-SuperBuild into add_cil

  paskino

  committed
  a8ed0b0

  Copy full SHA for a8ed0b0

• removed TomoPhantom

  paskino

  committed
  86cc19e

  Copy full SHA for 86cc19e

• Revert "removed TomoPhantom"

  Show description for ac181ea
  casperdcl

  committed
  ac181ea

  Copy full SHA for ac181ea

• pass python vars into TomoPhantom

  casperdcl

  committed
  432ff49

  Copy full SHA for 432ff49

Commits on Oct 2, 2019

• builds specific branch of SIRF if CIL is built

  paskino

  committed
  2b5ec0d

  Copy full SHA for 2b5ec0d

• pass python executable to astra, add 2.7 for CIL

  paskino

  committed
  2358140

  Copy full SHA for 2358140

• add wget for CIL_BUILDs

  paskino

  committed
  e0a13e9

  Copy full SHA for e0a13e9

• removed BUILD_CIL from docker builds

  paskino

  committed
  f30be58

  Copy full SHA for f30be58

• modify docker build for CIL

  paskino

  committed
  e4ae893

  Copy full SHA for e4ae893

• Revert "removed BUILD_CIL from docker builds"

  Show description for a7e0a62
  casperdcl

  committed
  a7e0a62

  Copy full SHA for a7e0a62

• fix docker CIL

  casperdcl

  committed
  5761333

  Copy full SHA for 5761333

• add .dockerignore

  casperdcl

  committed
  24ca979

  Copy full SHA for 24ca979

• docker conda distutils warning suppression/fix

  casperdcl

  committed
  58353b5

  Copy full SHA for 58353b5

• pass SIRF/CIL tags at cmake time

  paskino

  committed
  3802b54

  Copy full SHA for 3802b54

• Merge branch 'add_cil' of https://github.com/CCPPETMR/SIRF-SuperBuild into add_cil

  paskino

  committed
  c04af38

  Copy full SHA for c04af38

• safer docker build cache

  casperdcl

  committed
  9f83fe9

  Copy full SHA for 9f83fe9

• fix Edo merge

  casperdcl

  committed
  570937b

  Copy full SHA for 570937b

• Merge remote-tracking branch 'origin/master' into add_cil

  casperdcl

  committed
  ac23054

  Copy full SHA for ac23054

• travis docker cache permissions fix

  casperdcl

  committed
  3d48ff3

  Copy full SHA for 3d48ff3

• try again to fix docker

  casperdcl

  committed
  2d634bf

  Copy full SHA for 2d634bf

• silly ommission

  casperdcl

  committed
  48bdca8

  Copy full SHA for 48bdca8

Commits on Oct 7, 2019

• added 2019

  paskino

  authored
  51113fd

  Copy full SHA for 51113fd

• Gadgetron requires at least Boost 1.65

  paskino

  committed
  7fea0a8

  Copy full SHA for 7fea0a8

• swapped master for add_cil branch

  paskino

  committed
  bd582aa

  Copy full SHA for bd582aa

• removed dependecy from TomoPhantom

  paskino

  committed
  213919f

  Copy full SHA for 213919f

• added BUILD_CIL_LITE option

  paskino

  committed
  d1808aa

  Copy full SHA for d1808aa

• reviewed indentation

  paskino

  committed
  d4a99c2

  Copy full SHA for d4a99c2

• add a BUILD_CIL_LITE=ON

  paskino

  committed
  841e808

  Copy full SHA for 841e808

• add test to CIL_LITE

  paskino

  committed
  3f97f9a

  Copy full SHA for 3f97f9a