diff --git a/.gitignore b/.gitignore index c26b3f7b..e5ed101f 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,5 @@ UpgradeLog.htm *.vsdoc *.XML *.so +*.sdf +*.opensdf diff --git a/src/NativeWrappers/Windows/NativeWrappers.sln b/MathNet.Numerics.NativeProviders.sln similarity index 77% rename from src/NativeWrappers/Windows/NativeWrappers.sln rename to MathNet.Numerics.NativeProviders.sln index a514d628..617bed0c 100644 --- a/src/NativeWrappers/Windows/NativeWrappers.sln +++ b/MathNet.Numerics.NativeProviders.sln @@ -1,18 +1,20 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 +# Visual Studio 2013 +VisualStudioVersion = 12.0.21005.1 +MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Common", "Common", "{5A0892FF-82CE-40FC-BCE1-73810C615F52}" ProjectSection(SolutionItems) = preProject - ..\Common\lapack_common.h = ..\Common\lapack_common.h - ..\Common\resource.h = ..\Common\resource.h - ..\Common\resource.rc = ..\Common\resource.rc - ..\Common\WindowsDLL.cpp = ..\Common\WindowsDLL.cpp - ..\Common\wrapper_common.h = ..\Common\wrapper_common.h + src\NativeProviders\Common\lapack_common.h = src\NativeProviders\Common\lapack_common.h + src\NativeProviders\Common\resource.h = src\NativeProviders\Common\resource.h + src\NativeProviders\Common\resource.rc = src\NativeProviders\Common\resource.rc + src\NativeProviders\Common\WindowsDLL.cpp = src\NativeProviders\Common\WindowsDLL.cpp + src\NativeProviders\Common\wrapper_common.h = src\NativeProviders\Common\wrapper_common.h EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MKLWrapper", "MKL\MKLWrapper.vcxproj", "{C0B0DBA9-7FB0-4C87-BDB1-3EED19DC2B8F}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MKLWrapper", "src\NativeProviders\Windows\MKL\MKLWrapper.vcxproj", "{C0B0DBA9-7FB0-4C87-BDB1-3EED19DC2B8F}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ATLASWrapper", "ATLASWrapper\ATLASWrapper.vcxproj", "{2362B8AC-C52B-45E4-A1BF-C682A4DB4220}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ATLASWrapper", "src\NativeProviders\Windows\ATLAS\ATLASWrapper.vcxproj", "{2362B8AC-C52B-45E4-A1BF-C682A4DB4220}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -40,11 +42,9 @@ Global {2362B8AC-C52B-45E4-A1BF-C682A4DB4220}.Debug|Mixed Platforms.Build.0 = Debug|Win32 {2362B8AC-C52B-45E4-A1BF-C682A4DB4220}.Debug|Win32.ActiveCfg = Debug|Win32 {2362B8AC-C52B-45E4-A1BF-C682A4DB4220}.Debug|Win32.Build.0 = Debug|Win32 - {2362B8AC-C52B-45E4-A1BF-C682A4DB4220}.Debug|x64.ActiveCfg = Debug|Win32 + {2362B8AC-C52B-45E4-A1BF-C682A4DB4220}.Debug|x64.ActiveCfg = Debug|x64 {2362B8AC-C52B-45E4-A1BF-C682A4DB4220}.Release|Mixed Platforms.ActiveCfg = Release|Win32 - {2362B8AC-C52B-45E4-A1BF-C682A4DB4220}.Release|Mixed Platforms.Build.0 = Release|Win32 {2362B8AC-C52B-45E4-A1BF-C682A4DB4220}.Release|Win32.ActiveCfg = Release|Win32 - {2362B8AC-C52B-45E4-A1BF-C682A4DB4220}.Release|Win32.Build.0 = Release|Win32 {2362B8AC-C52B-45E4-A1BF-C682A4DB4220}.Release|x64.ActiveCfg = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution diff --git a/src/NativeWrappers/.gitignore b/src/NativeProviders/.gitignore similarity index 100% rename from src/NativeWrappers/.gitignore rename to src/NativeProviders/.gitignore diff --git a/src/NativeWrappers/ATLAS/blas.c b/src/NativeProviders/ATLAS/blas.c similarity index 100% rename from src/NativeWrappers/ATLAS/blas.c rename to src/NativeProviders/ATLAS/blas.c diff --git a/src/NativeWrappers/ATLAS/blas.h b/src/NativeProviders/ATLAS/blas.h similarity index 100% rename from src/NativeWrappers/ATLAS/blas.h rename to src/NativeProviders/ATLAS/blas.h diff --git a/src/NativeWrappers/ATLAS/lapack.cpp b/src/NativeProviders/ATLAS/lapack.cpp similarity index 100% rename from src/NativeWrappers/ATLAS/lapack.cpp rename to src/NativeProviders/ATLAS/lapack.cpp diff --git a/src/NativeWrappers/Common/WindowsDLL.cpp b/src/NativeProviders/Common/WindowsDLL.cpp similarity index 100% rename from src/NativeWrappers/Common/WindowsDLL.cpp rename to src/NativeProviders/Common/WindowsDLL.cpp diff --git a/src/NativeWrappers/Common/lapack_common.h b/src/NativeProviders/Common/lapack_common.h similarity index 100% rename from src/NativeWrappers/Common/lapack_common.h rename to src/NativeProviders/Common/lapack_common.h diff --git a/src/NativeWrappers/Common/resource.h b/src/NativeProviders/Common/resource.h similarity index 100% rename from src/NativeWrappers/Common/resource.h rename to src/NativeProviders/Common/resource.h diff --git a/src/NativeWrappers/Common/resource.rc b/src/NativeProviders/Common/resource.rc similarity index 100% rename from src/NativeWrappers/Common/resource.rc rename to src/NativeProviders/Common/resource.rc diff --git a/src/NativeWrappers/Common/wrapper_common.h b/src/NativeProviders/Common/wrapper_common.h similarity index 100% rename from src/NativeWrappers/Common/wrapper_common.h rename to src/NativeProviders/Common/wrapper_common.h diff --git a/src/NativeWrappers/Linux/mkl_build.sh b/src/NativeProviders/Linux/mkl_build.sh old mode 100755 new mode 100644 similarity index 100% rename from src/NativeWrappers/Linux/mkl_build.sh rename to src/NativeProviders/Linux/mkl_build.sh diff --git a/src/NativeWrappers/MKL/blas.c b/src/NativeProviders/MKL/blas.c similarity index 100% rename from src/NativeWrappers/MKL/blas.c rename to src/NativeProviders/MKL/blas.c diff --git a/src/NativeWrappers/MKL/lapack.cpp b/src/NativeProviders/MKL/lapack.cpp similarity index 100% rename from src/NativeWrappers/MKL/lapack.cpp rename to src/NativeProviders/MKL/lapack.cpp diff --git a/src/NativeWrappers/MKL/vector_functions.c b/src/NativeProviders/MKL/vector_functions.c similarity index 100% rename from src/NativeWrappers/MKL/vector_functions.c rename to src/NativeProviders/MKL/vector_functions.c diff --git a/src/NativeWrappers/Windows/ATLASWrapper/ATLASWrapper.vcxproj b/src/NativeProviders/Windows/ATLAS/ATLASWrapper.vcxproj similarity index 96% rename from src/NativeWrappers/Windows/ATLASWrapper/ATLASWrapper.vcxproj rename to src/NativeProviders/Windows/ATLAS/ATLASWrapper.vcxproj index 9af2c52a..1b2951aa 100644 --- a/src/NativeWrappers/Windows/ATLASWrapper/ATLASWrapper.vcxproj +++ b/src/NativeProviders/Windows/ATLAS/ATLASWrapper.vcxproj @@ -22,6 +22,7 @@ {2362B8AC-C52B-45E4-A1BF-C682A4DB4220} Win32Proj ATLASWrapper + ATLAS @@ -69,22 +70,22 @@ true D:\Source\ATLAS\include;..\..\Common;$(IncludePath) - $(SolutionDir)..\..\..\..\ATLAS\Windows\x86\ + $(ProjectDir)..\..\..\..\out\ATLAS\Windows\x86\ true D:\Source\ATLAS\include;..\..\Common;$(IncludePath) - $(SolutionDir)..\..\..\..\ATLAS\Windows\x64\ + $(ProjectDir)..\..\..\..\out\ATLAS\Windows\x64\ false D:\Source\ATLAS\include;..\..\Common;$(IncludePath) - $(SolutionDir)..\..\..\..\ATLAS\Windows\x86\ + $(ProjectDir)..\..\..\..\out\ATLAS\Windows\x86\ false D:\Source\ATLAS\include;..\..\Common;$(IncludePath) - $(SolutionDir)..\..\..\..\ATLAS\Windows\x64\ + $(ProjectDir)..\..\..\..\out\ATLAS\Windows\x64\ diff --git a/src/NativeWrappers/Windows/ATLASWrapper/ATLASWrapper.vcxproj.filters b/src/NativeProviders/Windows/ATLAS/ATLASWrapper.vcxproj.filters similarity index 100% rename from src/NativeWrappers/Windows/ATLASWrapper/ATLASWrapper.vcxproj.filters rename to src/NativeProviders/Windows/ATLAS/ATLASWrapper.vcxproj.filters diff --git a/src/NativeWrappers/Windows/ATLAS/ATLASWrapper.vcproj b/src/NativeProviders/Windows/ATLASEx/ATLASWrapper.vcproj similarity index 100% rename from src/NativeWrappers/Windows/ATLAS/ATLASWrapper.vcproj rename to src/NativeProviders/Windows/ATLASEx/ATLASWrapper.vcproj diff --git a/src/NativeWrappers/Windows/ATLAS/ATLASWrapper.vcxproj b/src/NativeProviders/Windows/ATLASEx/ATLASWrapper.vcxproj similarity index 100% rename from src/NativeWrappers/Windows/ATLAS/ATLASWrapper.vcxproj rename to src/NativeProviders/Windows/ATLASEx/ATLASWrapper.vcxproj diff --git a/src/NativeWrappers/Windows/ATLAS/ATLASWrapper.vcxproj.filters b/src/NativeProviders/Windows/ATLASEx/ATLASWrapper.vcxproj.filters similarity index 100% rename from src/NativeWrappers/Windows/ATLAS/ATLASWrapper.vcxproj.filters rename to src/NativeProviders/Windows/ATLASEx/ATLASWrapper.vcxproj.filters diff --git a/src/NativeWrappers/Windows/MKL/MKLWrapper.vcproj b/src/NativeProviders/Windows/MKL/MKLWrapper.vcproj similarity index 100% rename from src/NativeWrappers/Windows/MKL/MKLWrapper.vcproj rename to src/NativeProviders/Windows/MKL/MKLWrapper.vcproj diff --git a/src/NativeWrappers/Windows/MKL/MKLWrapper.vcxproj b/src/NativeProviders/Windows/MKL/MKLWrapper.vcxproj similarity index 93% rename from src/NativeWrappers/Windows/MKL/MKLWrapper.vcxproj rename to src/NativeProviders/Windows/MKL/MKLWrapper.vcxproj index 5bc5dc49..f121b5b5 100644 --- a/src/NativeWrappers/Windows/MKL/MKLWrapper.vcxproj +++ b/src/NativeProviders/Windows/MKL/MKLWrapper.vcxproj @@ -29,6 +29,7 @@ {C0B0DBA9-7FB0-4C87-BDB1-3EED19DC2B8F} MKLWrapper + MKL @@ -95,32 +96,32 @@ <_ProjectFileVersion>11.0.50727.1 - $(SolutionDir)..\..\..\..\MKL\Windows\x86\ + $(ProjectDir)..\..\..\..\out\MKL\Windows\x86\ $(Platform)\$(Configuration)\ MathNet.Numerics.MKL - $(SolutionDir)..\..\..\..\MKL\Windows\x86\ + $(ProjectDir)..\..\..\..\out\MKL\Windows\x86\ $(Platform)\$(Configuration)\ MathNet.Numerics.MKL - $(SolutionDir)..\..\..\..\MKL\Windows\x64\ + $(ProjectDir)..\..\..\..\out\MKL\Windows\x64\ $(Platform)\$(Configuration)\ MathNet.Numerics.MKL - $(SolutionDir)..\..\..\..\MKL\Windows\x64\ + $(ProjectDir)..\..\..\..\out\MKL\Windows\x64\ $(Platform)\$(Configuration)\ MathNet.Numerics.MKL - $(SolutionDir)..\..\..\..\MKL\Windows\x86\ + $(ProjectDir)..\..\..\..\out\MKL\Windows\x86\ $(Platform)\$(Configuration)\ MathNet.Numerics.MKL - $(SolutionDir)..\..\..\..\MKL\Windows\x64\ + $(ProjectDir)..\..\..\..\out\MKL\Windows\x64\ $(Platform)\$(Configuration)\ MathNet.Numerics.MKL @@ -145,7 +146,7 @@ $(OutDir)$(TargetName).lib - copy "$(CompilerPathForVC)\libiomp5md.dll" $(OutputPath) + copy "$(INTEL_DEV_REDIST)redist\ia32\compiler\libiomp5md.dll" $(OutputPath) @@ -171,7 +172,7 @@ $(OutDir)$(TargetName).lib - copy "$(CompilerPathForVC)\libiomp5md.dll" $(OutputPath) + copy "$(INTEL_DEV_REDIST)redist\ia32\compiler\libiomp5md.dll" $(OutputPath) @@ -198,7 +199,7 @@ $(OutDir)$(TargetName).lib - copy "$(CompilerPathForVC)\libiomp5md.dll" $(OutputPath) + copy "$(INTEL_DEV_REDIST)redist\intel64\compiler\libiomp5md.dll" $(OutputPath) @@ -227,7 +228,7 @@ $(OutDir)$(TargetName).lib - copy "$(CompilerPathForVC)\libiomp5md.dll" $(OutputPath) + copy "$(INTEL_DEV_REDIST)redist\intel64\compiler\libiomp5md.dll" $(OutputPath) @@ -253,9 +254,8 @@ MachineX86 $(OutDir)$(TargetName).lib - - copy "$(CompilerPathForVC)\libiomp5md.dll" $(OutputPath) + copy "$(INTEL_DEV_REDIST)redist\ia32\compiler\libiomp5md.dll" $(OutputPath) @@ -285,7 +285,7 @@ $(OutDir)$(TargetName).lib - copy "$(CompilerPathForVC)\libiomp5md.dll" $(OutputPath) + copy "$(INTEL_DEV_REDIST)redist\intel64\compiler\libiomp5md.dll" $(OutputPath) diff --git a/src/NativeWrappers/Windows/MKL/MKLWrapper.vcxproj.filters b/src/NativeProviders/Windows/MKL/MKLWrapper.vcxproj.filters similarity index 100% rename from src/NativeWrappers/Windows/MKL/MKLWrapper.vcxproj.filters rename to src/NativeProviders/Windows/MKL/MKLWrapper.vcxproj.filters