diff options
| author | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2017-09-15 16:38:08 +0200 |
|---|---|---|
| committer | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2017-09-15 16:38:08 +0200 |
| commit | aa31a06235496c0d808e57c8ce914cb4b640bc6e (patch) | |
| tree | 33385e828ddca0b2857bac9e3dac4dd3723a3eee /matlab/mex | |
| parent | f6aa2db83dfea89f9d2cfc6fcbd3da141ee77e02 (diff) | |
| parent | 00a1c6118b2d64b867c8e640c295462bcccfc7c9 (diff) | |
| download | astra-aa31a06235496c0d808e57c8ce914cb4b640bc6e.tar.gz astra-aa31a06235496c0d808e57c8ce914cb4b640bc6e.tar.bz2 astra-aa31a06235496c0d808e57c8ce914cb4b640bc6e.tar.xz astra-aa31a06235496c0d808e57c8ce914cb4b640bc6e.zip | |
Merge branch 'master' into parallel_vec
Diffstat (limited to 'matlab/mex')
37 files changed, 190 insertions, 6026 deletions
diff --git a/matlab/mex/astra_mex_algorithm_c.cpp b/matlab/mex/astra_mex_algorithm_c.cpp index ec7aa72..a9cd14b 100644 --- a/matlab/mex/astra_mex_algorithm_c.cpp +++ b/matlab/mex/astra_mex_algorithm_c.cpp @@ -1,10 +1,10 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp - 2014-2015, CWI, Amsterdam +Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp + 2014-2016, CWI, Amsterdam Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/ This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ You should have received a copy of the GNU General Public License along with the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>. ----------------------------------------------------------------------- -$Id$ */ /** \file astra_mex_algorithm_c.cpp diff --git a/matlab/mex/astra_mex_algorithm_vc09.vcproj b/matlab/mex/astra_mex_algorithm_vc09.vcproj deleted file mode 100644 index d5cebc0..0000000 --- a/matlab/mex/astra_mex_algorithm_vc09.vcproj +++ /dev/null @@ -1,612 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="9.00" - Name="astra_mex_algorithm" - ProjectGUID="{056BF7A9-294D-487C-8CC3-BE629077CA94}" - RootNamespace="astraMatlab" - TargetFrameworkVersion="131072" - > - <Platforms> - <Platform - Name="Win32" - /> - <Platform - Name="x64" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug_CUDA|Win32" - OutputDirectory="$(SolutionDir)bin\$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(OutDir)\obj\$(ProjectName)" - ConfigurationType="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="$(MATLAB_ROOT)\extern\include\;"$(CUDA_INC_PATH)";..\..\lib\include;..\..\include" - PreprocessorDefinitions="ASTRA_CUDA;__SSE2__" - Optimization="0" - RuntimeLibrary="3" - EnableEnhancedInstructionSet="2" - OpenMP="true" - AdditionalOptions="/MP" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="AstraCuda32D.lib libmex.lib libmx.lib libut.lib" - OutputFile="$(OutDir)\$(ProjectName)_c.mexw32" - AdditionalLibraryDirectories="..\..\bin\win32;$(MATLAB_ROOT)\extern\lib\win32\microsoft;..\..\lib\win32" - ModuleDefinitionFile="mex.def" - GenerateDebugInformation="true" - TargetMachine="1" - /> - </Configuration> - <Configuration - Name="Debug_CUDA|x64" - OutputDirectory="$(SolutionDir)bin\$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(OutDir)\obj\$(ProjectName)" - ConfigurationType="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="$(MATLAB_ROOT)\extern\include\;"$(CUDA_INC_PATH)";..\..\lib\include;..\..\include" - PreprocessorDefinitions="ASTRA_CUDA;__SSE2__" - Optimization="0" - RuntimeLibrary="3" - OpenMP="true" - AdditionalOptions="/MP" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="AstraCuda64D.lib libmex.lib libmx.lib libut.lib" - OutputFile="$(OutDir)\$(ProjectName)_c.mexw64" - AdditionalLibraryDirectories="..\..\bin\x64;$(MATLAB_ROOT)\extern\lib\win64\microsoft;..\..\lib\x64" - ModuleDefinitionFile="mex.def" - GenerateDebugInformation="true" - TargetMachine="17" - /> - </Configuration> - <Configuration - Name="Debug|Win32" - OutputDirectory="$(SolutionDir)bin\$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(OutDir)\obj\$(ProjectName)" - ConfigurationType="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="$(MATLAB_ROOT)\extern\include\;..\..\lib\include;..\..\include" - PreprocessorDefinitions="__SSE2__" - Optimization="0" - RuntimeLibrary="3" - EnableEnhancedInstructionSet="2" - OpenMP="true" - AdditionalOptions="/MP" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="Astra32D.lib libmex.lib libmx.lib libut.lib" - OutputFile="$(OutDir)\$(ProjectName)_c.mexw32" - AdditionalLibraryDirectories="..\..\bin\win32;$(MATLAB_ROOT)\extern\lib\win32\microsoft;..\..\lib\win32" - ModuleDefinitionFile="mex.def" - GenerateDebugInformation="true" - TargetMachine="1" - /> - </Configuration> - <Configuration - Name="Debug|x64" - OutputDirectory="$(SolutionDir)bin\$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(OutDir)\obj\$(ProjectName)" - ConfigurationType="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="$(MATLAB_ROOT)\extern\include\;..\..\lib\include;..\..\include" - PreprocessorDefinitions="__SSE2__" - Optimization="0" - RuntimeLibrary="3" - OpenMP="true" - AdditionalOptions="/MP" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="Astra64D.lib libmex.lib libmx.lib libut.lib" - OutputFile="$(OutDir)\$(ProjectName)_c.mexw64" - AdditionalLibraryDirectories="..\..\bin\x64;$(MATLAB_ROOT)\extern\lib\win64\microsoft;..\..\lib\x64" - ModuleDefinitionFile="mex.def" - GenerateDebugInformation="true" - TargetMachine="17" - /> - </Configuration> - <Configuration - Name="Release_CUDA|Win32" - OutputDirectory="$(SolutionDir)bin\$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(OutDir)\obj\$(ProjectName)" - ConfigurationType="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="$(MATLAB_ROOT)\extern\include\;"$(CUDA_INC_PATH)";..\..\lib\include;..\..\include" - PreprocessorDefinitions="ASTRA_CUDA;__SSE2__" - Optimization="2" - RuntimeLibrary="2" - EnableEnhancedInstructionSet="2" - OpenMP="true" - AdditionalOptions="/MP" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="AstraCuda32.lib libmex.lib libmx.lib libut.lib" - OutputFile="$(OutDir)\$(ProjectName)_c.mexw32" - AdditionalLibraryDirectories="..\..\bin\win32;$(MATLAB_ROOT)\extern\lib\win32\microsoft;..\..\lib\win32" - ModuleDefinitionFile="mex.def" - GenerateDebugInformation="false" - TargetMachine="1" - /> - </Configuration> - <Configuration - Name="Release_CUDA|x64" - OutputDirectory="$(SolutionDir)bin\$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(OutDir)\obj\$(ProjectName)" - ConfigurationType="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="$(MATLAB_ROOT)\extern\include\;"$(CUDA_INC_PATH)";..\..\lib\include;..\..\include" - PreprocessorDefinitions="ASTRA_CUDA;__SSE2__" - Optimization="2" - RuntimeLibrary="2" - OpenMP="true" - AdditionalOptions="/MP" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="AstraCuda64.lib libmex.lib libmx.lib libut.lib" - OutputFile="$(OutDir)\$(ProjectName)_c.mexw64" - AdditionalLibraryDirectories="..\..\bin\x64;$(MATLAB_ROOT)\extern\lib\win64\microsoft;..\..\lib\x64" - ModuleDefinitionFile="mex.def" - GenerateDebugInformation="false" - TargetMachine="17" - /> - </Configuration> - <Configuration - Name="Release|Win32" - OutputDirectory="$(SolutionDir)bin\$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(OutDir)\obj\$(ProjectName)" - ConfigurationType="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="$(MATLAB_ROOT)\extern\include\;..\..\lib\include;..\..\include" - PreprocessorDefinitions="__SSE2__" - Optimization="2" - RuntimeLibrary="2" - EnableEnhancedInstructionSet="2" - OpenMP="true" - AdditionalOptions="/MP" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="Astra32.lib libmex.lib libmx.lib libut.lib" - OutputFile="$(OutDir)\$(ProjectName)_c.mexw32" - AdditionalLibraryDirectories="..\..\bin\win32;$(MATLAB_ROOT)\extern\lib\win32\microsoft;..\..\lib\win32" - ModuleDefinitionFile="mex.def" - GenerateDebugInformation="false" - TargetMachine="1" - /> - </Configuration> - <Configuration - Name="Release|x64" - OutputDirectory="$(SolutionDir)bin\$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(OutDir)\obj\$(ProjectName)" - ConfigurationType="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="$(MATLAB_ROOT)\extern\include\;..\..\lib\include;..\..\include" - PreprocessorDefinitions="__SSE2__" - Optimization="2" - RuntimeLibrary="2" - OpenMP="true" - AdditionalOptions="/MP" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="Astra64.lib libmex.lib libmx.lib libut.lib" - OutputFile="$(OutDir)\$(ProjectName)_c.mexw64" - AdditionalLibraryDirectories="..\..\bin\x64;$(MATLAB_ROOT)\extern\lib\win64\microsoft;..\..\lib\x64" - ModuleDefinitionFile="mex.def" - GenerateDebugInformation="false" - TargetMachine="17" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <File - RelativePath=".\astra_mex_algorithm_c.cpp" - > - </File> - <File - RelativePath=".\mexHelpFunctions.cpp" - > - </File> - <File - RelativePath=".\mexHelpFunctions.h" - > - </File> - <File - RelativePath=".\mexInitFunctions.cpp" - > - </File> - <File - RelativePath=".\mexInitFunctions.h" - > - </File> - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/matlab/mex/astra_mex_algorithm_vc11.vcxproj b/matlab/mex/astra_mex_algorithm_vc14.vcxproj index c133e26..05b120f 100644 --- a/matlab/mex/astra_mex_algorithm_vc11.vcxproj +++ b/matlab/mex/astra_mex_algorithm_vc14.vcxproj @@ -36,41 +36,41 @@ </ItemGroup> <PropertyGroup Label="Globals"> <ProjectName>astra_mex_algorithm</ProjectName> - <ProjectGuid>{056BF7A9-294D-487C-8CC3-BE629077CA94}</ProjectGuid> + <ProjectGuid>{CE5EF874-830C-4C10-8651-CCA2A34ED9E4}</ProjectGuid> <RootNamespace>astraMatlab</RootNamespace> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_CUDA|Win32'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> - <PlatformToolset>v110</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_CUDA|x64'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> - <PlatformToolset>v110</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> - <PlatformToolset>v110</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> - <PlatformToolset>v110</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_CUDA|Win32'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> - <PlatformToolset>v110</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_CUDA|x64'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> - <PlatformToolset>v110</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> - <PlatformToolset>v110</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> - <PlatformToolset>v110</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> diff --git a/matlab/mex/astra_mex_c.cpp b/matlab/mex/astra_mex_c.cpp index f499528..d9ff8f3 100644 --- a/matlab/mex/astra_mex_c.cpp +++ b/matlab/mex/astra_mex_c.cpp @@ -1,10 +1,10 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp - 2014-2015, CWI, Amsterdam +Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp + 2014-2016, CWI, Amsterdam Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/ This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ You should have received a copy of the GNU General Public License along with the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>. ----------------------------------------------------------------------- -$Id$ */ /** \file astra_mex_c.cpp diff --git a/matlab/mex/astra_mex_data2d_c.cpp b/matlab/mex/astra_mex_data2d_c.cpp index 6371c9e..3d3a253 100644 --- a/matlab/mex/astra_mex_data2d_c.cpp +++ b/matlab/mex/astra_mex_data2d_c.cpp @@ -1,10 +1,10 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp - 2014-2015, CWI, Amsterdam +Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp + 2014-2016, CWI, Amsterdam Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/ This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ You should have received a copy of the GNU General Public License along with the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>. ----------------------------------------------------------------------- -$Id$ */ /** \file astra_mex_data2d_c.cpp diff --git a/matlab/mex/astra_mex_data2d_vc09.vcproj b/matlab/mex/astra_mex_data2d_vc09.vcproj deleted file mode 100644 index 2c8a63f..0000000 --- a/matlab/mex/astra_mex_data2d_vc09.vcproj +++ /dev/null @@ -1,628 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="9.00" - Name="astra_mex_data2d" - ProjectGUID="{E4092269-B19C-46F7-A84E-4F146CC70E44}" - RootNamespace="astraMatlab" - TargetFrameworkVersion="131072" - > - <Platforms> - <Platform - Name="Win32" - /> - <Platform - Name="x64" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug_CUDA|Win32" - OutputDirectory="$(SolutionDir)bin\$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(OutDir)\obj\$(ProjectName)" - ConfigurationType="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="$(MATLAB_ROOT)\extern\include\;"$(CUDA_INC_PATH)";..\..\lib\include;..\..\include" - PreprocessorDefinitions="ASTRA_CUDA;__SSE2__" - Optimization="0" - RuntimeLibrary="3" - EnableEnhancedInstructionSet="2" - OpenMP="true" - AdditionalOptions="/MP" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="AstraCuda32D.lib libmex.lib libmx.lib libut.lib" - OutputFile="$(OutDir)\$(ProjectName)_c.mexw32" - AdditionalLibraryDirectories="..\..\bin\win32;$(MATLAB_ROOT)\extern\lib\win32\microsoft;..\..\lib\win32" - ModuleDefinitionFile="mex.def" - GenerateDebugInformation="true" - TargetMachine="1" - /> - </Configuration> - <Configuration - Name="Debug_CUDA|x64" - OutputDirectory="$(SolutionDir)bin\$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(OutDir)\obj\$(ProjectName)" - ConfigurationType="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="$(MATLAB_ROOT)\extern\include\;"$(CUDA_INC_PATH)";..\..\lib\include;..\..\include" - PreprocessorDefinitions="ASTRA_CUDA;__SSE2__" - Optimization="0" - RuntimeLibrary="3" - OpenMP="true" - AdditionalOptions="/MP" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="AstraCuda64D.lib libmex.lib libmx.lib libut.lib" - OutputFile="$(OutDir)\$(ProjectName)_c.mexw64" - AdditionalLibraryDirectories="..\..\bin\x64;$(MATLAB_ROOT)\extern\lib\win64\microsoft;..\..\lib\x64" - ModuleDefinitionFile="mex.def" - GenerateDebugInformation="true" - TargetMachine="17" - /> - </Configuration> - <Configuration - Name="Debug|Win32" - OutputDirectory="$(SolutionDir)bin\$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(OutDir)\obj\$(ProjectName)" - ConfigurationType="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="$(MATLAB_ROOT)\extern\include\;..\..\lib\include;..\..\include" - PreprocessorDefinitions="__SSE2__" - Optimization="0" - RuntimeLibrary="3" - EnableEnhancedInstructionSet="2" - OpenMP="true" - AdditionalOptions="/MP" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="Astra32D.lib libmex.lib libmx.lib libut.lib" - OutputFile="$(OutDir)\$(ProjectName)_c.mexw32" - AdditionalLibraryDirectories="..\..\bin\win32;$(MATLAB_ROOT)\extern\lib\win32\microsoft;..\..\lib\win32" - ModuleDefinitionFile="mex.def" - GenerateDebugInformation="true" - TargetMachine="1" - /> - </Configuration> - <Configuration - Name="Debug|x64" - OutputDirectory="$(SolutionDir)bin\$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(OutDir)\obj\$(ProjectName)" - ConfigurationType="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="$(MATLAB_ROOT)\extern\include\;..\..\lib\include;..\..\include" - PreprocessorDefinitions="__SSE2__" - Optimization="0" - RuntimeLibrary="3" - OpenMP="true" - AdditionalOptions="/MP" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="Astra64D.lib libmex.lib libmx.lib libut.lib" - OutputFile="$(OutDir)\$(ProjectName)_c.mexw64" - AdditionalLibraryDirectories="..\..\bin\x64;$(MATLAB_ROOT)\extern\lib\win64\microsoft;..\..\lib\x64" - ModuleDefinitionFile="mex.def" - GenerateDebugInformation="true" - TargetMachine="17" - /> - </Configuration> - <Configuration - Name="Release_CUDA|Win32" - OutputDirectory="$(SolutionDir)bin\$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(OutDir)\obj\$(ProjectName)" - ConfigurationType="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="$(MATLAB_ROOT)\extern\include\;"$(CUDA_INC_PATH)";..\..\lib\include;..\..\include" - PreprocessorDefinitions="ASTRA_CUDA;__SSE2__" - Optimization="2" - RuntimeLibrary="2" - EnableEnhancedInstructionSet="2" - OpenMP="true" - AdditionalOptions="/MP" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="AstraCuda32.lib libmex.lib libmx.lib libut.lib" - OutputFile="$(OutDir)\$(ProjectName)_c.mexw32" - AdditionalLibraryDirectories="..\..\bin\win32;$(MATLAB_ROOT)\extern\lib\win32\microsoft;..\..\lib\win32" - ModuleDefinitionFile="mex.def" - GenerateDebugInformation="false" - TargetMachine="1" - /> - </Configuration> - <Configuration - Name="Release_CUDA|x64" - OutputDirectory="$(SolutionDir)bin\$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(OutDir)\obj\$(ProjectName)" - ConfigurationType="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="$(MATLAB_ROOT)\extern\include\;"$(CUDA_INC_PATH)";..\..\lib\include;..\..\include" - PreprocessorDefinitions="ASTRA_CUDA;__SSE2__" - Optimization="2" - RuntimeLibrary="2" - OpenMP="true" - AdditionalOptions="/MP" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="AstraCuda64.lib libmex.lib libmx.lib libut.lib" - OutputFile="$(OutDir)\$(ProjectName)_c.mexw64" - AdditionalLibraryDirectories="..\..\bin\x64;$(MATLAB_ROOT)\extern\lib\win64\microsoft;..\..\lib\x64" - ModuleDefinitionFile="mex.def" - GenerateDebugInformation="false" - TargetMachine="17" - /> - </Configuration> - <Configuration - Name="Release|Win32" - OutputDirectory="$(SolutionDir)bin\$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(OutDir)\obj\$(ProjectName)" - ConfigurationType="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="$(MATLAB_ROOT)\extern\include\;..\..\lib\include;..\..\include" - PreprocessorDefinitions="__SSE2__" - Optimization="2" - RuntimeLibrary="2" - EnableEnhancedInstructionSet="2" - OpenMP="true" - AdditionalOptions="/MP" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="Astra32.lib libmex.lib libmx.lib libut.lib" - OutputFile="$(OutDir)\$(ProjectName)_c.mexw32" - AdditionalLibraryDirectories="..\..\bin\win32;$(MATLAB_ROOT)\extern\lib\win32\microsoft;..\..\lib\win32" - ModuleDefinitionFile="mex.def" - GenerateDebugInformation="false" - TargetMachine="1" - /> - </Configuration> - <Configuration - Name="Release|x64" - OutputDirectory="$(SolutionDir)bin\$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(OutDir)\obj\$(ProjectName)" - ConfigurationType="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="$(MATLAB_ROOT)\extern\include\;..\..\lib\include;..\..\include" - PreprocessorDefinitions="__SSE2__" - Optimization="2" - RuntimeLibrary="2" - OpenMP="true" - AdditionalOptions="/MP" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="Astra64.lib libmex.lib libmx.lib libut.lib" - OutputFile="$(OutDir)\$(ProjectName)_c.mexw64" - AdditionalLibraryDirectories="..\..\bin\x64;$(MATLAB_ROOT)\extern\lib\win64\microsoft;..\..\lib\x64" - ModuleDefinitionFile="mex.def" - GenerateDebugInformation="false" - TargetMachine="17" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <File - RelativePath=".\astra_mex_data2d_c.cpp" - > - </File> - <File - RelativePath=".\mexHelpFunctions.cpp" - > - </File> - <File - RelativePath=".\mexHelpFunctions.h" - > - </File> - <File - RelativePath=".\mexCopyDataHelpFunctions.cpp" - > - </File> - <File - RelativePath=".\mexCopyDataHelpFunctions.h" - > - </File> - <File - RelativePath=".\mexDataManagerHelpFunctions.cpp" - > - </File> - <File - RelativePath=".\mexDataManagerHelpFunctions.h" - > - </File> - <File - RelativePath=".\mexInitFunctions.cpp" - > - </File> - <File - RelativePath=".\mexInitFunctions.h" - > - </File> - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/matlab/mex/astra_mex_data2d_vc11.vcxproj b/matlab/mex/astra_mex_data2d_vc14.vcxproj index 636780a..6c5dccc 100644 --- a/matlab/mex/astra_mex_data2d_vc11.vcxproj +++ b/matlab/mex/astra_mex_data2d_vc14.vcxproj @@ -36,41 +36,41 @@ </ItemGroup> <PropertyGroup Label="Globals"> <ProjectName>astra_mex_data2d</ProjectName> - <ProjectGuid>{E4092269-B19C-46F7-A84E-4F146CC70E44}</ProjectGuid> + <ProjectGuid>{D2CDCDB3-7AD9-4853-8D87-BDB1DAD9C9C1}</ProjectGuid> <RootNamespace>astraMatlab</RootNamespace> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_CUDA|Win32'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> - <PlatformToolset>v110</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_CUDA|x64'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> - <PlatformToolset>v110</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> - <PlatformToolset>v110</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> - <PlatformToolset>v110</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_CUDA|Win32'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> - <PlatformToolset>v110</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_CUDA|x64'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> - <PlatformToolset>v110</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> - <PlatformToolset>v110</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> - <PlatformToolset>v110</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> diff --git a/matlab/mex/astra_mex_data3d_c.cpp b/matlab/mex/astra_mex_data3d_c.cpp index fe4ce37..f0aa3c8 100644 --- a/matlab/mex/astra_mex_data3d_c.cpp +++ b/matlab/mex/astra_mex_data3d_c.cpp @@ -1,10 +1,10 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp - 2014-2015, CWI, Amsterdam +Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp + 2014-2016, CWI, Amsterdam Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/ This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ You should have received a copy of the GNU General Public License along with the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>. ----------------------------------------------------------------------- -$Id$ */ /** \file astra_mex_data3d_c.cpp @@ -61,7 +60,7 @@ using namespace astra; //----------------------------------------------------------------------------------------- /** * id = astra_mex_io_data('create', datatype, geometry, data); - * datatype: ['-vol','-sino','-sinocone'] + * datatype: ['-vol','-sino'] */ void astra_mex_data3d_create(int& nlhs, mxArray* plhs[], int& nrhs, const mxArray* prhs[]) { @@ -104,7 +103,6 @@ void astra_mex_data3d_create(int& nlhs, mxArray* plhs[], int& nrhs, const mxArra copyMexToCFloat32Array(data, pDataObject3D->getData(), pDataObject3D->getSize()); } - pDataObject3D->updateStatistics(); // step4: store data object int iIndex = CData3DManager::getSingleton().store(pDataObject3D); @@ -163,8 +161,6 @@ void astra_mex_data3d_link(int& nlhs, mxArray* plhs[], int& nrhs, const mxArray* return; } - //pDataObject3D->updateStatistics(); - // step4: store data object int iIndex = CData3DManager::getSingleton().store(pDataObject3D); @@ -235,7 +231,6 @@ void astra_mex_data3d_store(int nlhs, mxArray* plhs[], int nrhs, const mxArray* } copyMexToCFloat32Array(prhs[2], pDataObject->getData(), pDataObject->getSize()); - pDataObject->updateStatistics(); } void astra_mex_data3d_dimensions(int nlhs, mxArray* plhs[], int nrhs, const mxArray* prhs[]) diff --git a/matlab/mex/astra_mex_data3d_vc09.vcproj b/matlab/mex/astra_mex_data3d_vc09.vcproj deleted file mode 100644 index fd861a3..0000000 --- a/matlab/mex/astra_mex_data3d_vc09.vcproj +++ /dev/null @@ -1,628 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="9.00" - Name="astra_mex_data3d" - ProjectGUID="{0BEC029B-0929-4BF9-BD8B-9C9806A52065}" - RootNamespace="astraMatlab" - TargetFrameworkVersion="131072" - > - <Platforms> - <Platform - Name="Win32" - /> - <Platform - Name="x64" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug_CUDA|Win32" - OutputDirectory="$(SolutionDir)bin\$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(OutDir)\obj\$(ProjectName)" - ConfigurationType="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="$(MATLAB_ROOT)\extern\include\;"$(CUDA_INC_PATH)";..\..\lib\include;..\..\include" - PreprocessorDefinitions="ASTRA_CUDA;__SSE2__" - Optimization="0" - RuntimeLibrary="3" - EnableEnhancedInstructionSet="2" - OpenMP="true" - AdditionalOptions="/MP" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="AstraCuda32D.lib libmex.lib libmx.lib libut.lib" - OutputFile="$(OutDir)\$(ProjectName)_c.mexw32" - AdditionalLibraryDirectories="..\..\bin\win32;$(MATLAB_ROOT)\extern\lib\win32\microsoft;..\..\lib\win32" - ModuleDefinitionFile="mex.def" - GenerateDebugInformation="true" - TargetMachine="1" - /> - </Configuration> - <Configuration - Name="Debug_CUDA|x64" - OutputDirectory="$(SolutionDir)bin\$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(OutDir)\obj\$(ProjectName)" - ConfigurationType="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="$(MATLAB_ROOT)\extern\include\;"$(CUDA_INC_PATH)";..\..\lib\include;..\..\include" - PreprocessorDefinitions="ASTRA_CUDA;__SSE2__" - Optimization="0" - RuntimeLibrary="3" - OpenMP="true" - AdditionalOptions="/MP" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="AstraCuda64D.lib libmex.lib libmx.lib libut.lib" - OutputFile="$(OutDir)\$(ProjectName)_c.mexw64" - AdditionalLibraryDirectories="..\..\bin\x64;$(MATLAB_ROOT)\extern\lib\win64\microsoft;..\..\lib\x64" - ModuleDefinitionFile="mex.def" - GenerateDebugInformation="true" - TargetMachine="17" - /> - </Configuration> - <Configuration - Name="Debug|Win32" - OutputDirectory="$(SolutionDir)bin\$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(OutDir)\obj\$(ProjectName)" - ConfigurationType="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="$(MATLAB_ROOT)\extern\include\;..\..\lib\include;..\..\include" - PreprocessorDefinitions="__SSE2__" - Optimization="0" - RuntimeLibrary="3" - EnableEnhancedInstructionSet="2" - OpenMP="true" - AdditionalOptions="/MP" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="Astra32D.lib libmex.lib libmx.lib libut.lib" - OutputFile="$(OutDir)\$(ProjectName)_c.mexw32" - AdditionalLibraryDirectories="..\..\bin\win32;$(MATLAB_ROOT)\extern\lib\win32\microsoft;..\..\lib\win32" - ModuleDefinitionFile="mex.def" - GenerateDebugInformation="true" - TargetMachine="1" - /> - </Configuration> - <Configuration - Name="Debug|x64" - OutputDirectory="$(SolutionDir)bin\$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(OutDir)\obj\$(ProjectName)" - ConfigurationType="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="$(MATLAB_ROOT)\extern\include\;..\..\lib\include;..\..\include" - PreprocessorDefinitions="__SSE2__" - Optimization="0" - RuntimeLibrary="3" - OpenMP="true" - AdditionalOptions="/MP" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="Astra64D.lib libmex.lib libmx.lib libut.lib" - OutputFile="$(OutDir)\$(ProjectName)_c.mexw64" - AdditionalLibraryDirectories="..\..\bin\x64;$(MATLAB_ROOT)\extern\lib\win64\microsoft;..\..\lib\x64" - ModuleDefinitionFile="mex.def" - GenerateDebugInformation="true" - TargetMachine="17" - /> - </Configuration> - <Configuration - Name="Release_CUDA|Win32" - OutputDirectory="$(SolutionDir)bin\$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(OutDir)\obj\$(ProjectName)" - ConfigurationType="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="$(MATLAB_ROOT)\extern\include\;"$(CUDA_INC_PATH)";..\..\lib\include;..\..\include" - PreprocessorDefinitions="ASTRA_CUDA;__SSE2__" - Optimization="2" - RuntimeLibrary="2" - EnableEnhancedInstructionSet="2" - OpenMP="true" - AdditionalOptions="/MP" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="AstraCuda32.lib libmex.lib libmx.lib libut.lib" - OutputFile="$(OutDir)\$(ProjectName)_c.mexw32" - AdditionalLibraryDirectories="..\..\bin\win32;$(MATLAB_ROOT)\extern\lib\win32\microsoft;..\..\lib\win32" - ModuleDefinitionFile="mex.def" - GenerateDebugInformation="false" - TargetMachine="1" - /> - </Configuration> - <Configuration - Name="Release_CUDA|x64" - OutputDirectory="$(SolutionDir)bin\$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(OutDir)\obj\$(ProjectName)" - ConfigurationType="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="$(MATLAB_ROOT)\extern\include\;"$(CUDA_INC_PATH)";..\..\lib\include;..\..\include" - PreprocessorDefinitions="ASTRA_CUDA;__SSE2__" - Optimization="2" - RuntimeLibrary="2" - OpenMP="true" - AdditionalOptions="/MP" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="AstraCuda64.lib libmex.lib libmx.lib libut.lib" - OutputFile="$(OutDir)\$(ProjectName)_c.mexw64" - AdditionalLibraryDirectories="..\..\bin\x64;$(MATLAB_ROOT)\extern\lib\win64\microsoft;..\..\lib\x64" - ModuleDefinitionFile="mex.def" - GenerateDebugInformation="false" - TargetMachine="17" - /> - </Configuration> - <Configuration - Name="Release|Win32" - OutputDirectory="$(SolutionDir)bin\$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(OutDir)\obj\$(ProjectName)" - ConfigurationType="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="$(MATLAB_ROOT)\extern\include\;..\..\lib\include;..\..\include" - PreprocessorDefinitions="__SSE2__" - Optimization="2" - RuntimeLibrary="2" - EnableEnhancedInstructionSet="2" - OpenMP="true" - AdditionalOptions="/MP" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="Astra32.lib libmex.lib libmx.lib libut.lib" - OutputFile="$(OutDir)\$(ProjectName)_c.mexw32" - AdditionalLibraryDirectories="..\..\bin\win32;$(MATLAB_ROOT)\extern\lib\win32\microsoft;..\..\lib\win32" - ModuleDefinitionFile="mex.def" - GenerateDebugInformation="false" - TargetMachine="1" - /> - </Configuration> - <Configuration - Name="Release|x64" - OutputDirectory="$(SolutionDir)bin\$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(OutDir)\obj\$(ProjectName)" - ConfigurationType="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="$(MATLAB_ROOT)\extern\include\;..\..\lib\include;..\..\include" - PreprocessorDefinitions="__SSE2__" - Optimization="2" - RuntimeLibrary="2" - OpenMP="true" - AdditionalOptions="/MP" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="Astra64.lib libmex.lib libmx.lib libut.lib" - OutputFile="$(OutDir)\$(ProjectName)_c.mexw64" - AdditionalLibraryDirectories="..\..\bin\x64;$(MATLAB_ROOT)\extern\lib\win64\microsoft;..\..\lib\x64" - ModuleDefinitionFile="mex.def" - GenerateDebugInformation="false" - TargetMachine="17" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <File - RelativePath=".\astra_mex_data3d_c.cpp" - > - </File> - <File - RelativePath=".\mexHelpFunctions.cpp" - > - </File> - <File - RelativePath=".\mexHelpFunctions.h" - > - </File> - <File - RelativePath=".\mexCopyDataHelpFunctions.cpp" - > - </File> - <File - RelativePath=".\mexCopyDataHelpFunctions.h" - > - </File> - <File - RelativePath=".\mexDataManagerHelpFunctions.cpp" - > - </File> - <File - RelativePath=".\mexDataManagerHelpFunctions.h" - > - </File> - <File - RelativePath=".\mexInitFunctions.cpp" - > - </File> - <File - RelativePath=".\mexInitFunctions.h" - > - </File> - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/matlab/mex/astra_mex_data3d_vc11.vcxproj b/matlab/mex/astra_mex_data3d_vc14.vcxproj index 1c3c620..8a10af7 100644 --- a/matlab/mex/astra_mex_data3d_vc11.vcxproj +++ b/matlab/mex/astra_mex_data3d_vc14.vcxproj @@ -36,41 +36,41 @@ </ItemGroup> <PropertyGroup Label="Globals"> <ProjectName>astra_mex_data3d</ProjectName> - <ProjectGuid>{0BEC029B-0929-4BF9-BD8B-9C9806A52065}</ProjectGuid> + <ProjectGuid>{2A7084C6-62ED-4235-85F4-094C17689DEB}</ProjectGuid> <RootNamespace>astraMatlab</RootNamespace> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_CUDA|Win32'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> - <PlatformToolset>v110</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_CUDA|x64'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> - <PlatformToolset>v110</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> - <PlatformToolset>v110</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> - <PlatformToolset>v110</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_CUDA|Win32'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> - <PlatformToolset>v110</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_CUDA|x64'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> - <PlatformToolset>v110</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> - <PlatformToolset>v110</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> - <PlatformToolset>v110</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> diff --git a/matlab/mex/astra_mex_direct_c.cpp b/matlab/mex/astra_mex_direct_c.cpp index 38b3f59..d92a10c 100644 --- a/matlab/mex/astra_mex_direct_c.cpp +++ b/matlab/mex/astra_mex_direct_c.cpp @@ -1,10 +1,10 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp - 2014-2015, CWI, Amsterdam +Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp + 2014-2016, CWI, Amsterdam Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/ This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ You should have received a copy of the GNU General Public License along with the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>. ----------------------------------------------------------------------- -$Id$ */ /** \file astra_mex_direct_c.cpp diff --git a/matlab/mex/astra_mex_direct_vc09.vcproj b/matlab/mex/astra_mex_direct_vc09.vcproj deleted file mode 100644 index 5d27c65..0000000 --- a/matlab/mex/astra_mex_direct_vc09.vcproj +++ /dev/null @@ -1,628 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="9.00" - Name="astra_mex_direct" - ProjectGUID="{85FE09A6-FA49-4314-A2B1-59D77C7442A8}" - RootNamespace="astraMatlab" - TargetFrameworkVersion="131072" - > - <Platforms> - <Platform - Name="Win32" - /> - <Platform - Name="x64" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug_CUDA|Win32" - OutputDirectory="$(SolutionDir)bin\$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(OutDir)\obj\$(ProjectName)" - ConfigurationType="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="$(MATLAB_ROOT)\extern\include\;"$(CUDA_INC_PATH)";..\..\lib\include;..\..\include" - PreprocessorDefinitions="ASTRA_CUDA;__SSE2__" - Optimization="0" - RuntimeLibrary="3" - EnableEnhancedInstructionSet="2" - OpenMP="true" - AdditionalOptions="/MP" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="AstraCuda32D.lib libmex.lib libmx.lib libut.lib" - OutputFile="$(OutDir)\$(ProjectName)_c.mexw32" - AdditionalLibraryDirectories="..\..\bin\win32;$(MATLAB_ROOT)\extern\lib\win32\microsoft;..\..\lib\win32" - ModuleDefinitionFile="mex.def" - GenerateDebugInformation="true" - TargetMachine="1" - /> - </Configuration> - <Configuration - Name="Debug_CUDA|x64" - OutputDirectory="$(SolutionDir)bin\$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(OutDir)\obj\$(ProjectName)" - ConfigurationType="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="$(MATLAB_ROOT)\extern\include\;"$(CUDA_INC_PATH)";..\..\lib\include;..\..\include" - PreprocessorDefinitions="ASTRA_CUDA;__SSE2__" - Optimization="0" - RuntimeLibrary="3" - OpenMP="true" - AdditionalOptions="/MP" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="AstraCuda64D.lib libmex.lib libmx.lib libut.lib" - OutputFile="$(OutDir)\$(ProjectName)_c.mexw64" - AdditionalLibraryDirectories="..\..\bin\x64;$(MATLAB_ROOT)\extern\lib\win64\microsoft;..\..\lib\x64" - ModuleDefinitionFile="mex.def" - GenerateDebugInformation="true" - TargetMachine="17" - /> - </Configuration> - <Configuration - Name="Debug|Win32" - OutputDirectory="$(SolutionDir)bin\$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(OutDir)\obj\$(ProjectName)" - ConfigurationType="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="$(MATLAB_ROOT)\extern\include\;..\..\lib\include;..\..\include" - PreprocessorDefinitions="__SSE2__" - Optimization="0" - RuntimeLibrary="3" - EnableEnhancedInstructionSet="2" - OpenMP="true" - AdditionalOptions="/MP" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="Astra32D.lib libmex.lib libmx.lib libut.lib" - OutputFile="$(OutDir)\$(ProjectName)_c.mexw32" - AdditionalLibraryDirectories="..\..\bin\win32;$(MATLAB_ROOT)\extern\lib\win32\microsoft;..\..\lib\win32" - ModuleDefinitionFile="mex.def" - GenerateDebugInformation="true" - TargetMachine="1" - /> - </Configuration> - <Configuration - Name="Debug|x64" - OutputDirectory="$(SolutionDir)bin\$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(OutDir)\obj\$(ProjectName)" - ConfigurationType="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="$(MATLAB_ROOT)\extern\include\;..\..\lib\include;..\..\include" - PreprocessorDefinitions="__SSE2__" - Optimization="0" - RuntimeLibrary="3" - OpenMP="true" - AdditionalOptions="/MP" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="Astra64D.lib libmex.lib libmx.lib libut.lib" - OutputFile="$(OutDir)\$(ProjectName)_c.mexw64" - AdditionalLibraryDirectories="..\..\bin\x64;$(MATLAB_ROOT)\extern\lib\win64\microsoft;..\..\lib\x64" - ModuleDefinitionFile="mex.def" - GenerateDebugInformation="true" - TargetMachine="17" - /> - </Configuration> - <Configuration - Name="Release_CUDA|Win32" - OutputDirectory="$(SolutionDir)bin\$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(OutDir)\obj\$(ProjectName)" - ConfigurationType="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="$(MATLAB_ROOT)\extern\include\;"$(CUDA_INC_PATH)";..\..\lib\include;..\..\include" - PreprocessorDefinitions="ASTRA_CUDA;__SSE2__" - Optimization="2" - RuntimeLibrary="2" - EnableEnhancedInstructionSet="2" - OpenMP="true" - AdditionalOptions="/MP" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="AstraCuda32.lib libmex.lib libmx.lib libut.lib" - OutputFile="$(OutDir)\$(ProjectName)_c.mexw32" - AdditionalLibraryDirectories="..\..\bin\win32;$(MATLAB_ROOT)\extern\lib\win32\microsoft;..\..\lib\win32" - ModuleDefinitionFile="mex.def" - GenerateDebugInformation="false" - TargetMachine="1" - /> - </Configuration> - <Configuration - Name="Release_CUDA|x64" - OutputDirectory="$(SolutionDir)bin\$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(OutDir)\obj\$(ProjectName)" - ConfigurationType="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="$(MATLAB_ROOT)\extern\include\;"$(CUDA_INC_PATH)";..\..\lib\include;..\..\include" - PreprocessorDefinitions="ASTRA_CUDA;__SSE2__" - Optimization="2" - RuntimeLibrary="2" - OpenMP="true" - AdditionalOptions="/MP" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="AstraCuda64.lib libmex.lib libmx.lib libut.lib" - OutputFile="$(OutDir)\$(ProjectName)_c.mexw64" - AdditionalLibraryDirectories="..\..\bin\x64;$(MATLAB_ROOT)\extern\lib\win64\microsoft;..\..\lib\x64" - ModuleDefinitionFile="mex.def" - GenerateDebugInformation="false" - TargetMachine="17" - /> - </Configuration> - <Configuration - Name="Release|Win32" - OutputDirectory="$(SolutionDir)bin\$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(OutDir)\obj\$(ProjectName)" - ConfigurationType="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="$(MATLAB_ROOT)\extern\include\;..\..\lib\include;..\..\include" - PreprocessorDefinitions="__SSE2__" - Optimization="2" - RuntimeLibrary="2" - EnableEnhancedInstructionSet="2" - OpenMP="true" - AdditionalOptions="/MP" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="Astra32.lib libmex.lib libmx.lib libut.lib" - OutputFile="$(OutDir)\$(ProjectName)_c.mexw32" - AdditionalLibraryDirectories="..\..\bin\win32;$(MATLAB_ROOT)\extern\lib\win32\microsoft;..\..\lib\win32" - ModuleDefinitionFile="mex.def" - GenerateDebugInformation="false" - TargetMachine="1" - /> - </Configuration> - <Configuration - Name="Release|x64" - OutputDirectory="$(SolutionDir)bin\$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(OutDir)\obj\$(ProjectName)" - ConfigurationType="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="$(MATLAB_ROOT)\extern\include\;..\..\lib\include;..\..\include" - PreprocessorDefinitions="__SSE2__" - Optimization="2" - RuntimeLibrary="2" - OpenMP="true" - AdditionalOptions="/MP" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="Astra64.lib libmex.lib libmx.lib libut.lib" - OutputFile="$(OutDir)\$(ProjectName)_c.mexw64" - AdditionalLibraryDirectories="..\..\bin\x64;$(MATLAB_ROOT)\extern\lib\win64\microsoft;..\..\lib\x64" - ModuleDefinitionFile="mex.def" - GenerateDebugInformation="false" - TargetMachine="17" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <File - RelativePath=".\astra_mex_direct_c.cpp" - > - </File> - <File - RelativePath=".\mexHelpFunctions.cpp" - > - </File> - <File - RelativePath=".\mexHelpFunctions.h" - > - </File> - <File - RelativePath=".\mexCopyDataHelpFunctions.cpp" - > - </File> - <File - RelativePath=".\mexCopyDataHelpFunctions.h" - > - </File> - <File - RelativePath=".\mexDataManagerHelpFunctions.cpp" - > - </File> - <File - RelativePath=".\mexDataManagerHelpFunctions.h" - > - </File> - <File - RelativePath=".\mexInitFunctions.cpp" - > - </File> - <File - RelativePath=".\mexInitFunctions.h" - > - </File> - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/matlab/mex/astra_mex_direct_vc11.vcxproj b/matlab/mex/astra_mex_direct_vc14.vcxproj index bc2db62..c17d49b 100644 --- a/matlab/mex/astra_mex_direct_vc11.vcxproj +++ b/matlab/mex/astra_mex_direct_vc14.vcxproj @@ -36,41 +36,41 @@ </ItemGroup> <PropertyGroup Label="Globals"> <ProjectName>astra_mex_direct</ProjectName> - <ProjectGuid>{0F68F4E2-BE1B-4A9A-B101-AECF4C069CC7}</ProjectGuid> + <ProjectGuid>{47460476-912B-4313-8B10-BDF1D60A84C4}</ProjectGuid> <RootNamespace>astraMatlab</RootNamespace> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_CUDA|Win32'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> - <PlatformToolset>v110</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_CUDA|x64'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> - <PlatformToolset>v110</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> - <PlatformToolset>v110</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> - <PlatformToolset>v110</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_CUDA|Win32'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> - <PlatformToolset>v110</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_CUDA|x64'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> - <PlatformToolset>v110</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> - <PlatformToolset>v110</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> - <PlatformToolset>v110</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> diff --git a/matlab/mex/astra_mex_file_vc11.vcxproj b/matlab/mex/astra_mex_file_vc11.vcxproj deleted file mode 100644 index 04925fe..0000000 --- a/matlab/mex/astra_mex_file_vc11.vcxproj +++ /dev/null @@ -1,289 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup Label="ProjectConfigurations"> - <ProjectConfiguration Include="Debug_CUDA|Win32"> - <Configuration>Debug_CUDA</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Debug_CUDA|x64"> - <Configuration>Debug_CUDA</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Debug|Win32"> - <Configuration>Debug</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Debug|x64"> - <Configuration>Debug</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release_CUDA|Win32"> - <Configuration>Release_CUDA</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release_CUDA|x64"> - <Configuration>Release_CUDA</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|Win32"> - <Configuration>Release</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|x64"> - <Configuration>Release</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - </ItemGroup> - <PropertyGroup Label="Globals"> - <ProjectName>astra_mex_file</ProjectName> - <ProjectGuid>{649115B5-795E-4FCB-BFFE-ED3F07288060}</ProjectGuid> - <RootNamespace>astraMatlab</RootNamespace> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> - <ConfigurationType>DynamicLibrary</ConfigurationType> - <PlatformToolset>v110</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_CUDA|Win32'" Label="Configuration"> - <ConfigurationType>DynamicLibrary</ConfigurationType> - <PlatformToolset>v110</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_CUDA|Win32'" Label="Configuration"> - <ConfigurationType>DynamicLibrary</ConfigurationType> - <PlatformToolset>v110</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> - <ConfigurationType>DynamicLibrary</ConfigurationType> - <PlatformToolset>v110</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> - <ConfigurationType>DynamicLibrary</ConfigurationType> - <PlatformToolset>v110</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_CUDA|x64'" Label="Configuration"> - <ConfigurationType>DynamicLibrary</ConfigurationType> - <PlatformToolset>v110</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_CUDA|x64'" Label="Configuration"> - <ConfigurationType>DynamicLibrary</ConfigurationType> - <PlatformToolset>v110</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> - <ConfigurationType>DynamicLibrary</ConfigurationType> - <PlatformToolset>v110</PlatformToolset> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> - <ImportGroup Label="ExtensionSettings"> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_CUDA|Win32'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_CUDA|Win32'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_CUDA|x64'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_CUDA|x64'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <PropertyGroup Label="UserMacros" /> - <PropertyGroup> - <_ProjectFileVersion>11.0.60610.1</_ProjectFileVersion> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <OutDir>$(SolutionDir)bin\$(Platform)\$(Configuration)\</OutDir> - <IntDir>$(OutDir)obj\$(ProjectName)\</IntDir> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <OutDir>$(SolutionDir)bin\$(Platform)\$(Configuration)\</OutDir> - <IntDir>$(OutDir)obj\$(ProjectName)\</IntDir> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_CUDA|Win32'"> - <OutDir>$(SolutionDir)bin\$(Platform)\$(Configuration)\</OutDir> - <IntDir>$(OutDir)obj\$(ProjectName)\</IntDir> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_CUDA|x64'"> - <OutDir>$(SolutionDir)bin\$(Platform)\$(Configuration)\</OutDir> - <IntDir>$(OutDir)obj\$(ProjectName)\</IntDir> - <TargetName>$(ProjectName)_c</TargetName> - <TargetExt>.mexw64</TargetExt> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_CUDA|Win32'"> - <OutDir>$(SolutionDir)bin\$(Platform)\$(Configuration)\</OutDir> - <IntDir>$(OutDir)obj\$(ProjectName)\</IntDir> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_CUDA|x64'"> - <OutDir>$(SolutionDir)bin\$(Platform)\$(Configuration)\</OutDir> - <IntDir>$(OutDir)obj\$(ProjectName)\</IntDir> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <OutDir>$(SolutionDir)bin\$(Platform)\$(Configuration)\</OutDir> - <IntDir>$(OutDir)obj\$(ProjectName)\</IntDir> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <OutDir>$(SolutionDir)bin\$(Platform)\$(Configuration)\</OutDir> - <IntDir>$(OutDir)obj\$(ProjectName)\</IntDir> - </PropertyGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <ClCompile> - <Optimization>MaxSpeed</Optimization> - <AdditionalIncludeDirectories>$(MATLAB_ROOT)\extern\include\;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> - <OpenMPSupport>true</OpenMPSupport> - </ClCompile> - <Link> - <AdditionalDependencies>Astra32.lib;libmex.lib;libmx.lib;%(AdditionalDependencies)</AdditionalDependencies> - <OutputFile>$(OutDir)$(ProjectName)_c.mexw32</OutputFile> - <AdditionalLibraryDirectories>..\..\bin\win32;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> - <ModuleDefinitionFile>mex.def</ModuleDefinitionFile> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <ClCompile> - <Optimization>MaxSpeed</Optimization> - <AdditionalIncludeDirectories>$(MATLAB_ROOT)\extern\include\;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> - <OpenMPSupport>true</OpenMPSupport> - </ClCompile> - <Link> - <AdditionalDependencies>Astra64.lib;libmex.lib;libmx.lib;%(AdditionalDependencies)</AdditionalDependencies> - <OutputFile>$(OutDir)$(ProjectName)_c.mexw64</OutputFile> - <AdditionalLibraryDirectories>..\..\bin\x64;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> - <ModuleDefinitionFile>mex.def</ModuleDefinitionFile> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_CUDA|Win32'"> - <ClCompile> - <Optimization>MaxSpeed</Optimization> - <AdditionalIncludeDirectories>$(MATLAB_ROOT)\extern\include\;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>ASTRA_CUDA;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> - <OpenMPSupport>true</OpenMPSupport> - </ClCompile> - <Link> - <AdditionalDependencies>AstraCuda32.lib;libmex.lib;libmx.lib;%(AdditionalDependencies)</AdditionalDependencies> - <OutputFile>$(OutDir)$(ProjectName)_c.mexw32</OutputFile> - <AdditionalLibraryDirectories>..\..\bin\win32;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> - <ModuleDefinitionFile>mex.def</ModuleDefinitionFile> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_CUDA|x64'"> - <ClCompile> - <Optimization>MaxSpeed</Optimization> - <AdditionalIncludeDirectories>$(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\lib\include\cuda;..\..\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>ASTRA_CUDA;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> - <OpenMPSupport>true</OpenMPSupport> - </ClCompile> - <Link> - <AdditionalDependencies>AstraCuda64.lib;libmex.lib;libmx.lib;%(AdditionalDependencies)</AdditionalDependencies> - <OutputFile>$(OutDir)$(ProjectName)_c.mexw64</OutputFile> - <AdditionalLibraryDirectories>..\..\bin\x64\Release_CUDA;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> - <ModuleDefinitionFile>mex.def</ModuleDefinitionFile> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_CUDA|Win32'"> - <ClCompile> - <Optimization>Disabled</Optimization> - <AdditionalIncludeDirectories>$(MATLAB_ROOT)\extern\include\;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>ASTRA_CUDA;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> - <OpenMPSupport>true</OpenMPSupport> - <DebugInformationFormat>EditAndContinue</DebugInformationFormat> - </ClCompile> - <Link> - <AdditionalDependencies>AstraCuda32D.lib;libmex.lib;libmx.lib;%(AdditionalDependencies)</AdditionalDependencies> - <OutputFile>$(OutDir)$(ProjectName)_c.mexw32</OutputFile> - <AdditionalLibraryDirectories>..\..\bin\win32;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> - <ModuleDefinitionFile>mex.def</ModuleDefinitionFile> - <GenerateDebugInformation>true</GenerateDebugInformation> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_CUDA|x64'"> - <Midl> - <TargetEnvironment>X64</TargetEnvironment> - </Midl> - <ClCompile> - <Optimization>Disabled</Optimization> - <AdditionalIncludeDirectories>$(CUDA_INC_PATH);$(MATLAB_ROOT)\extern\include\;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>ASTRA_CUDA;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> - <OpenMPSupport>true</OpenMPSupport> - <BrowseInformation>true</BrowseInformation> - <DebugInformationFormat>EditAndContinue</DebugInformationFormat> - </ClCompile> - <Link> - <AdditionalDependencies>AstraCuda64D.lib;libmex.lib;libmx.lib;%(AdditionalDependencies)</AdditionalDependencies> - <OutputFile>$(OutDir)$(ProjectName)_c.mexw64</OutputFile> - <AdditionalLibraryDirectories>..\..\bin\x64;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> - <ModuleDefinitionFile>mex.def</ModuleDefinitionFile> - <GenerateDebugInformation>true</GenerateDebugInformation> - <TargetMachine>MachineX64</TargetMachine> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <ClCompile> - <Optimization>Disabled</Optimization> - <AdditionalIncludeDirectories>$(MATLAB_ROOT)\extern\include\;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> - <OpenMPSupport>true</OpenMPSupport> - <DebugInformationFormat>EditAndContinue</DebugInformationFormat> - </ClCompile> - <Link> - <AdditionalDependencies>Astra32D.lib;libmex.lib;libmx.lib;%(AdditionalDependencies)</AdditionalDependencies> - <OutputFile>$(OutDir)$(ProjectName)_c.mexw32</OutputFile> - <AdditionalLibraryDirectories>..\..\bin\win32;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> - <ModuleDefinitionFile>mex.def</ModuleDefinitionFile> - <GenerateDebugInformation>true</GenerateDebugInformation> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <Midl> - <TargetEnvironment>X64</TargetEnvironment> - </Midl> - <ClCompile> - <Optimization>Disabled</Optimization> - <AdditionalIncludeDirectories>$(MATLAB_ROOT)\extern\include\;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> - <OpenMPSupport>true</OpenMPSupport> - </ClCompile> - <Link> - <AdditionalDependencies>Astra64D.lib;libmex.lib;libmx.lib;%(AdditionalDependencies)</AdditionalDependencies> - <OutputFile>$(OutDir)$(ProjectName)_c.mexw64</OutputFile> - <AdditionalLibraryDirectories>..\..\bin\x64;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> - <ModuleDefinitionFile>mex.def</ModuleDefinitionFile> - <TargetMachine>MachineX64</TargetMachine> - </Link> - </ItemDefinitionGroup> - <ItemGroup> - <ClCompile Include="astra_mex_file_c.cpp" /> - <ClCompile Include="mexHelpFunctions.cpp" /> - <ClCompile Include="mexCopyDataHelpFunctions.cpp"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_CUDA|x64'">true</ExcludedFromBuild> - </ClCompile> - <ClCompile Include="mexDataManagerHelpFunctions.cpp" /> - </ItemGroup> - <ItemGroup> - <ClInclude Include="mexHelpFunctions.h" /> - <ClInclude Include="mexCopyDataHelpFunctions.h"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_CUDA|x64'">true</ExcludedFromBuild> - </ClInclude> - <ClInclude Include="mexDataManagerHelpFunctions.h" /> - </ItemGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <ImportGroup Label="ExtensionTargets"> - </ImportGroup> -</Project>
\ No newline at end of file diff --git a/matlab/mex/astra_mex_log_c.cpp b/matlab/mex/astra_mex_log_c.cpp index 905612c..18dc1d4 100644 --- a/matlab/mex/astra_mex_log_c.cpp +++ b/matlab/mex/astra_mex_log_c.cpp @@ -1,10 +1,10 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp - 2014-2015, CWI, Amsterdam +Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp + 2014-2016, CWI, Amsterdam Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/ This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ You should have received a copy of the GNU General Public License along with the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>. ----------------------------------------------------------------------- -$Id$ */ /** \file astra_mex_log_c.cpp diff --git a/matlab/mex/astra_mex_log_vc09.vcproj b/matlab/mex/astra_mex_log_vc09.vcproj deleted file mode 100644 index 0e0d469..0000000 --- a/matlab/mex/astra_mex_log_vc09.vcproj +++ /dev/null @@ -1,612 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="9.00" - Name="astra_mex_log" - ProjectGUID="{CA2840B3-DA68-41B5-AC57-F5DFD20ED8F8}" - RootNamespace="astraMatlab" - TargetFrameworkVersion="131072" - > - <Platforms> - <Platform - Name="Win32" - /> - <Platform - Name="x64" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug_CUDA|Win32" - OutputDirectory="$(SolutionDir)bin\$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(OutDir)\obj\$(ProjectName)" - ConfigurationType="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="$(MATLAB_ROOT)\extern\include\;"$(CUDA_INC_PATH)";..\..\lib\include;..\..\include" - PreprocessorDefinitions="ASTRA_CUDA;__SSE2__" - Optimization="0" - RuntimeLibrary="3" - EnableEnhancedInstructionSet="2" - OpenMP="true" - AdditionalOptions="/MP" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="AstraCuda32D.lib libmex.lib libmx.lib libut.lib" - OutputFile="$(OutDir)\$(ProjectName)_c.mexw32" - AdditionalLibraryDirectories="..\..\bin\win32;$(MATLAB_ROOT)\extern\lib\win32\microsoft;..\..\lib\win32" - ModuleDefinitionFile="mex.def" - GenerateDebugInformation="true" - TargetMachine="1" - /> - </Configuration> - <Configuration - Name="Debug_CUDA|x64" - OutputDirectory="$(SolutionDir)bin\$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(OutDir)\obj\$(ProjectName)" - ConfigurationType="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="$(MATLAB_ROOT)\extern\include\;"$(CUDA_INC_PATH)";..\..\lib\include;..\..\include" - PreprocessorDefinitions="ASTRA_CUDA;__SSE2__" - Optimization="0" - RuntimeLibrary="3" - OpenMP="true" - AdditionalOptions="/MP" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="AstraCuda64D.lib libmex.lib libmx.lib libut.lib" - OutputFile="$(OutDir)\$(ProjectName)_c.mexw64" - AdditionalLibraryDirectories="..\..\bin\x64;$(MATLAB_ROOT)\extern\lib\win64\microsoft;..\..\lib\x64" - ModuleDefinitionFile="mex.def" - GenerateDebugInformation="true" - TargetMachine="17" - /> - </Configuration> - <Configuration - Name="Debug|Win32" - OutputDirectory="$(SolutionDir)bin\$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(OutDir)\obj\$(ProjectName)" - ConfigurationType="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="$(MATLAB_ROOT)\extern\include\;..\..\lib\include;..\..\include" - PreprocessorDefinitions="__SSE2__" - Optimization="0" - RuntimeLibrary="3" - EnableEnhancedInstructionSet="2" - OpenMP="true" - AdditionalOptions="/MP" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="Astra32D.lib libmex.lib libmx.lib libut.lib" - OutputFile="$(OutDir)\$(ProjectName)_c.mexw32" - AdditionalLibraryDirectories="..\..\bin\win32;$(MATLAB_ROOT)\extern\lib\win32\microsoft;..\..\lib\win32" - ModuleDefinitionFile="mex.def" - GenerateDebugInformation="true" - TargetMachine="1" - /> - </Configuration> - <Configuration - Name="Debug|x64" - OutputDirectory="$(SolutionDir)bin\$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(OutDir)\obj\$(ProjectName)" - ConfigurationType="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="$(MATLAB_ROOT)\extern\include\;..\..\lib\include;..\..\include" - PreprocessorDefinitions="__SSE2__" - Optimization="0" - RuntimeLibrary="3" - OpenMP="true" - AdditionalOptions="/MP" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="Astra64D.lib libmex.lib libmx.lib libut.lib" - OutputFile="$(OutDir)\$(ProjectName)_c.mexw64" - AdditionalLibraryDirectories="..\..\bin\x64;$(MATLAB_ROOT)\extern\lib\win64\microsoft;..\..\lib\x64" - ModuleDefinitionFile="mex.def" - GenerateDebugInformation="true" - TargetMachine="17" - /> - </Configuration> - <Configuration - Name="Release_CUDA|Win32" - OutputDirectory="$(SolutionDir)bin\$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(OutDir)\obj\$(ProjectName)" - ConfigurationType="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="$(MATLAB_ROOT)\extern\include\;"$(CUDA_INC_PATH)";..\..\lib\include;..\..\include" - PreprocessorDefinitions="ASTRA_CUDA;__SSE2__" - Optimization="2" - RuntimeLibrary="2" - EnableEnhancedInstructionSet="2" - OpenMP="true" - AdditionalOptions="/MP" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="AstraCuda32.lib libmex.lib libmx.lib libut.lib" - OutputFile="$(OutDir)\$(ProjectName)_c.mexw32" - AdditionalLibraryDirectories="..\..\bin\win32;$(MATLAB_ROOT)\extern\lib\win32\microsoft;..\..\lib\win32" - ModuleDefinitionFile="mex.def" - GenerateDebugInformation="false" - TargetMachine="1" - /> - </Configuration> - <Configuration - Name="Release_CUDA|x64" - OutputDirectory="$(SolutionDir)bin\$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(OutDir)\obj\$(ProjectName)" - ConfigurationType="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="$(MATLAB_ROOT)\extern\include\;"$(CUDA_INC_PATH)";..\..\lib\include;..\..\include" - PreprocessorDefinitions="ASTRA_CUDA;__SSE2__" - Optimization="2" - RuntimeLibrary="2" - OpenMP="true" - AdditionalOptions="/MP" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="AstraCuda64.lib libmex.lib libmx.lib libut.lib" - OutputFile="$(OutDir)\$(ProjectName)_c.mexw64" - AdditionalLibraryDirectories="..\..\bin\x64;$(MATLAB_ROOT)\extern\lib\win64\microsoft;..\..\lib\x64" - ModuleDefinitionFile="mex.def" - GenerateDebugInformation="false" - TargetMachine="17" - /> - </Configuration> - <Configuration - Name="Release|Win32" - OutputDirectory="$(SolutionDir)bin\$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(OutDir)\obj\$(ProjectName)" - ConfigurationType="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="$(MATLAB_ROOT)\extern\include\;..\..\lib\include;..\..\include" - PreprocessorDefinitions="__SSE2__" - Optimization="2" - RuntimeLibrary="2" - EnableEnhancedInstructionSet="2" - OpenMP="true" - AdditionalOptions="/MP" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="Astra32.lib libmex.lib libmx.lib libut.lib" - OutputFile="$(OutDir)\$(ProjectName)_c.mexw32" - AdditionalLibraryDirectories="..\..\bin\win32;$(MATLAB_ROOT)\extern\lib\win32\microsoft;..\..\lib\win32" - ModuleDefinitionFile="mex.def" - GenerateDebugInformation="false" - TargetMachine="1" - /> - </Configuration> - <Configuration - Name="Release|x64" - OutputDirectory="$(SolutionDir)bin\$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(OutDir)\obj\$(ProjectName)" - ConfigurationType="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="$(MATLAB_ROOT)\extern\include\;..\..\lib\include;..\..\include" - PreprocessorDefinitions="__SSE2__" - Optimization="2" - RuntimeLibrary="2" - OpenMP="true" - AdditionalOptions="/MP" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="Astra64.lib libmex.lib libmx.lib libut.lib" - OutputFile="$(OutDir)\$(ProjectName)_c.mexw64" - AdditionalLibraryDirectories="..\..\bin\x64;$(MATLAB_ROOT)\extern\lib\win64\microsoft;..\..\lib\x64" - ModuleDefinitionFile="mex.def" - GenerateDebugInformation="false" - TargetMachine="17" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <File - RelativePath=".\astra_mex_log_c.cpp" - > - </File> - <File - RelativePath=".\mexHelpFunctions.cpp" - > - </File> - <File - RelativePath=".\mexHelpFunctions.h" - > - </File> - <File - RelativePath=".\mexInitFunctions.cpp" - > - </File> - <File - RelativePath=".\mexInitFunctions.h" - > - </File> - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/matlab/mex/astra_mex_log_vc11.vcxproj b/matlab/mex/astra_mex_log_vc14.vcxproj index 0a939cf..bb7ccb6 100644 --- a/matlab/mex/astra_mex_log_vc11.vcxproj +++ b/matlab/mex/astra_mex_log_vc14.vcxproj @@ -36,41 +36,41 @@ </ItemGroup> <PropertyGroup Label="Globals"> <ProjectName>astra_mex_log</ProjectName> - <ProjectGuid>{03B833F5-4FD6-4FBE-AAF4-E3305CD56D2E}</ProjectGuid> + <ProjectGuid>{88539382-66DB-4BBC-A48E-8B6B3CA6064F}</ProjectGuid> <RootNamespace>astraMatlab</RootNamespace> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_CUDA|Win32'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> - <PlatformToolset>v110</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_CUDA|x64'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> - <PlatformToolset>v110</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> - <PlatformToolset>v110</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> - <PlatformToolset>v110</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_CUDA|Win32'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> - <PlatformToolset>v110</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_CUDA|x64'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> - <PlatformToolset>v110</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> - <PlatformToolset>v110</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> - <PlatformToolset>v110</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> diff --git a/matlab/mex/astra_mex_matrix_c.cpp b/matlab/mex/astra_mex_matrix_c.cpp index e07ddb6..99a7d0e 100644 --- a/matlab/mex/astra_mex_matrix_c.cpp +++ b/matlab/mex/astra_mex_matrix_c.cpp @@ -1,10 +1,10 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp - 2014-2015, CWI, Amsterdam +Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp + 2014-2016, CWI, Amsterdam Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/ This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ You should have received a copy of the GNU General Public License along with the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>. ----------------------------------------------------------------------- -$Id$ */ /** \file astra_mex_matrix_c.cpp diff --git a/matlab/mex/astra_mex_matrix_vc09.vcproj b/matlab/mex/astra_mex_matrix_vc09.vcproj deleted file mode 100644 index 3aa17a5..0000000 --- a/matlab/mex/astra_mex_matrix_vc09.vcproj +++ /dev/null @@ -1,612 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="9.00" - Name="astra_mex_matrix" - ProjectGUID="{9D041710-2119-4230-BCF2-5FBE753FDE49}" - RootNamespace="astraMatlab" - TargetFrameworkVersion="131072" - > - <Platforms> - <Platform - Name="Win32" - /> - <Platform - Name="x64" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug_CUDA|Win32" - OutputDirectory="$(SolutionDir)bin\$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(OutDir)\obj\$(ProjectName)" - ConfigurationType="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="$(MATLAB_ROOT)\extern\include\;"$(CUDA_INC_PATH)";..\..\lib\include;..\..\include" - PreprocessorDefinitions="ASTRA_CUDA;__SSE2__" - Optimization="0" - RuntimeLibrary="3" - EnableEnhancedInstructionSet="2" - OpenMP="true" - AdditionalOptions="/MP" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="AstraCuda32D.lib libmex.lib libmx.lib libut.lib" - OutputFile="$(OutDir)\$(ProjectName)_c.mexw32" - AdditionalLibraryDirectories="..\..\bin\win32;$(MATLAB_ROOT)\extern\lib\win32\microsoft;..\..\lib\win32" - ModuleDefinitionFile="mex.def" - GenerateDebugInformation="true" - TargetMachine="1" - /> - </Configuration> - <Configuration - Name="Debug_CUDA|x64" - OutputDirectory="$(SolutionDir)bin\$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(OutDir)\obj\$(ProjectName)" - ConfigurationType="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="$(MATLAB_ROOT)\extern\include\;"$(CUDA_INC_PATH)";..\..\lib\include;..\..\include" - PreprocessorDefinitions="ASTRA_CUDA;__SSE2__" - Optimization="0" - RuntimeLibrary="3" - OpenMP="true" - AdditionalOptions="/MP" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="AstraCuda64D.lib libmex.lib libmx.lib libut.lib" - OutputFile="$(OutDir)\$(ProjectName)_c.mexw64" - AdditionalLibraryDirectories="..\..\bin\x64;$(MATLAB_ROOT)\extern\lib\win64\microsoft;..\..\lib\x64" - ModuleDefinitionFile="mex.def" - GenerateDebugInformation="true" - TargetMachine="17" - /> - </Configuration> - <Configuration - Name="Debug|Win32" - OutputDirectory="$(SolutionDir)bin\$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(OutDir)\obj\$(ProjectName)" - ConfigurationType="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="$(MATLAB_ROOT)\extern\include\;..\..\lib\include;..\..\include" - PreprocessorDefinitions="__SSE2__" - Optimization="0" - RuntimeLibrary="3" - EnableEnhancedInstructionSet="2" - OpenMP="true" - AdditionalOptions="/MP" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="Astra32D.lib libmex.lib libmx.lib libut.lib" - OutputFile="$(OutDir)\$(ProjectName)_c.mexw32" - AdditionalLibraryDirectories="..\..\bin\win32;$(MATLAB_ROOT)\extern\lib\win32\microsoft;..\..\lib\win32" - ModuleDefinitionFile="mex.def" - GenerateDebugInformation="true" - TargetMachine="1" - /> - </Configuration> - <Configuration - Name="Debug|x64" - OutputDirectory="$(SolutionDir)bin\$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(OutDir)\obj\$(ProjectName)" - ConfigurationType="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="$(MATLAB_ROOT)\extern\include\;..\..\lib\include;..\..\include" - PreprocessorDefinitions="__SSE2__" - Optimization="0" - RuntimeLibrary="3" - OpenMP="true" - AdditionalOptions="/MP" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="Astra64D.lib libmex.lib libmx.lib libut.lib" - OutputFile="$(OutDir)\$(ProjectName)_c.mexw64" - AdditionalLibraryDirectories="..\..\bin\x64;$(MATLAB_ROOT)\extern\lib\win64\microsoft;..\..\lib\x64" - ModuleDefinitionFile="mex.def" - GenerateDebugInformation="true" - TargetMachine="17" - /> - </Configuration> - <Configuration - Name="Release_CUDA|Win32" - OutputDirectory="$(SolutionDir)bin\$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(OutDir)\obj\$(ProjectName)" - ConfigurationType="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="$(MATLAB_ROOT)\extern\include\;"$(CUDA_INC_PATH)";..\..\lib\include;..\..\include" - PreprocessorDefinitions="ASTRA_CUDA;__SSE2__" - Optimization="2" - RuntimeLibrary="2" - EnableEnhancedInstructionSet="2" - OpenMP="true" - AdditionalOptions="/MP" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="AstraCuda32.lib libmex.lib libmx.lib libut.lib" - OutputFile="$(OutDir)\$(ProjectName)_c.mexw32" - AdditionalLibraryDirectories="..\..\bin\win32;$(MATLAB_ROOT)\extern\lib\win32\microsoft;..\..\lib\win32" - ModuleDefinitionFile="mex.def" - GenerateDebugInformation="false" - TargetMachine="1" - /> - </Configuration> - <Configuration - Name="Release_CUDA|x64" - OutputDirectory="$(SolutionDir)bin\$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(OutDir)\obj\$(ProjectName)" - ConfigurationType="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="$(MATLAB_ROOT)\extern\include\;"$(CUDA_INC_PATH)";..\..\lib\include;..\..\include" - PreprocessorDefinitions="ASTRA_CUDA;__SSE2__" - Optimization="2" - RuntimeLibrary="2" - OpenMP="true" - AdditionalOptions="/MP" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="AstraCuda64.lib libmex.lib libmx.lib libut.lib" - OutputFile="$(OutDir)\$(ProjectName)_c.mexw64" - AdditionalLibraryDirectories="..\..\bin\x64;$(MATLAB_ROOT)\extern\lib\win64\microsoft;..\..\lib\x64" - ModuleDefinitionFile="mex.def" - GenerateDebugInformation="false" - TargetMachine="17" - /> - </Configuration> - <Configuration - Name="Release|Win32" - OutputDirectory="$(SolutionDir)bin\$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(OutDir)\obj\$(ProjectName)" - ConfigurationType="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="$(MATLAB_ROOT)\extern\include\;..\..\lib\include;..\..\include" - PreprocessorDefinitions="__SSE2__" - Optimization="2" - RuntimeLibrary="2" - EnableEnhancedInstructionSet="2" - OpenMP="true" - AdditionalOptions="/MP" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="Astra32.lib libmex.lib libmx.lib libut.lib" - OutputFile="$(OutDir)\$(ProjectName)_c.mexw32" - AdditionalLibraryDirectories="..\..\bin\win32;$(MATLAB_ROOT)\extern\lib\win32\microsoft;..\..\lib\win32" - ModuleDefinitionFile="mex.def" - GenerateDebugInformation="false" - TargetMachine="1" - /> - </Configuration> - <Configuration - Name="Release|x64" - OutputDirectory="$(SolutionDir)bin\$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(OutDir)\obj\$(ProjectName)" - ConfigurationType="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="$(MATLAB_ROOT)\extern\include\;..\..\lib\include;..\..\include" - PreprocessorDefinitions="__SSE2__" - Optimization="2" - RuntimeLibrary="2" - OpenMP="true" - AdditionalOptions="/MP" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="Astra64.lib libmex.lib libmx.lib libut.lib" - OutputFile="$(OutDir)\$(ProjectName)_c.mexw64" - AdditionalLibraryDirectories="..\..\bin\x64;$(MATLAB_ROOT)\extern\lib\win64\microsoft;..\..\lib\x64" - ModuleDefinitionFile="mex.def" - GenerateDebugInformation="false" - TargetMachine="17" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <File - RelativePath=".\astra_mex_matrix_c.cpp" - > - </File> - <File - RelativePath=".\mexHelpFunctions.cpp" - > - </File> - <File - RelativePath=".\mexHelpFunctions.h" - > - </File> - <File - RelativePath=".\mexInitFunctions.cpp" - > - </File> - <File - RelativePath=".\mexInitFunctions.h" - > - </File> - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/matlab/mex/astra_mex_matrix_vc11.vcxproj b/matlab/mex/astra_mex_matrix_vc14.vcxproj index abf86a7..389e516 100644 --- a/matlab/mex/astra_mex_matrix_vc11.vcxproj +++ b/matlab/mex/astra_mex_matrix_vc14.vcxproj @@ -36,41 +36,41 @@ </ItemGroup> <PropertyGroup Label="Globals"> <ProjectName>astra_mex_matrix</ProjectName> - <ProjectGuid>{9D041710-2119-4230-BCF2-5FBE753FDE49}</ProjectGuid> + <ProjectGuid>{6BFA8857-37EB-4E43-A97C-B860E21599F5}</ProjectGuid> <RootNamespace>astraMatlab</RootNamespace> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_CUDA|Win32'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> - <PlatformToolset>v110</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_CUDA|x64'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> - <PlatformToolset>v110</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> - <PlatformToolset>v110</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> - <PlatformToolset>v110</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_CUDA|Win32'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> - <PlatformToolset>v110</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_CUDA|x64'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> - <PlatformToolset>v110</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> - <PlatformToolset>v110</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> - <PlatformToolset>v110</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> diff --git a/matlab/mex/astra_mex_plugin_c.cpp b/matlab/mex/astra_mex_plugin_c.cpp index 4ed534e..570e495 100644 --- a/matlab/mex/astra_mex_plugin_c.cpp +++ b/matlab/mex/astra_mex_plugin_c.cpp @@ -1,10 +1,10 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp - 2014-2015, CWI, Amsterdam +Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp + 2014-2016, CWI, Amsterdam Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/ This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ You should have received a copy of the GNU General Public License along with the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>. ----------------------------------------------------------------------- -$Id$ */ /** \file astra_mex_plugin_c.cpp diff --git a/matlab/mex/astra_mex_projector3d_c.cpp b/matlab/mex/astra_mex_projector3d_c.cpp index e25802c..3135939 100644 --- a/matlab/mex/astra_mex_projector3d_c.cpp +++ b/matlab/mex/astra_mex_projector3d_c.cpp @@ -1,10 +1,10 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp - 2014-2015, CWI, Amsterdam +Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp + 2014-2016, CWI, Amsterdam Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/ This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ You should have received a copy of the GNU General Public License along with the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>. ----------------------------------------------------------------------- -$Id$ */ /** \file astra_mex_projector3d_c.cpp diff --git a/matlab/mex/astra_mex_projector3d_vc09.vcproj b/matlab/mex/astra_mex_projector3d_vc09.vcproj deleted file mode 100644 index b9464a2..0000000 --- a/matlab/mex/astra_mex_projector3d_vc09.vcproj +++ /dev/null @@ -1,612 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="9.00" - Name="astra_mex_projector3d" - ProjectGUID="{F94CCD79-AA11-42DF-AC8A-6C9D2238A883}" - RootNamespace="astraMatlab" - TargetFrameworkVersion="131072" - > - <Platforms> - <Platform - Name="Win32" - /> - <Platform - Name="x64" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug_CUDA|Win32" - OutputDirectory="$(SolutionDir)bin\$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(OutDir)\obj\$(ProjectName)" - ConfigurationType="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="$(MATLAB_ROOT)\extern\include\;"$(CUDA_INC_PATH)";..\..\lib\include;..\..\include" - PreprocessorDefinitions="ASTRA_CUDA;__SSE2__" - Optimization="0" - RuntimeLibrary="3" - EnableEnhancedInstructionSet="2" - OpenMP="true" - AdditionalOptions="/MP" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="AstraCuda32D.lib libmex.lib libmx.lib libut.lib" - OutputFile="$(OutDir)\$(ProjectName)_c.mexw32" - AdditionalLibraryDirectories="..\..\bin\win32;$(MATLAB_ROOT)\extern\lib\win32\microsoft;..\..\lib\win32" - ModuleDefinitionFile="mex.def" - GenerateDebugInformation="true" - TargetMachine="1" - /> - </Configuration> - <Configuration - Name="Debug_CUDA|x64" - OutputDirectory="$(SolutionDir)bin\$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(OutDir)\obj\$(ProjectName)" - ConfigurationType="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="$(MATLAB_ROOT)\extern\include\;"$(CUDA_INC_PATH)";..\..\lib\include;..\..\include" - PreprocessorDefinitions="ASTRA_CUDA;__SSE2__" - Optimization="0" - RuntimeLibrary="3" - OpenMP="true" - AdditionalOptions="/MP" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="AstraCuda64D.lib libmex.lib libmx.lib libut.lib" - OutputFile="$(OutDir)\$(ProjectName)_c.mexw64" - AdditionalLibraryDirectories="..\..\bin\x64;$(MATLAB_ROOT)\extern\lib\win64\microsoft;..\..\lib\x64" - ModuleDefinitionFile="mex.def" - GenerateDebugInformation="true" - TargetMachine="17" - /> - </Configuration> - <Configuration - Name="Debug|Win32" - OutputDirectory="$(SolutionDir)bin\$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(OutDir)\obj\$(ProjectName)" - ConfigurationType="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="$(MATLAB_ROOT)\extern\include\;..\..\lib\include;..\..\include" - PreprocessorDefinitions="__SSE2__" - Optimization="0" - RuntimeLibrary="3" - EnableEnhancedInstructionSet="2" - OpenMP="true" - AdditionalOptions="/MP" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="Astra32D.lib libmex.lib libmx.lib libut.lib" - OutputFile="$(OutDir)\$(ProjectName)_c.mexw32" - AdditionalLibraryDirectories="..\..\bin\win32;$(MATLAB_ROOT)\extern\lib\win32\microsoft;..\..\lib\win32" - ModuleDefinitionFile="mex.def" - GenerateDebugInformation="true" - TargetMachine="1" - /> - </Configuration> - <Configuration - Name="Debug|x64" - OutputDirectory="$(SolutionDir)bin\$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(OutDir)\obj\$(ProjectName)" - ConfigurationType="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="$(MATLAB_ROOT)\extern\include\;..\..\lib\include;..\..\include" - PreprocessorDefinitions="__SSE2__" - Optimization="0" - RuntimeLibrary="3" - OpenMP="true" - AdditionalOptions="/MP" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="Astra64D.lib libmex.lib libmx.lib libut.lib" - OutputFile="$(OutDir)\$(ProjectName)_c.mexw64" - AdditionalLibraryDirectories="..\..\bin\x64;$(MATLAB_ROOT)\extern\lib\win64\microsoft;..\..\lib\x64" - ModuleDefinitionFile="mex.def" - GenerateDebugInformation="true" - TargetMachine="17" - /> - </Configuration> - <Configuration - Name="Release_CUDA|Win32" - OutputDirectory="$(SolutionDir)bin\$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(OutDir)\obj\$(ProjectName)" - ConfigurationType="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="$(MATLAB_ROOT)\extern\include\;"$(CUDA_INC_PATH)";..\..\lib\include;..\..\include" - PreprocessorDefinitions="ASTRA_CUDA;__SSE2__" - Optimization="2" - RuntimeLibrary="2" - EnableEnhancedInstructionSet="2" - OpenMP="true" - AdditionalOptions="/MP" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="AstraCuda32.lib libmex.lib libmx.lib libut.lib" - OutputFile="$(OutDir)\$(ProjectName)_c.mexw32" - AdditionalLibraryDirectories="..\..\bin\win32;$(MATLAB_ROOT)\extern\lib\win32\microsoft;..\..\lib\win32" - ModuleDefinitionFile="mex.def" - GenerateDebugInformation="false" - TargetMachine="1" - /> - </Configuration> - <Configuration - Name="Release_CUDA|x64" - OutputDirectory="$(SolutionDir)bin\$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(OutDir)\obj\$(ProjectName)" - ConfigurationType="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="$(MATLAB_ROOT)\extern\include\;"$(CUDA_INC_PATH)";..\..\lib\include;..\..\include" - PreprocessorDefinitions="ASTRA_CUDA;__SSE2__" - Optimization="2" - RuntimeLibrary="2" - OpenMP="true" - AdditionalOptions="/MP" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="AstraCuda64.lib libmex.lib libmx.lib libut.lib" - OutputFile="$(OutDir)\$(ProjectName)_c.mexw64" - AdditionalLibraryDirectories="..\..\bin\x64;$(MATLAB_ROOT)\extern\lib\win64\microsoft;..\..\lib\x64" - ModuleDefinitionFile="mex.def" - GenerateDebugInformation="false" - TargetMachine="17" - /> - </Configuration> - <Configuration - Name="Release|Win32" - OutputDirectory="$(SolutionDir)bin\$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(OutDir)\obj\$(ProjectName)" - ConfigurationType="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="$(MATLAB_ROOT)\extern\include\;..\..\lib\include;..\..\include" - PreprocessorDefinitions="__SSE2__" - Optimization="2" - RuntimeLibrary="2" - EnableEnhancedInstructionSet="2" - OpenMP="true" - AdditionalOptions="/MP" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="Astra32.lib libmex.lib libmx.lib libut.lib" - OutputFile="$(OutDir)\$(ProjectName)_c.mexw32" - AdditionalLibraryDirectories="..\..\bin\win32;$(MATLAB_ROOT)\extern\lib\win32\microsoft;..\..\lib\win32" - ModuleDefinitionFile="mex.def" - GenerateDebugInformation="false" - TargetMachine="1" - /> - </Configuration> - <Configuration - Name="Release|x64" - OutputDirectory="$(SolutionDir)bin\$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(OutDir)\obj\$(ProjectName)" - ConfigurationType="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="$(MATLAB_ROOT)\extern\include\;..\..\lib\include;..\..\include" - PreprocessorDefinitions="__SSE2__" - Optimization="2" - RuntimeLibrary="2" - OpenMP="true" - AdditionalOptions="/MP" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="Astra64.lib libmex.lib libmx.lib libut.lib" - OutputFile="$(OutDir)\$(ProjectName)_c.mexw64" - AdditionalLibraryDirectories="..\..\bin\x64;$(MATLAB_ROOT)\extern\lib\win64\microsoft;..\..\lib\x64" - ModuleDefinitionFile="mex.def" - GenerateDebugInformation="false" - TargetMachine="17" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <File - RelativePath=".\astra_mex_projector3d_c.cpp" - > - </File> - <File - RelativePath=".\mexHelpFunctions.cpp" - > - </File> - <File - RelativePath=".\mexHelpFunctions.h" - > - </File> - <File - RelativePath=".\mexInitFunctions.cpp" - > - </File> - <File - RelativePath=".\mexInitFunctions.h" - > - </File> - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/matlab/mex/astra_mex_projector3d_vc11.vcxproj b/matlab/mex/astra_mex_projector3d_vc14.vcxproj index 42eb0f1..5c56221 100644 --- a/matlab/mex/astra_mex_projector3d_vc11.vcxproj +++ b/matlab/mex/astra_mex_projector3d_vc14.vcxproj @@ -36,41 +36,41 @@ </ItemGroup> <PropertyGroup Label="Globals"> <ProjectName>astra_mex_projector3d</ProjectName> - <ProjectGuid>{F94CCD79-AA11-42DF-AC8A-6C9D2238A883}</ProjectGuid> + <ProjectGuid>{CA85BDA0-9BDD-495E-B200-BFE863EB6318}</ProjectGuid> <RootNamespace>astraMatlab</RootNamespace> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_CUDA|Win32'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> - <PlatformToolset>v110</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_CUDA|x64'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> - <PlatformToolset>v110</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> - <PlatformToolset>v110</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> - <PlatformToolset>v110</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_CUDA|Win32'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> - <PlatformToolset>v110</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_CUDA|x64'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> - <PlatformToolset>v110</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> - <PlatformToolset>v110</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> - <PlatformToolset>v110</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> diff --git a/matlab/mex/astra_mex_projector_c.cpp b/matlab/mex/astra_mex_projector_c.cpp index bf701af..36a5704 100644 --- a/matlab/mex/astra_mex_projector_c.cpp +++ b/matlab/mex/astra_mex_projector_c.cpp @@ -1,10 +1,10 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp - 2014-2015, CWI, Amsterdam +Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp + 2014-2016, CWI, Amsterdam Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/ This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ You should have received a copy of the GNU General Public License along with the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>. ----------------------------------------------------------------------- -$Id$ */ /** \file astra_mex_projector_c.cpp diff --git a/matlab/mex/astra_mex_projector_vc09.vcproj b/matlab/mex/astra_mex_projector_vc09.vcproj deleted file mode 100644 index 05c207f..0000000 --- a/matlab/mex/astra_mex_projector_vc09.vcproj +++ /dev/null @@ -1,612 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="9.00" - Name="astra_mex_projector" - ProjectGUID="{4DD6056F-8EEE-4C9A-B2A9-923F01A32E97}" - RootNamespace="astraMatlab" - TargetFrameworkVersion="131072" - > - <Platforms> - <Platform - Name="Win32" - /> - <Platform - Name="x64" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug_CUDA|Win32" - OutputDirectory="$(SolutionDir)bin\$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(OutDir)\obj\$(ProjectName)" - ConfigurationType="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="$(MATLAB_ROOT)\extern\include\;"$(CUDA_INC_PATH)";..\..\lib\include;..\..\include" - PreprocessorDefinitions="ASTRA_CUDA;__SSE2__" - Optimization="0" - RuntimeLibrary="3" - EnableEnhancedInstructionSet="2" - OpenMP="true" - AdditionalOptions="/MP" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="AstraCuda32D.lib libmex.lib libmx.lib libut.lib" - OutputFile="$(OutDir)\$(ProjectName)_c.mexw32" - AdditionalLibraryDirectories="..\..\bin\win32;$(MATLAB_ROOT)\extern\lib\win32\microsoft;..\..\lib\win32" - ModuleDefinitionFile="mex.def" - GenerateDebugInformation="true" - TargetMachine="1" - /> - </Configuration> - <Configuration - Name="Debug_CUDA|x64" - OutputDirectory="$(SolutionDir)bin\$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(OutDir)\obj\$(ProjectName)" - ConfigurationType="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="$(MATLAB_ROOT)\extern\include\;"$(CUDA_INC_PATH)";..\..\lib\include;..\..\include" - PreprocessorDefinitions="ASTRA_CUDA;__SSE2__" - Optimization="0" - RuntimeLibrary="3" - OpenMP="true" - AdditionalOptions="/MP" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="AstraCuda64D.lib libmex.lib libmx.lib libut.lib" - OutputFile="$(OutDir)\$(ProjectName)_c.mexw64" - AdditionalLibraryDirectories="..\..\bin\x64;$(MATLAB_ROOT)\extern\lib\win64\microsoft;..\..\lib\x64" - ModuleDefinitionFile="mex.def" - GenerateDebugInformation="true" - TargetMachine="17" - /> - </Configuration> - <Configuration - Name="Debug|Win32" - OutputDirectory="$(SolutionDir)bin\$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(OutDir)\obj\$(ProjectName)" - ConfigurationType="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="$(MATLAB_ROOT)\extern\include\;..\..\lib\include;..\..\include" - PreprocessorDefinitions="__SSE2__" - Optimization="0" - RuntimeLibrary="3" - EnableEnhancedInstructionSet="2" - OpenMP="true" - AdditionalOptions="/MP" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="Astra32D.lib libmex.lib libmx.lib libut.lib" - OutputFile="$(OutDir)\$(ProjectName)_c.mexw32" - AdditionalLibraryDirectories="..\..\bin\win32;$(MATLAB_ROOT)\extern\lib\win32\microsoft;..\..\lib\win32" - ModuleDefinitionFile="mex.def" - GenerateDebugInformation="true" - TargetMachine="1" - /> - </Configuration> - <Configuration - Name="Debug|x64" - OutputDirectory="$(SolutionDir)bin\$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(OutDir)\obj\$(ProjectName)" - ConfigurationType="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="$(MATLAB_ROOT)\extern\include\;..\..\lib\include;..\..\include" - PreprocessorDefinitions="__SSE2__" - Optimization="0" - RuntimeLibrary="3" - OpenMP="true" - AdditionalOptions="/MP" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="Astra64D.lib libmex.lib libmx.lib libut.lib" - OutputFile="$(OutDir)\$(ProjectName)_c.mexw64" - AdditionalLibraryDirectories="..\..\bin\x64;$(MATLAB_ROOT)\extern\lib\win64\microsoft;..\..\lib\x64" - ModuleDefinitionFile="mex.def" - GenerateDebugInformation="true" - TargetMachine="17" - /> - </Configuration> - <Configuration - Name="Release_CUDA|Win32" - OutputDirectory="$(SolutionDir)bin\$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(OutDir)\obj\$(ProjectName)" - ConfigurationType="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="$(MATLAB_ROOT)\extern\include\;"$(CUDA_INC_PATH)";..\..\lib\include;..\..\include" - PreprocessorDefinitions="ASTRA_CUDA;__SSE2__" - Optimization="2" - RuntimeLibrary="2" - EnableEnhancedInstructionSet="2" - OpenMP="true" - AdditionalOptions="/MP" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="AstraCuda32.lib libmex.lib libmx.lib libut.lib" - OutputFile="$(OutDir)\$(ProjectName)_c.mexw32" - AdditionalLibraryDirectories="..\..\bin\win32;$(MATLAB_ROOT)\extern\lib\win32\microsoft;..\..\lib\win32" - ModuleDefinitionFile="mex.def" - GenerateDebugInformation="false" - TargetMachine="1" - /> - </Configuration> - <Configuration - Name="Release_CUDA|x64" - OutputDirectory="$(SolutionDir)bin\$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(OutDir)\obj\$(ProjectName)" - ConfigurationType="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="$(MATLAB_ROOT)\extern\include\;"$(CUDA_INC_PATH)";..\..\lib\include;..\..\include" - PreprocessorDefinitions="ASTRA_CUDA;__SSE2__" - Optimization="2" - RuntimeLibrary="2" - OpenMP="true" - AdditionalOptions="/MP" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="AstraCuda64.lib libmex.lib libmx.lib libut.lib" - OutputFile="$(OutDir)\$(ProjectName)_c.mexw64" - AdditionalLibraryDirectories="..\..\bin\x64;$(MATLAB_ROOT)\extern\lib\win64\microsoft;..\..\lib\x64" - ModuleDefinitionFile="mex.def" - GenerateDebugInformation="false" - TargetMachine="17" - /> - </Configuration> - <Configuration - Name="Release|Win32" - OutputDirectory="$(SolutionDir)bin\$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(OutDir)\obj\$(ProjectName)" - ConfigurationType="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="$(MATLAB_ROOT)\extern\include\;..\..\lib\include;..\..\include" - PreprocessorDefinitions="__SSE2__" - Optimization="2" - RuntimeLibrary="2" - EnableEnhancedInstructionSet="2" - OpenMP="true" - AdditionalOptions="/MP" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="Astra32.lib libmex.lib libmx.lib libut.lib" - OutputFile="$(OutDir)\$(ProjectName)_c.mexw32" - AdditionalLibraryDirectories="..\..\bin\win32;$(MATLAB_ROOT)\extern\lib\win32\microsoft;..\..\lib\win32" - ModuleDefinitionFile="mex.def" - GenerateDebugInformation="false" - TargetMachine="1" - /> - </Configuration> - <Configuration - Name="Release|x64" - OutputDirectory="$(SolutionDir)bin\$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(OutDir)\obj\$(ProjectName)" - ConfigurationType="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="$(MATLAB_ROOT)\extern\include\;..\..\lib\include;..\..\include" - PreprocessorDefinitions="__SSE2__" - Optimization="2" - RuntimeLibrary="2" - OpenMP="true" - AdditionalOptions="/MP" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="Astra64.lib libmex.lib libmx.lib libut.lib" - OutputFile="$(OutDir)\$(ProjectName)_c.mexw64" - AdditionalLibraryDirectories="..\..\bin\x64;$(MATLAB_ROOT)\extern\lib\win64\microsoft;..\..\lib\x64" - ModuleDefinitionFile="mex.def" - GenerateDebugInformation="false" - TargetMachine="17" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <File - RelativePath=".\astra_mex_projector_c.cpp" - > - </File> - <File - RelativePath=".\mexHelpFunctions.cpp" - > - </File> - <File - RelativePath=".\mexHelpFunctions.h" - > - </File> - <File - RelativePath=".\mexInitFunctions.cpp" - > - </File> - <File - RelativePath=".\mexInitFunctions.h" - > - </File> - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/matlab/mex/astra_mex_projector_vc11.vcxproj b/matlab/mex/astra_mex_projector_vc14.vcxproj index e944949..332fb4c 100644 --- a/matlab/mex/astra_mex_projector_vc11.vcxproj +++ b/matlab/mex/astra_mex_projector_vc14.vcxproj @@ -36,41 +36,41 @@ </ItemGroup> <PropertyGroup Label="Globals"> <ProjectName>astra_mex_projector</ProjectName> - <ProjectGuid>{4DD6056F-8EEE-4C9A-B2A9-923F01A32E97}</ProjectGuid> + <ProjectGuid>{85ECCF1D-C5F6-4E0E-A4F9-0DE7C0B916B2}</ProjectGuid> <RootNamespace>astraMatlab</RootNamespace> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_CUDA|Win32'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> - <PlatformToolset>v110</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_CUDA|x64'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> - <PlatformToolset>v110</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> - <PlatformToolset>v110</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> - <PlatformToolset>v110</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_CUDA|Win32'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> - <PlatformToolset>v110</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_CUDA|x64'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> - <PlatformToolset>v110</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> - <PlatformToolset>v110</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> - <PlatformToolset>v110</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> diff --git a/matlab/mex/astra_mex_vc09.vcproj b/matlab/mex/astra_mex_vc09.vcproj deleted file mode 100644 index e4d7d07..0000000 --- a/matlab/mex/astra_mex_vc09.vcproj +++ /dev/null @@ -1,612 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="9.00" - Name="astra_mex" - ProjectGUID="{3FDA35E0-0D54-4663-A3E6-5ABA96F32221}" - RootNamespace="astraMatlab" - TargetFrameworkVersion="131072" - > - <Platforms> - <Platform - Name="Win32" - /> - <Platform - Name="x64" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug_CUDA|Win32" - OutputDirectory="$(SolutionDir)bin\$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(OutDir)\obj\$(ProjectName)" - ConfigurationType="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="$(MATLAB_ROOT)\extern\include\;"$(CUDA_INC_PATH)";..\..\lib\include;..\..\include" - PreprocessorDefinitions="ASTRA_CUDA;__SSE2__" - Optimization="0" - RuntimeLibrary="3" - EnableEnhancedInstructionSet="2" - OpenMP="true" - AdditionalOptions="/MP" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="AstraCuda32D.lib libmex.lib libmx.lib libut.lib" - OutputFile="$(OutDir)\$(ProjectName)_c.mexw32" - AdditionalLibraryDirectories="..\..\bin\win32;$(MATLAB_ROOT)\extern\lib\win32\microsoft;..\..\lib\win32" - ModuleDefinitionFile="mex.def" - GenerateDebugInformation="true" - TargetMachine="1" - /> - </Configuration> - <Configuration - Name="Debug_CUDA|x64" - OutputDirectory="$(SolutionDir)bin\$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(OutDir)\obj\$(ProjectName)" - ConfigurationType="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="$(MATLAB_ROOT)\extern\include\;"$(CUDA_INC_PATH)";..\..\lib\include;..\..\include" - PreprocessorDefinitions="ASTRA_CUDA;__SSE2__" - Optimization="0" - RuntimeLibrary="3" - OpenMP="true" - AdditionalOptions="/MP" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="AstraCuda64D.lib libmex.lib libmx.lib libut.lib" - OutputFile="$(OutDir)\$(ProjectName)_c.mexw64" - AdditionalLibraryDirectories="..\..\bin\x64;$(MATLAB_ROOT)\extern\lib\win64\microsoft;..\..\lib\x64" - ModuleDefinitionFile="mex.def" - GenerateDebugInformation="true" - TargetMachine="17" - /> - </Configuration> - <Configuration - Name="Debug|Win32" - OutputDirectory="$(SolutionDir)bin\$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(OutDir)\obj\$(ProjectName)" - ConfigurationType="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="$(MATLAB_ROOT)\extern\include\;..\..\lib\include;..\..\include" - PreprocessorDefinitions="__SSE2__" - Optimization="0" - RuntimeLibrary="3" - EnableEnhancedInstructionSet="2" - OpenMP="true" - AdditionalOptions="/MP" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="Astra32D.lib libmex.lib libmx.lib libut.lib" - OutputFile="$(OutDir)\$(ProjectName)_c.mexw32" - AdditionalLibraryDirectories="..\..\bin\win32;$(MATLAB_ROOT)\extern\lib\win32\microsoft;..\..\lib\win32" - ModuleDefinitionFile="mex.def" - GenerateDebugInformation="true" - TargetMachine="1" - /> - </Configuration> - <Configuration - Name="Debug|x64" - OutputDirectory="$(SolutionDir)bin\$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(OutDir)\obj\$(ProjectName)" - ConfigurationType="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="$(MATLAB_ROOT)\extern\include\;..\..\lib\include;..\..\include" - PreprocessorDefinitions="__SSE2__" - Optimization="0" - RuntimeLibrary="3" - OpenMP="true" - AdditionalOptions="/MP" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="Astra64D.lib libmex.lib libmx.lib libut.lib" - OutputFile="$(OutDir)\$(ProjectName)_c.mexw64" - AdditionalLibraryDirectories="..\..\bin\x64;$(MATLAB_ROOT)\extern\lib\win64\microsoft;..\..\lib\x64" - ModuleDefinitionFile="mex.def" - GenerateDebugInformation="true" - TargetMachine="17" - /> - </Configuration> - <Configuration - Name="Release_CUDA|Win32" - OutputDirectory="$(SolutionDir)bin\$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(OutDir)\obj\$(ProjectName)" - ConfigurationType="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="$(MATLAB_ROOT)\extern\include\;"$(CUDA_INC_PATH)";..\..\lib\include;..\..\include" - PreprocessorDefinitions="ASTRA_CUDA;__SSE2__" - Optimization="2" - RuntimeLibrary="2" - EnableEnhancedInstructionSet="2" - OpenMP="true" - AdditionalOptions="/MP" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="AstraCuda32.lib libmex.lib libmx.lib libut.lib" - OutputFile="$(OutDir)\$(ProjectName)_c.mexw32" - AdditionalLibraryDirectories="..\..\bin\win32;$(MATLAB_ROOT)\extern\lib\win32\microsoft;..\..\lib\win32" - ModuleDefinitionFile="mex.def" - GenerateDebugInformation="false" - TargetMachine="1" - /> - </Configuration> - <Configuration - Name="Release_CUDA|x64" - OutputDirectory="$(SolutionDir)bin\$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(OutDir)\obj\$(ProjectName)" - ConfigurationType="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="$(MATLAB_ROOT)\extern\include\;"$(CUDA_INC_PATH)";..\..\lib\include;..\..\include" - PreprocessorDefinitions="ASTRA_CUDA;__SSE2__" - Optimization="2" - RuntimeLibrary="2" - OpenMP="true" - AdditionalOptions="/MP" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="AstraCuda64.lib libmex.lib libmx.lib libut.lib" - OutputFile="$(OutDir)\$(ProjectName)_c.mexw64" - AdditionalLibraryDirectories="..\..\bin\x64;$(MATLAB_ROOT)\extern\lib\win64\microsoft;..\..\lib\x64" - ModuleDefinitionFile="mex.def" - GenerateDebugInformation="false" - TargetMachine="17" - /> - </Configuration> - <Configuration - Name="Release|Win32" - OutputDirectory="$(SolutionDir)bin\$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(OutDir)\obj\$(ProjectName)" - ConfigurationType="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="$(MATLAB_ROOT)\extern\include\;..\..\lib\include;..\..\include" - PreprocessorDefinitions="__SSE2__" - Optimization="2" - RuntimeLibrary="2" - EnableEnhancedInstructionSet="2" - OpenMP="true" - AdditionalOptions="/MP" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="Astra32.lib libmex.lib libmx.lib libut.lib" - OutputFile="$(OutDir)\$(ProjectName)_c.mexw32" - AdditionalLibraryDirectories="..\..\bin\win32;$(MATLAB_ROOT)\extern\lib\win32\microsoft;..\..\lib\win32" - ModuleDefinitionFile="mex.def" - GenerateDebugInformation="false" - TargetMachine="1" - /> - </Configuration> - <Configuration - Name="Release|x64" - OutputDirectory="$(SolutionDir)bin\$(PlatformName)\$(ConfigurationName)" - IntermediateDirectory="$(OutDir)\obj\$(ProjectName)" - ConfigurationType="2" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="$(MATLAB_ROOT)\extern\include\;..\..\lib\include;..\..\include" - PreprocessorDefinitions="__SSE2__" - Optimization="2" - RuntimeLibrary="2" - OpenMP="true" - AdditionalOptions="/MP" - /> - <Tool - Name="VCLinkerTool" - AdditionalDependencies="Astra64.lib libmex.lib libmx.lib libut.lib" - OutputFile="$(OutDir)\$(ProjectName)_c.mexw64" - AdditionalLibraryDirectories="..\..\bin\x64;$(MATLAB_ROOT)\extern\lib\win64\microsoft;..\..\lib\x64" - ModuleDefinitionFile="mex.def" - GenerateDebugInformation="false" - TargetMachine="17" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <File - RelativePath=".\astra_mex_c.cpp" - > - </File> - <File - RelativePath=".\mexHelpFunctions.cpp" - > - </File> - <File - RelativePath=".\mexHelpFunctions.h" - > - </File> - <File - RelativePath=".\mexInitFunctions.cpp" - > - </File> - <File - RelativePath=".\mexInitFunctions.h" - > - </File> - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/matlab/mex/astra_mex_vc11.vcxproj b/matlab/mex/astra_mex_vc14.vcxproj index f1324b4..7ca3dbb 100644 --- a/matlab/mex/astra_mex_vc11.vcxproj +++ b/matlab/mex/astra_mex_vc14.vcxproj @@ -36,41 +36,41 @@ </ItemGroup> <PropertyGroup Label="Globals"> <ProjectName>astra_mex</ProjectName> - <ProjectGuid>{3FDA35E0-0D54-4663-A3E6-5ABA96F32221}</ProjectGuid> + <ProjectGuid>{6FDF72C4-A855-4F1C-A401-6500040B5E28}</ProjectGuid> <RootNamespace>astraMatlab</RootNamespace> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_CUDA|Win32'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> - <PlatformToolset>v110</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_CUDA|x64'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> - <PlatformToolset>v110</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> - <PlatformToolset>v110</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> - <PlatformToolset>v110</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_CUDA|Win32'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> - <PlatformToolset>v110</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_CUDA|x64'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> - <PlatformToolset>v110</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> - <PlatformToolset>v110</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> - <PlatformToolset>v110</PlatformToolset> + <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> diff --git a/matlab/mex/mexCopyDataHelpFunctions.cpp b/matlab/mex/mexCopyDataHelpFunctions.cpp index 4db6abd..74f0538 100644 --- a/matlab/mex/mexCopyDataHelpFunctions.cpp +++ b/matlab/mex/mexCopyDataHelpFunctions.cpp @@ -1,10 +1,10 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp - 2014-2015, CWI, Amsterdam +Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp + 2014-2016, CWI, Amsterdam Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/ This file is part of the ASTRA Toolbox. @@ -23,19 +23,16 @@ You should have received a copy of the GNU General Public License along with the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>. ----------------------------------------------------------------------- -$Id$ */ #include "mexCopyDataHelpFunctions.h" #include "mexHelpFunctions.h" -#define HAVE_OMP - #define ROUND_DOWN(x, s) ((x) & ~((s)-1)) -#ifdef HAVE_OMP -# include <omp.h> +#ifdef _OPENMP +#include <omp.h> #endif #if defined(__SSE2__) diff --git a/matlab/mex/mexCopyDataHelpFunctions.h b/matlab/mex/mexCopyDataHelpFunctions.h index 0853879..3ba4cb2 100644 --- a/matlab/mex/mexCopyDataHelpFunctions.h +++ b/matlab/mex/mexCopyDataHelpFunctions.h @@ -1,10 +1,10 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp - 2014-2015, CWI, Amsterdam +Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp + 2014-2016, CWI, Amsterdam Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/ This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ You should have received a copy of the GNU General Public License along with the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>. ----------------------------------------------------------------------- -$Id$ */ #ifndef MEXCOPYDATAHELPFUNCTIONS_H_ diff --git a/matlab/mex/mexDataManagerHelpFunctions.cpp b/matlab/mex/mexDataManagerHelpFunctions.cpp index 1794abb..c47ee27 100644 --- a/matlab/mex/mexDataManagerHelpFunctions.cpp +++ b/matlab/mex/mexDataManagerHelpFunctions.cpp @@ -1,10 +1,10 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp - 2014-2015, CWI, Amsterdam +Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp + 2014-2016, CWI, Amsterdam Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/ This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ You should have received a copy of the GNU General Public License along with the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>. ----------------------------------------------------------------------- -$Id$ */ #include "mexDataManagerHelpFunctions.h" @@ -42,10 +41,10 @@ $Id$ #ifdef USE_MATLAB_UNDOCUMENTED extern "C" { mxArray *mxCreateSharedDataCopy(const mxArray *pr); -bool mxUnshareArray(const mxArray *pr, const bool noDeepCopy); -mxArray *mxUnreference(const mxArray *pr); +bool mxUnshareArray(mxArray *pr, bool noDeepCopy); +mxArray *mxUnreference(mxArray *pr); #if 0 -// Unsupported in Matlab R2014b +// Unsupported in Matlab R2014b and later bool mxIsSharedArray(const mxArray *pr); #endif } @@ -66,12 +65,12 @@ public: // First unshare the input array, so that we may modify it. if (bUnshare) { #if 0 - // Unsupported in Matlab R2014b + // Unsupported in Matlab R2014b and later if (mxIsSharedArray(_pArray)) { fprintf(stderr, "Performance note: unsharing shared array in link\n"); } #endif - mxUnshareArray(_pArray, false); + mxUnshareArray(const_cast<mxArray*>(_pArray), false); //fprintf(stderr, "Unshared:\narray: %p\tdata: %p\n", (void*)_pArray, (void*)mxGetData(_pArray)); } // Then create a (persistent) copy so the data won't be deleted @@ -79,7 +78,7 @@ public: m_pLink = mxCreateSharedDataCopy(_pArray); //fprintf(stderr, "SharedDataCopy:\narray: %p\tdata: %p\n", (void*)m_pLink, (void*)mxGetData(m_pLink)); mexMakeArrayPersistent(m_pLink); - m_fPtr = (float *)mxGetData(m_pLink); + m_fPtr = (float *)mxGetData(_pArray); m_fPtr += iOffset; } virtual ~CFloat32CustomMemoryMatlab3D() { @@ -167,17 +166,6 @@ checkDataSize(const mxArray * const mArray, //----------------------------------------------------------------------------------------- void -updateStatistics(const std::vector<astra::CFloat32Data3DMemory *> & vecIn) -{ - const size_t tot_size = vecIn.size(); - for (size_t count = 0; count < tot_size; count++) - { - vecIn[count]->updateStatistics(); - } -} - -//----------------------------------------------------------------------------------------- -void getDataPointers(const std::vector<astra::CFloat32Data3DMemory *> & vecIn, std::vector<astra::float32 *> & vecOut) { diff --git a/matlab/mex/mexDataManagerHelpFunctions.h b/matlab/mex/mexDataManagerHelpFunctions.h index 0614e05..b7edb0f 100644 --- a/matlab/mex/mexDataManagerHelpFunctions.h +++ b/matlab/mex/mexDataManagerHelpFunctions.h @@ -1,10 +1,10 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp - 2014-2015, CWI, Amsterdam +Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp + 2014-2016, CWI, Amsterdam Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/ This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ You should have received a copy of the GNU General Public License along with the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>. ----------------------------------------------------------------------- -$Id$ */ #ifndef MEXDATAMANAGERHELPFUNCTIONS_H_ @@ -51,8 +50,6 @@ bool checkDataSize(const mxArray * const, const astra::CProjectionGeometry3D * c bool checkDataSize(const mxArray * const, const astra::CVolumeGeometry3D * const, const mwIndex & zOffset); -void updateStatistics(const std::vector<astra::CFloat32Data3DMemory *> &); - void getDataPointers(const std::vector<astra::CFloat32Data3DMemory *> &, std::vector<astra::float32 *> &); void getDataSizes(const std::vector<astra::CFloat32Data3DMemory *> &, diff --git a/matlab/mex/mexHelpFunctions.cpp b/matlab/mex/mexHelpFunctions.cpp index d957aea..7cab248 100644 --- a/matlab/mex/mexHelpFunctions.cpp +++ b/matlab/mex/mexHelpFunctions.cpp @@ -1,10 +1,10 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp - 2014-2015, CWI, Amsterdam +Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp + 2014-2016, CWI, Amsterdam Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/ This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ You should have received a copy of the GNU General Public License along with the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>. ----------------------------------------------------------------------- -$Id$ */ /** \file mexHelpFunctions.cpp @@ -361,18 +360,18 @@ mxArray* stringToMxArray(std::string input) StringUtil::splitString(col_strings, row_strings[0], ","); // get dimensions - int rows = row_strings.size(); - int cols = col_strings.size(); + size_t rows = row_strings.size(); + size_t cols = col_strings.size(); // init matrix mxArray* pMatrix = mxCreateDoubleMatrix(rows, cols, mxREAL); double* out = mxGetPr(pMatrix); // loop elements - for (unsigned int row = 0; row < rows; row++) { + for (size_t row = 0; row < rows; row++) { StringUtil::splitString(col_strings, row_strings[row], ","); // check size - for (unsigned int col = 0; col < col_strings.size(); col++) { + for (size_t col = 0; col < col_strings.size(); col++) { out[col*rows + row] = StringUtil::stringToFloat(col_strings[col]); } } @@ -391,7 +390,7 @@ mxArray* stringToMxArray(std::string input) double* out = mxGetPr(pVector); // loop elements - for (unsigned int i = 0; i < items.size(); i++) { + for (size_t i = 0; i < items.size(); i++) { out[i] = StringUtil::stringToFloat(items[i]); } return pVector; diff --git a/matlab/mex/mexHelpFunctions.h b/matlab/mex/mexHelpFunctions.h index 07edc64..37ca894 100644 --- a/matlab/mex/mexHelpFunctions.h +++ b/matlab/mex/mexHelpFunctions.h @@ -1,10 +1,10 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2015, iMinds-Vision Lab, University of Antwerp - 2014-2015, CWI, Amsterdam +Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp + 2014-2016, CWI, Amsterdam Contact: astra@uantwerpen.be -Website: http://sf.net/projects/astra-toolbox +Website: http://www.astra-toolbox.com/ This file is part of the ASTRA Toolbox. @@ -23,7 +23,6 @@ You should have received a copy of the GNU General Public License along with the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>. ----------------------------------------------------------------------- -$Id$ */ #ifndef _INC_ASTRA_MEX_HELPFUNCTIONS @@ -47,7 +46,7 @@ $Id$ #include "astra/XMLNode.h" // utility functions -string mexToString(const mxArray* pInput); +std::string mexToString(const mxArray* pInput); bool mexIsScalar(const mxArray* pInput); void get3DMatrixDims(const mxArray* x, mwSize *dims); @@ -56,7 +55,7 @@ mxArray* vectorToMxArray(std::vector<astra::float32> mInput); mxArray* anyToMxArray(boost::any _any); // turn a MATLAB struct into a Config object -astra::Config* structToConfig(string rootname, const mxArray* pStruct); +astra::Config* structToConfig(std::string rootname, const mxArray* pStruct); bool structToXMLNode(astra::XMLNode node, const mxArray* pStruct); bool optionsToXMLNode(astra::XMLNode node, const mxArray* pOptionStruct); std::map<std::string, mxArray*> parseStruct(const mxArray* pInput); diff --git a/matlab/mex/mexInitFunctions.h b/matlab/mex/mexInitFunctions.h index f16e9c9..0415fb1 100644 --- a/matlab/mex/mexInitFunctions.h +++ b/matlab/mex/mexInitFunctions.h @@ -3,4 +3,4 @@ void initASTRAMex(); -#endif
\ No newline at end of file +#endif diff --git a/matlab/mex/octave_support.cpp b/matlab/mex/octave_support.cpp new file mode 100644 index 0000000..79556ee --- /dev/null +++ b/matlab/mex/octave_support.cpp @@ -0,0 +1,44 @@ +/* +----------------------------------------------------------------------- +Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp + 2014-2016, CWI, Amsterdam + +Contact: astra@uantwerpen.be +Website: http://www.astra-toolbox.com/ + +This file is part of the ASTRA Toolbox. + + +The ASTRA Toolbox is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +The ASTRA Toolbox is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>. + +----------------------------------------------------------------------- +*/ + +#include <oct.h> + +extern "C" { + +bool utIsInterruptPending() { + return octave_signal_caught; +} + +mxArray *mxCreateSharedDataCopy(const mxArray *) { + return 0; +} + +bool mxUnshareArray(mxArray *, bool) { + return false; +} + +} |