Merge branch 'T22793-Caffe2-2'
f3986590284b
Actions

Description

Merge branch 'T22793-Caffe2-2'

Details

Provenance

neher	Authored on May 22 2017, 1:49 PM
neher	Pushed on May 22 2017, 1:58 PM

Parents

rMITK71183b3dd984: renamed miniapps to cmdapps. refactored folder structure
rMITK8cc610f7556c: Merge branch 'T22875-TensorPeaksTo4D'

Branches

Unknown

Tags

Unknown

Event Timeline

neher committed rMITKf3986590284b: Merge branch 'T22793-Caffe2-2' (authored by neher).May 22 2017, 1:49 PM

Merged Changes

71183b3dd984 renamed miniapps to cmdapps. refactored folder structure
Author
neher
Browse Repository
No Builds
No Audits
451d17097df0 removed gflags
Author
neher
Browse Repository
No Builds
No Audits
43e9a012df57 cloning Caffe2 master. Added documentation.
Author
neher
Browse Repository
No Builds
No Audits
b1dc00badcdd removed caffe2 patch
Author
neher
Browse Repository
No Builds
No Audits
4b9f138c7c21 findig protobuf with find_library
Author
neher
Browse Repository
No Builds
No Audits
6d327036508d added caffe2 predcition test
Author
neher
Browse Repository
No Builds
No Audits
8e73fbac6473 imagenet test
Author
neher
Browse Repository
No Builds
No Audits
9de6b56acaa1 diabled glog and gflags. manually added protobuf lib. added deepdiffusion module
Author
neher
Browse Repository
No Builds
No Audits
74bac9857b7b Merge branch 'T22793-Caffe2' into T22793-Caffe2-2
Author
neher
Browse Repository
No Builds
No Audits
7ef1e8a39d47 added caffe2
Author
neher
Browse Repository
No Builds
No Audits

Changes (80)

Path

Size

Packages

CMake/

BuildConfigurations/

All.cmake

O1: MITK Reviewer Group I

mitkDiffusion.cmake

O1: MITK Reviewer Group I

mitkFiberfox.cmake

O1: MITK Reviewer Group I

FindCaffe2.cmake

O1: MITK Reviewer Group I

PackageDepends/

MITK_Caffe2_Config.cmake

O1: MITK Reviewer Group I

CMakeExternals/

Caffe2.cmake

O1: MITK Reviewer Group I

MITKData.cmake

O1: MITK Reviewer Group I

CMakeLists.txt

O1: MITK Reviewer Group I

Modules/

DiffusionImaging/

mitkCaffe2PredictionTest.cpp

mitkDeepDiffusionModuleActivator.cpp

DiffusionCore/

cmdapps/

DiffusionMiniApps.dox

ExtractImageStatistics.cpp

FiberDirectionExtraction.cpp

FileFormatConverter.cpp

GibbsTracking.cpp

HotspotMiniApp.cpp

ImageStatisticsMiniApp.cpp

ImageStatisticsMiniapp_3.cpp

ImageStatisticsMiniapp_v2.cpp

LocalDirectionalFiberPlausibility.cpp

MultishellMethods.cpp

NetworkCreation.cpp

NetworkStatistics.cpp

PeakExtraction.cpp

PeaksAngularError.cpp

PlanarFigureMaskCreatorMiniapp.cpp

RfTraining.cpp

StreamlineTracking.cpp

TractDensity.cpp

TractometerMetrics.cpp

cmdapps

	cmdapps/
	MiniApps/

CMakeLists.txt

Dicom2Nrrd.cpp

Documentation

DiffusionMiniApps.dox

ExtractImageStatistics.cpp

FiberDirectionExtraction.cpp

FileFormatConverter.cpp

GibbsTracking.cpp

HotspotMiniApp.cpp

ImageStatisticsMiniApp.cpp

ImageStatisticsMiniapp_3.cpp

ImageStatisticsMiniapp_v2.cpp

LocalDirectionalFiberPlausibility.cpp

MultishellMethods.cpp

NetworkCreation.cpp

NetworkStatistics.cpp

PeakExtraction.cpp

PeaksAngularError.cpp

PlanarFigureMaskCreatorMiniapp.cpp

RfTraining.cpp

StreamlineTracking.cpp

TractDensity.cpp

TractometerMetrics.cpp

rMITKf3986590284b

View Options

CMake/BuildConfigurations/All.cmake

View Options

CMake/BuildConfigurations/mitkDiffusion.cmake

View Options

CMake/BuildConfigurations/mitkFiberfox.cmake

View Options

CMake/FindCaffe2.cmake

View Options

CMake/PackageDepends/MITK_Caffe2_Config.cmake

View Options

CMakeExternals/Caffe2.cmake

View Options

CMakeExternals/MITKData.cmake

View Options

CMakeLists.txt

View Options

Modules/DiffusionImaging/CMakeLists.txt

View Options

Modules/DiffusionImaging/DeepDiffusion/CMakeLists.txt

View Options

Modules/DiffusionImaging/DeepDiffusion/Documentation/DeepDiffusion.dox

View Options

Modules/DiffusionImaging/DeepDiffusion/Testing/CMakeLists.txt

View Options

Modules/DiffusionImaging/DeepDiffusion/Testing/files.cmake

View Options

Modules/DiffusionImaging/DeepDiffusion/Testing/mitkCaffe2PredictionTest.cpp

View Options

Modules/DiffusionImaging/DeepDiffusion/cmdapps/CMakeLists.txt

View Options

Modules/DiffusionImaging/DeepDiffusion/cmdapps/Caffe2Test.cpp

View Options

Modules/DiffusionImaging/DeepDiffusion/files.cmake

View Options

Modules/DiffusionImaging/DeepDiffusion/src/mitkDeepDiffusionModuleActivator.cpp

View Options

Modules/DiffusionImaging/DiffusionCore/cmdapps/CMakeLists.txt

View Options

Modules/DiffusionImaging/MiniApps

View Options

Modules/DiffusionImaging/MiniApps/CMakeLists.txt

View Options

Modules/DiffusionImaging/MiniApps/Dicom2Nrrd.cpp

View Options

Modules/DiffusionImaging/MiniApps/Documentation/DiffusionMiniApps.dox

View Options

Modules/DiffusionImaging/MiniApps/ExtractImageStatistics.cpp

View Options

Modules/DiffusionImaging/MiniApps/FiberDirectionExtraction.cpp

View Options

Modules/DiffusionImaging/MiniApps/FiberExtraction.cpp

View Options

Modules/DiffusionImaging/MiniApps/FiberJoin.cpp

View Options

Modules/DiffusionImaging/MiniApps/FiberProcessing.cpp

View Options

Modules/DiffusionImaging/MiniApps/Fiberfox.cpp

View Options

Modules/DiffusionImaging/MiniApps/FileFormatConverter.cpp

View Options

Modules/DiffusionImaging/MiniApps/GibbsTracking.cpp

View Options

Modules/DiffusionImaging/MiniApps/HotspotMiniApp.cpp

View Options

Modules/DiffusionImaging/MiniApps/ImageStatisticsMiniApp.cpp

View Options

Modules/DiffusionImaging/MiniApps/ImageStatisticsMiniapp_3.cpp

View Options

Modules/DiffusionImaging/MiniApps/ImageStatisticsMiniapp_v2.cpp

View Options

Modules/DiffusionImaging/MiniApps/LocalDirectionalFiberPlausibility.cpp

View Options

Modules/DiffusionImaging/MiniApps/MultishellMethods.cpp

View Options

Modules/DiffusionImaging/MiniApps/NetworkCreation.cpp

View Options

Modules/DiffusionImaging/MiniApps/NetworkStatistics.cpp

View Options

Modules/DiffusionImaging/MiniApps/PeakExtraction.cpp

View Options

Modules/DiffusionImaging/MiniApps/PeaksAngularError.cpp

View Options

Modules/DiffusionImaging/MiniApps/PlanarFigureMaskCreatorMiniapp.cpp

View Options

Modules/DiffusionImaging/MiniApps/RfTraining.cpp

View Options

Modules/DiffusionImaging/MiniApps/StreamlineTracking.cpp

View Options

Modules/DiffusionImaging/MiniApps/TractDensity.cpp

View Options

Modules/DiffusionImaging/MiniApps/TractometerMetrics.cpp

View Options

Modules/DiffusionImaging/cmdapps/CMakeLists.txt

View Options

Modules/DiffusionImaging/cmdapps/Dicom2Nrrd.cpp

View Options

Modules/DiffusionImaging/cmdapps/Documentation/DiffusionMiniApps.dox

View Options

Modules/DiffusionImaging/cmdapps/ExtractImageStatistics.cpp

View Options

Modules/DiffusionImaging/cmdapps/FiberDirectionExtraction.cpp

View Options

Modules/DiffusionImaging/cmdapps/FiberExtraction.cpp

View Options

Modules/DiffusionImaging/cmdapps/FiberJoin.cpp

View Options

Modules/DiffusionImaging/cmdapps/FiberProcessing.cpp

View Options

Modules/DiffusionImaging/cmdapps/Fiberfox.cpp

View Options

Modules/DiffusionImaging/cmdapps/FileFormatConverter.cpp

View Options

Modules/DiffusionImaging/cmdapps/GibbsTracking.cpp

View Options

Modules/DiffusionImaging/cmdapps/HotspotMiniApp.cpp

View Options

Modules/DiffusionImaging/cmdapps/ImageStatisticsMiniApp.cpp

View Options

Modules/DiffusionImaging/cmdapps/ImageStatisticsMiniapp_3.cpp

View Options

Modules/DiffusionImaging/cmdapps/ImageStatisticsMiniapp_v2.cpp

View Options

Modules/DiffusionImaging/cmdapps/LocalDirectionalFiberPlausibility.cpp

View Options

Modules/DiffusionImaging/cmdapps/MultishellMethods.cpp

View Options

Modules/DiffusionImaging/cmdapps/NetworkCreation.cpp

View Options

Modules/DiffusionImaging/cmdapps/NetworkStatistics.cpp

View Options

Modules/DiffusionImaging/cmdapps/PeakExtraction.cpp

View Options

Modules/DiffusionImaging/cmdapps/PeaksAngularError.cpp

View Options

Modules/DiffusionImaging/cmdapps/PlanarFigureMaskCreatorMiniapp.cpp

View Options

Modules/DiffusionImaging/cmdapps/RfTraining.cpp

View Options

Modules/DiffusionImaging/cmdapps/StreamlineTracking.cpp

View Options

Modules/DiffusionImaging/cmdapps/TractDensity.cpp

View Options

Modules/DiffusionImaging/cmdapps/TractometerMetrics.cpp

Merge branch 'T22793-Caffe2-2'f3986590284bActions

Description

Details

Event Timeline

Merged Changes

Changes (80)

rMITKf3986590284b

CMake/BuildConfigurations/All.cmake

CMake/BuildConfigurations/mitkDiffusion.cmake

CMake/BuildConfigurations/mitkFiberfox.cmake

CMake/FindCaffe2.cmake

CMake/PackageDepends/MITK_Caffe2_Config.cmake

CMakeExternals/Caffe2.cmake

CMakeExternals/MITKData.cmake

CMakeLists.txt

Modules/DiffusionImaging/CMakeLists.txt

Modules/DiffusionImaging/DeepDiffusion/CMakeLists.txt

Modules/DiffusionImaging/DeepDiffusion/Documentation/DeepDiffusion.dox

Modules/DiffusionImaging/DeepDiffusion/Testing/CMakeLists.txt

Modules/DiffusionImaging/DeepDiffusion/Testing/files.cmake

Modules/DiffusionImaging/DeepDiffusion/Testing/mitkCaffe2PredictionTest.cpp

Modules/DiffusionImaging/DeepDiffusion/cmdapps/CMakeLists.txt

Modules/DiffusionImaging/DeepDiffusion/cmdapps/Caffe2Test.cpp

Modules/DiffusionImaging/DeepDiffusion/files.cmake

Modules/DiffusionImaging/DeepDiffusion/src/mitkDeepDiffusionModuleActivator.cpp

Modules/DiffusionImaging/DiffusionCore/cmdapps/CMakeLists.txt

Modules/DiffusionImaging/MiniApps

Modules/DiffusionImaging/MiniApps/CMakeLists.txt

Modules/DiffusionImaging/MiniApps/Dicom2Nrrd.cpp

Modules/DiffusionImaging/MiniApps/Documentation/DiffusionMiniApps.dox

Modules/DiffusionImaging/MiniApps/ExtractImageStatistics.cpp

Modules/DiffusionImaging/MiniApps/FiberDirectionExtraction.cpp

Modules/DiffusionImaging/MiniApps/FiberExtraction.cpp

Modules/DiffusionImaging/MiniApps/FiberJoin.cpp

Modules/DiffusionImaging/MiniApps/FiberProcessing.cpp

Modules/DiffusionImaging/MiniApps/Fiberfox.cpp

Modules/DiffusionImaging/MiniApps/FileFormatConverter.cpp

Modules/DiffusionImaging/MiniApps/GibbsTracking.cpp

Modules/DiffusionImaging/MiniApps/HotspotMiniApp.cpp

Modules/DiffusionImaging/MiniApps/ImageStatisticsMiniApp.cpp

Modules/DiffusionImaging/MiniApps/ImageStatisticsMiniapp_3.cpp

Modules/DiffusionImaging/MiniApps/ImageStatisticsMiniapp_v2.cpp

Modules/DiffusionImaging/MiniApps/LocalDirectionalFiberPlausibility.cpp

Modules/DiffusionImaging/MiniApps/MultishellMethods.cpp

Modules/DiffusionImaging/MiniApps/NetworkCreation.cpp

Modules/DiffusionImaging/MiniApps/NetworkStatistics.cpp

Modules/DiffusionImaging/MiniApps/PeakExtraction.cpp

Modules/DiffusionImaging/MiniApps/PeaksAngularError.cpp

Modules/DiffusionImaging/MiniApps/PlanarFigureMaskCreatorMiniapp.cpp

Modules/DiffusionImaging/MiniApps/RfTraining.cpp

Modules/DiffusionImaging/MiniApps/StreamlineTracking.cpp

Modules/DiffusionImaging/MiniApps/TractDensity.cpp

Modules/DiffusionImaging/MiniApps/TractometerMetrics.cpp

Modules/DiffusionImaging/cmdapps/CMakeLists.txt

Modules/DiffusionImaging/cmdapps/Dicom2Nrrd.cpp

Modules/DiffusionImaging/cmdapps/Documentation/DiffusionMiniApps.dox

Modules/DiffusionImaging/cmdapps/ExtractImageStatistics.cpp

Modules/DiffusionImaging/cmdapps/FiberDirectionExtraction.cpp

Modules/DiffusionImaging/cmdapps/FiberExtraction.cpp

Modules/DiffusionImaging/cmdapps/FiberJoin.cpp

Modules/DiffusionImaging/cmdapps/FiberProcessing.cpp

Modules/DiffusionImaging/cmdapps/Fiberfox.cpp

Modules/DiffusionImaging/cmdapps/FileFormatConverter.cpp

Modules/DiffusionImaging/cmdapps/GibbsTracking.cpp

Modules/DiffusionImaging/cmdapps/HotspotMiniApp.cpp

Modules/DiffusionImaging/cmdapps/ImageStatisticsMiniApp.cpp

Modules/DiffusionImaging/cmdapps/ImageStatisticsMiniapp_3.cpp

Modules/DiffusionImaging/cmdapps/ImageStatisticsMiniapp_v2.cpp

Modules/DiffusionImaging/cmdapps/LocalDirectionalFiberPlausibility.cpp

Modules/DiffusionImaging/cmdapps/MultishellMethods.cpp

Modules/DiffusionImaging/cmdapps/NetworkCreation.cpp

Modules/DiffusionImaging/cmdapps/NetworkStatistics.cpp

Modules/DiffusionImaging/cmdapps/PeakExtraction.cpp

Modules/DiffusionImaging/cmdapps/PeaksAngularError.cpp

Modules/DiffusionImaging/cmdapps/PlanarFigureMaskCreatorMiniapp.cpp

Modules/DiffusionImaging/cmdapps/RfTraining.cpp

Modules/DiffusionImaging/cmdapps/StreamlineTracking.cpp

Modules/DiffusionImaging/cmdapps/TractDensity.cpp

Modules/DiffusionImaging/cmdapps/TractometerMetrics.cpp

Merge branch 'T22793-Caffe2-2'
f3986590284b
Actions