Skip to content

RELEASE: merging develop into master#50

Merged
mstaring merged 101 commits intomasterfrom
develop
Mar 20, 2018
Merged

RELEASE: merging develop into master#50
mstaring merged 101 commits intomasterfrom
develop

Conversation

@mstaring
Copy link
Member

To create elastix v4.9.0

kaspermarstal and others added 30 commits May 31, 2017 21:00
Otherwise ctest complains about CTestConfig.cmake not being found
This script is meant to be used for generating nightly builds for
elastix. Results are posted on cdash:

  http://my.cdash.org/index.php?project=elastix

This script is to be called like:

python elx_nightly_dashboard.py -d <local_nightly_directory>
  -s <dashboard_script>

For example
python elx_nightly_dashboard.py -d D:/toolkits/elastix/nightly
  -s elxDashboard_LKEB_win10-64_VS2015.cmake

Optional argument is compilation mode (-C, defaults to Release).
The script actually works on first use, performing a clone.
Since shutil.which() is only available from python 3.3.
PR #13 was accidentally merged into master instead of develop. This merge brings develop up date with PR #13.
Octave not supported by SimpleElastix
Merge pull request #14 from SuperElastix/metricbase-memory-patch. Thanks @coertmetz!
…Lists.txt):

1. Removed CMakeLists, as it will be replaced by (an adapted version of) src/CMakeLists.
2. Moved the five subdirectories and the CMakeLists from "src/" to the root, preparing to fixing issue #8.
3. Moved 'project' command upward, and copied 'cmake_minimum_required' and 'include' command from https://github.com/SuperElastix/elastix/blob/develop/CMakeLists.txt
4. Fixed paths, now that src subdirs have been moved up to the root.
5. Removed "src" from comment.
It is not clear that this code always works, and we prefer to remove it
and make the build as robust as possible.
kaspermarstal and others added 26 commits November 1, 2017 12:00
…if InitialTransformParametersFileName was not manually set
* CI: Use the shutil equivalent of os.rename() and is.replace() which is available in Python 2.7 #33

* COMP: making sure python move operations work

Also with python 2.7.

* BUG: check for file existence

* COMP: copy paste error

* CI: Compile all components on AppVeyor

* CI: Touching appveyor.yml to trigger rebuild

* CI: Build ITK and elastix separately on AppVeyor to avoid build time limit

* CI: Fix AppVeyor script

* CI: Fix AppVeyor cache stamp
Fixed two compiler failures
by replacing sptrintf's with ostringstream's
To address Windows build fails
When installing elastix compiled as library I got this error:

CMake Error at src/Core/cmake_install.cmake:93 (file):
  file INSTALL cannot find
  ".../src/ITKIOFactoryRegistration/itkImageIOFactoryRegisterManager.h".
Call Stack (most recent call first):
  src/cmake_install.cmake:44 (include)
  cmake_install.cmake:42 (include)

It is because ITKIOFactoryRegistration does not exits.
The actual folder name is ITKFactoryRegistration (without "IO").
This test is a regression test.
Changing to a local VM.
ITK was updated to version 4.13.0.

Their commit f373fa16532bed28c8dec1ddeec5083b572bb24d broke the
regression tests. As this relates to precision changes in MetaIO,
converting some floats to double, this is deemed harmless.

This commit updates the baselines.
in preparation of a release.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants