Merge commit 'a854354d755cb0'
a2c4c8844717
Actions

Description

Details

Provenance

goetzm	Authored on Mar 23 2018, 4:35 PM
goetzm	Pushed on Apr 3 2018, 10:02 AM
goetzm	Pushed on Mar 23 2018, 4:36 PM

Parents

rMITKa854354d755c: Merge branch 'T24046-SwigBasedPythonWrapping' of https://phabricator.mitk.
rMITK2c35ea12f682: Merge branch 'T23965-FiberFitTest2'

Branches

Unknown

Tags

Unknown

Event Timeline

goetzm committed rMITKa2c4c8844717: Merge commit 'a854354d755cb0' (authored by goetzm).Mar 23 2018, 4:35 PM

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.

a854354d755c Merge branch 'T24046-SwigBasedPythonWrapping' of https://phabricator.mitk.
Author
goetzm
Browse Repository
No Builds
No Audits
d1dd842b9b17 Small adaptation to SlicedGeometry for SWIG compatibility
Author
goetzm
Browse Repository
No Builds
No Audits
c66d6f34e697 Simplified Interface
Author
goetzm
Browse Repository
No Builds
No Audits
b769ae0b9e85 Added additional Classes
Author
goetzm
Browse Repository
No Builds
No Audits
72046e37718d Added additional classes (Geometry-related stuff)
Author
goetzm
Browse Repository
No Builds
No Audits
53361a3bead3 Changed the name from PythonMITK to pyMITK
Author
goetzm
Browse Repository
No Builds
No Audits
8fb138d5c084 Code cleaning
Author
goetzm
Browse Repository
No Builds
No Audits
3053591ce355 Code cleaning
Author
goetzm
Browse Repository
No Builds
No Audits
fc36ffc686fc Removed unused file
Author
goetzm
Browse Repository
No Builds
No Audits
1d0e2edf55fc Added comment that there is no longer the need to manually include the header
Author
goetzm
Browse Repository
No Builds
No Audits
b8f0d4fc0d73 Moved Feature Holder from Header to CPP for Grey Level size Zone
Author
goetzm
Browse Repository
No Builds
No Audits
ade1c1e295ac Moved Feature Holder for NGLD from header to cpp file
Author
goetzm
Browse Repository
No Builds
No Audits
89ec17efef33 Added all maintained GIF Features & moved Cooc2-Holder from header to cpp
Author
goetzm
Browse Repository
No Builds
No Audits
5de0b573e176 Working wrapping of GIFFirstOrderHistogramStatistics
Author
goetzm
Browse Repository
No Builds
No Audits
ed01bbf0d416 Building version with two additionally wrapped classes
Author
goetzm
Browse Repository
No Builds
No Audits
fdb1209175e9 Added two additional classes for feature generation
Author
goetzm
Browse Repository
No Builds
No Audits
c69c41de1810 Some code cleaning (Trailing WS, Tabs etc..)
Author
goetzm
Browse Repository
No Builds
No Audits
dfd96b708390 Merge branch 'T24046-SwigBasedPythonWrapping' of https://phabricator.mitk.
Author
goetzm
Browse Repository
No Builds
No Audits
0b1786bb22fd Extended Whiteliste to include Classification Module
Author
goetzm
Browse Repository
No Builds
No Audits
4653d8b91b2e Changes to have a working version
Author
goetzm
Browse Repository
No Builds
No Audits
d6882f1aeacf Added ConvertTo-Methods in order to improve the handling of data types
Author
goetzm
Browse Repository
No Builds
No Audits
c56953d6c1a6 Convertions from and to numpy arrays is now possible
Author
goetzm
Browse Repository
No Builds
No Audits
4269d6d981cc Added Type-Check to get an array of the correct data type
Author
goetzm
Browse Repository
No Builds
No Audits
e8e4014c4215 Added conversion from MITK Image to Numpy array.
Author
goetzm
Browse Repository
No Builds
No Audits
90e3b5ec89e2 Improved linux wheel generation
Author
goetzm
Browse Repository
No Builds
No Audits
f30701f7aa8b Do not add .so files to a new wheel, it will later be added by auditwheel
Author
goetzm
Browse Repository
No Builds
No Audits
4b5d99f131ce Removed option for static library (didn't work)
Author
goetzm
Browse Repository
No Builds
No Audits
6d4106e0177d Possibility to generate a docker file for the generation of linux wheels.
Author
goetzm
Browse Repository
No Builds
No Audits
11efe1b2ab39 Added s switch to disable shared libraries
Author
goetzm
Browse Repository
No Builds
No Audits
7f3608e53eb8 Typo
Author
goetzm
Browse Repository
No Builds
No Audits
2ab666ae1e61 Typo
Author
goetzm
Browse Repository
No Builds
No Audits
1cf36fc1201e Removed linker command to allow incomplete linking for pythonlib
Author
goetzm
Browse Repository
No Builds
No Audits
12c1e1335ac7 Added file which was not included in the last commit
Author
goetzm
Browse Repository
No Builds
No Audits
cc9399f56edd Allow dynamic linking during execution, necessary for python bindings.
Author
goetzm
Browse Repository
No Builds
No Audits
411738ba9afb Linux compatibility. Wheel is now builded (not tested so far)
Author
goetzm
Browse Repository
No Builds
No Audits
9823ea037296 Allow the creation of a Python Wheel.
Author
goetzm
Browse Repository
No Builds
No Audits
b57c5d655e05 Code cleaning and smaller improvements. Started to prepare wheel building.
Author
goetzm
Browse Repository
No Builds
No Audits
c82dacc3a75e Added Smartpointer and BaseData in order to be able to Read/Save Data
Author
goetzm
Browse Repository
No Builds
No Audits
b9bb2fe30ea0 Basic wrapping of mitk::IOUtils. still some workarounds.
Author
goetzm
Browse Repository
No Builds
No Audits
958e0b69c030 Changed name to enable loading, added test-function to valid a working workflow
Author
goetzm
Browse Repository
No Builds
No Audits
a2a666dc482f First compiling version, function not tested yet.
Author
goetzm
Browse Repository
No Builds
No Audits
92797e5cb095 Merge branch 'T24046-SwigBasedPythonWrapping' of https://phabricator.mitk.
Author
goetzm
Browse Repository
No Builds
No Audits
e039142126b6 Added ConvertTo-Methods in order to improve the handling of data types
Author
goetzm
Browse Repository
No Builds
No Audits
3c568e04cf23 Convertions from and to numpy arrays is now possible
Author
goetzm
Browse Repository
No Builds
No Audits
93e66485dfc3 Added Type-Check to get an array of the correct data type
Author
goetzm
Browse Repository
No Builds
No Audits
d4adde15c75b Added conversion from MITK Image to Numpy array.
Author
goetzm
Browse Repository
No Builds
No Audits
f55e4409faec Improved linux wheel generation
Author
goetzm
Browse Repository
No Builds
No Audits
a885d0058b6a Do not add .so files to a new wheel, it will later be added by auditwheel
Author
goetzm
Browse Repository
No Builds
No Audits
a4348ed5d567 Removed option for static library (didn't work)
Author
goetzm
Browse Repository
No Builds
No Audits
1e7fa43c694d Possibility to generate a docker file for the generation of linux wheels.
Author
goetzm
Browse Repository
No Builds
No Audits

Changes (52)

Path

Size

Packages

CMake/

Whitelists/

Wrapping.cmake

O1: MITK Reviewer Group I

mitkLanguageOptions.cmake

O1: MITK Reviewer Group I

mitkSWIGConfigurePythonfileBuildtime.cmake

O1: MITK Reviewer Group I

mitkSwigAddLibraryDependencies.cmake

O1: MITK Reviewer Group I

mitkSwigPrepareFiles.cmake

O1: MITK Reviewer Group I

mitkTargetLinkLibrariesWithDynamicLookup.cmake

O1: MITK Reviewer Group I

CMakeLists.txt

O1: MITK Reviewer Group I

Modules/

Classification/

CLUtilities/

include/

mitkGIFCooccurenceMatrix2.h

mitkGIFGreyLevelSizeZone.h

mitkGIFNeighbourhoodGreyLevelDifference.h

mitkGIFNeighbouringGreyLevelDependenceFeatures.h

src/

GlobalImageFeatures/

mitkGIFCooccurenceMatrix2.cpp

mitkGIFGreyLevelSizeZone.cpp

mitkGIFNeighbouringGreyLevelDependenceFeatures.cpp

Core/

include/

mitkSlicedGeometry3D.h

O1: MITK Reviewer Group I

SuperBuild.cmake

O1: MITK Reviewer Group I

mitk_swig_cpp_include.i

LegacyPackaging.cmake

mitkNumpyArrayConversion.cxx

rMITKa2c4c8844717

View Options

CMake/Whitelists/Wrapping.cmake

View Options

CMake/mitkLanguageOptions.cmake

View Options

CMake/mitkSWIGConfigurePythonfileBuildtime.cmake

View Options

CMake/mitkSwigAddLibraryDependencies.cmake

View Options

CMake/mitkSwigPrepareFiles.cmake

View Options

CMake/mitkTargetLinkLibrariesWithDynamicLookup.cmake

View Options

CMakeLists.txt

View Options

Modules/Classification/CLUtilities/include/mitkGIFCooccurenceMatrix2.h

View Options

Modules/Classification/CLUtilities/include/mitkGIFGreyLevelSizeZone.h

View Options

Modules/Classification/CLUtilities/include/mitkGIFNeighbourhoodGreyLevelDifference.h

View Options

Modules/Classification/CLUtilities/include/mitkGIFNeighbouringGreyLevelDependenceFeatures.h

View Options

Modules/Classification/CLUtilities/src/GlobalImageFeatures/mitkGIFCooccurenceMatrix2.cpp

View Options

Modules/Classification/CLUtilities/src/GlobalImageFeatures/mitkGIFGreyLevelSizeZone.cpp

View Options

Modules/Classification/CLUtilities/src/GlobalImageFeatures/mitkGIFNeighbouringGreyLevelDependenceFeatures.cpp

View Options

Modules/Core/include/mitkSlicedGeometry3D.h

View Options

SuperBuild.cmake

View Options

Wrapper

View Options

Wrapper/swigutils.cmake

View Options

Wrapping/CMakeLists.txt

View Options

Wrapping/Common/mitk_swig_classes.i

View Options

Wrapping/Common/mitk_swig_common.i

View Options

Wrapping/Common/mitk_swig_cpp_include.i

View Options

Wrapping/Common/mitk_swig_macros.i

View Options

Wrapping/Common/mitk_swig_std.i

View Options

Wrapping/Python/CMakeLists.txt

View Options

Wrapping/Python/LegacyPackaging.cmake

View Options

Wrapping/Python/MITK.i

View Options

Wrapping/Python/PackageUtility/Dockerfile-Python

View Options

Wrapping/Python/PackageUtility/Dockerfile-x86_64

View Options

Wrapping/Python/PackageUtility/Dockerfile-x86_64_2

View Options

Wrapping/Python/PackageUtility/imagefiles/cmd.sh

View Options

Wrapping/Python/PackageUtility/imagefiles/imagefiles/cmd.sh

View Options

Wrapping/Python/PackageUtility/imagefiles/imagefiles/install-gcc.sh

View Options

Wrapping/Python/PackageUtility/imagefiles/imagefiles/install-libtiff.sh

View Options

Wrapping/Python/PackageUtility/imagefiles/imagefiles/install.sh

View Options

Wrapping/Python/PackageUtility/imagefiles/install-gcc.sh

View Options

Wrapping/Python/PackageUtility/imagefiles/install-libtiff.sh

View Options

Wrapping/Python/PackageUtility/imagefiles/install.sh

View Options

Wrapping/Python/PackageUtility/run.sh

View Options

Wrapping/Python/Packaging/init.py

View Options

Wrapping/Python/Packaging/setup.py.in

View Options

Wrapping/Python/Packaging/setupegg.py

View Options

Wrapping/Python/dist/CMakeLists.txt

View Options

Wrapping/Python/mitkNumpyArrayConversion.cxx

Merge commit 'a854354d755cb0'a2c4c8844717Actions

Description

Details

Event Timeline

Merged Changes

Changes (52)

rMITKa2c4c8844717

CMake/Whitelists/Wrapping.cmake

CMake/mitkLanguageOptions.cmake

CMake/mitkSWIGConfigurePythonfileBuildtime.cmake

CMake/mitkSwigAddLibraryDependencies.cmake

CMake/mitkSwigPrepareFiles.cmake

CMake/mitkTargetLinkLibrariesWithDynamicLookup.cmake

CMakeLists.txt

Modules/Classification/CLUtilities/include/mitkGIFCooccurenceMatrix2.h

Modules/Classification/CLUtilities/include/mitkGIFGreyLevelSizeZone.h

Modules/Classification/CLUtilities/include/mitkGIFNeighbourhoodGreyLevelDifference.h

Modules/Classification/CLUtilities/include/mitkGIFNeighbouringGreyLevelDependenceFeatures.h

Modules/Classification/CLUtilities/src/GlobalImageFeatures/mitkGIFCooccurenceMatrix2.cpp

Modules/Classification/CLUtilities/src/GlobalImageFeatures/mitkGIFGreyLevelSizeZone.cpp

Modules/Classification/CLUtilities/src/GlobalImageFeatures/mitkGIFNeighbouringGreyLevelDependenceFeatures.cpp

Modules/Core/include/mitkSlicedGeometry3D.h

SuperBuild.cmake

Wrapper

Wrapper/swigutils.cmake

Wrapping/CMakeLists.txt

Wrapping/Common/mitk_swig_classes.i

Wrapping/Common/mitk_swig_common.i

Wrapping/Common/mitk_swig_cpp_include.i

Wrapping/Common/mitk_swig_macros.i

Wrapping/Common/mitk_swig_std.i

Wrapping/Python/CMakeLists.txt

Wrapping/Python/LegacyPackaging.cmake

Wrapping/Python/MITK.i

Wrapping/Python/PackageUtility/Dockerfile-Python

Wrapping/Python/PackageUtility/Dockerfile-x86_64

Wrapping/Python/PackageUtility/Dockerfile-x86_64_2

Wrapping/Python/PackageUtility/imagefiles/cmd.sh

Wrapping/Python/PackageUtility/imagefiles/imagefiles/cmd.sh

Wrapping/Python/PackageUtility/imagefiles/imagefiles/install-gcc.sh

Wrapping/Python/PackageUtility/imagefiles/imagefiles/install-libtiff.sh

Wrapping/Python/PackageUtility/imagefiles/imagefiles/install.sh

Wrapping/Python/PackageUtility/imagefiles/install-gcc.sh

Wrapping/Python/PackageUtility/imagefiles/install-libtiff.sh

Wrapping/Python/PackageUtility/imagefiles/install.sh

Wrapping/Python/PackageUtility/run.sh

Wrapping/Python/Packaging/__init__.py

Wrapping/Python/Packaging/setup.py.in

Wrapping/Python/Packaging/setupegg.py

Wrapping/Python/dist/CMakeLists.txt

Wrapping/Python/mitkNumpyArrayConversion.cxx

Merge commit 'a854354d755cb0'
a2c4c8844717
Actions

Wrapping/Python/Packaging/init.py