tsai
/
mathnet-numerics
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Native: fix paths, new root solution MathNet.Numerics.NativeProviders.sln

pull/184/head
Christoph Ruegg 13 years ago
parent
bc8a93e939
commit
e9eb4d92de
23 changed files with 31 additions and 28 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      .gitignore
  2. 22
      MathNet.Numerics.NativeProviders.sln
  3. 0
      src/NativeProviders/.gitignore
  4. 0
      src/NativeProviders/ATLAS/blas.c
  5. 0
      src/NativeProviders/ATLAS/blas.h
  6. 0
      src/NativeProviders/ATLAS/lapack.cpp
  7. 0
      src/NativeProviders/Common/WindowsDLL.cpp
  8. 0
      src/NativeProviders/Common/lapack_common.h
  9. 0
      src/NativeProviders/Common/resource.h
  10. 0
      src/NativeProviders/Common/resource.rc
  11. 0
      src/NativeProviders/Common/wrapper_common.h
  12. 0
      src/NativeProviders/Linux/mkl_build.sh
  13. 0
      src/NativeProviders/MKL/blas.c
  14. 0
      src/NativeProviders/MKL/lapack.cpp
  15. 0
      src/NativeProviders/MKL/vector_functions.c
  16. 9
      src/NativeProviders/Windows/ATLAS/ATLASWrapper.vcxproj
  17. 0
      src/NativeProviders/Windows/ATLAS/ATLASWrapper.vcxproj.filters
  18. 0
      src/NativeProviders/Windows/ATLASEx/ATLASWrapper.vcproj
  19. 0
      src/NativeProviders/Windows/ATLASEx/ATLASWrapper.vcxproj
  20. 0
      src/NativeProviders/Windows/ATLASEx/ATLASWrapper.vcxproj.filters
  21. 0
      src/NativeProviders/Windows/MKL/MKLWrapper.vcproj
  22. 26
      src/NativeProviders/Windows/MKL/MKLWrapper.vcxproj
  23. 0
      src/NativeProviders/Windows/MKL/MKLWrapper.vcxproj.filters

2
.gitignore
View File

@ -22,3 +22,5 @@ UpgradeLog.htm
*.vsdoc
*.XML
*.so
*.sdf
*.opensdf

22
src/NativeWrappers/Windows/NativeWrappers.sln → MathNet.Numerics.NativeProviders.sln
View File

@ -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

0
src/NativeWrappers/.gitignore → src/NativeProviders/.gitignore
View File

0
src/NativeWrappers/ATLAS/blas.c → src/NativeProviders/ATLAS/blas.c
View File

0
src/NativeWrappers/ATLAS/blas.h → src/NativeProviders/ATLAS/blas.h
View File

0
src/NativeWrappers/ATLAS/lapack.cpp → src/NativeProviders/ATLAS/lapack.cpp
View File

0
src/NativeWrappers/Common/WindowsDLL.cpp → src/NativeProviders/Common/WindowsDLL.cpp
View File

0
src/NativeWrappers/Common/lapack_common.h → src/NativeProviders/Common/lapack_common.h
View File

0
src/NativeWrappers/Common/resource.h → src/NativeProviders/Common/resource.h
View File

0
src/NativeWrappers/Common/resource.rc → src/NativeProviders/Common/resource.rc
View File

0
src/NativeWrappers/Common/wrapper_common.h → src/NativeProviders/Common/wrapper_common.h
View File

0
src/NativeWrappers/Linux/mkl_build.sh → src/NativeProviders/Linux/mkl_build.sh
View File

0
src/NativeWrappers/MKL/blas.c → src/NativeProviders/MKL/blas.c
View File

0
src/NativeWrappers/MKL/lapack.cpp → src/NativeProviders/MKL/lapack.cpp
View File

0
src/NativeWrappers/MKL/vector_functions.c → src/NativeProviders/MKL/vector_functions.c
View File

9
src/NativeWrappers/Windows/ATLASWrapper/ATLASWrapper.vcxproj → src/NativeProviders/Windows/ATLAS/ATLASWrapper.vcxproj
View File

@ -22,6 +22,7 @@
<ProjectGuid>{2362B8AC-C52B-45E4-A1BF-C682A4DB4220}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<RootNamespace>ATLASWrapper</RootNamespace>
<ProjectName>ATLAS</ProjectName>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@ -69,22 +70,22 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental>
<IncludePath>D:\Source\ATLAS\include;..\..\Common;$(IncludePath)</IncludePath>
<OutDir>$(SolutionDir)..\..\..\..\ATLAS\Windows\x86\</OutDir>
<OutDir>$(ProjectDir)..\..\..\..\out\ATLAS\Windows\x86\</OutDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<LinkIncremental>true</LinkIncremental>
<IncludePath>D:\Source\ATLAS\include;..\..\Common;$(IncludePath)</IncludePath>
<OutDir>$(SolutionDir)..\..\..\..\ATLAS\Windows\x64\</OutDir>
<OutDir>$(ProjectDir)..\..\..\..\out\ATLAS\Windows\x64\</OutDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
<IncludePath>D:\Source\ATLAS\include;..\..\Common;$(IncludePath)</IncludePath>
<OutDir>$(SolutionDir)..\..\..\..\ATLAS\Windows\x86\</OutDir>
<OutDir>$(ProjectDir)..\..\..\..\out\ATLAS\Windows\x86\</OutDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<LinkIncremental>false</LinkIncremental>
<IncludePath>D:\Source\ATLAS\include;..\..\Common;$(IncludePath)</IncludePath>
<OutDir>$(SolutionDir)..\..\..\..\ATLAS\Windows\x64\</OutDir>
<OutDir>$(ProjectDir)..\..\..\..\out\ATLAS\Windows\x64\</OutDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>

0
src/NativeWrappers/Windows/ATLASWrapper/ATLASWrapper.vcxproj.filters → src/NativeProviders/Windows/ATLAS/ATLASWrapper.vcxproj.filters
View File

0
src/NativeWrappers/Windows/ATLAS/ATLASWrapper.vcproj → src/NativeProviders/Windows/ATLASEx/ATLASWrapper.vcproj
View File

0
src/NativeWrappers/Windows/ATLAS/ATLASWrapper.vcxproj → src/NativeProviders/Windows/ATLASEx/ATLASWrapper.vcxproj
View File

0
src/NativeWrappers/Windows/ATLAS/ATLASWrapper.vcxproj.filters → src/NativeProviders/Windows/ATLASEx/ATLASWrapper.vcxproj.filters
View File

0
src/NativeWrappers/Windows/MKL/MKLWrapper.vcproj → src/NativeProviders/Windows/MKL/MKLWrapper.vcproj
View File

26
src/NativeWrappers/Windows/MKL/MKLWrapper.vcxproj → src/NativeProviders/Windows/MKL/MKLWrapper.vcxproj
View File

@ -29,6 +29,7 @@
<PropertyGroup Label="Globals">
<ProjectGuid>{C0B0DBA9-7FB0-4C87-BDB1-3EED19DC2B8F}</ProjectGuid>
<RootNamespace>MKLWrapper</RootNamespace>
<ProjectName>MKL</ProjectName>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
@ -95,32 +96,32 @@
<_ProjectFileVersion>11.0.50727.1</_ProjectFileVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<OutDir>$(SolutionDir)..\..\..\..\MKL\Windows\x86\</OutDir>
<OutDir>$(ProjectDir)..\..\..\..\out\MKL\Windows\x86\</OutDir>
<IntDir>$(Platform)\$(Configuration)\</IntDir>
<TargetName>MathNet.Numerics.MKL</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Intel_SSA|Win32'">
<OutDir>$(SolutionDir)..\..\..\..\MKL\Windows\x86\</OutDir>
<OutDir>$(ProjectDir)..\..\..\..\out\MKL\Windows\x86\</OutDir>
<IntDir>$(Platform)\$(Configuration)\</IntDir>
<TargetName>MathNet.Numerics.MKL</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<OutDir>$(SolutionDir)..\..\..\..\MKL\Windows\x64\</OutDir>
<OutDir>$(ProjectDir)..\..\..\..\out\MKL\Windows\x64\</OutDir>
<IntDir>$(Platform)\$(Configuration)\</IntDir>
<TargetName>MathNet.Numerics.MKL</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Intel_SSA|x64'">
<OutDir>$(SolutionDir)..\..\..\..\MKL\Windows\x64\</OutDir>
<OutDir>$(ProjectDir)..\..\..\..\out\MKL\Windows\x64\</OutDir>
<IntDir>$(Platform)\$(Configuration)\</IntDir>
<TargetName>MathNet.Numerics.MKL</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<OutDir>$(SolutionDir)..\..\..\..\MKL\Windows\x86\</OutDir>
<OutDir>$(ProjectDir)..\..\..\..\out\MKL\Windows\x86\</OutDir>
<IntDir>$(Platform)\$(Configuration)\</IntDir>
<TargetName>MathNet.Numerics.MKL</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<OutDir>$(SolutionDir)..\..\..\..\MKL\Windows\x64\</OutDir>
<OutDir>$(ProjectDir)..\..\..\..\out\MKL\Windows\x64\</OutDir>
<IntDir>$(Platform)\$(Configuration)\</IntDir>
<TargetName>MathNet.Numerics.MKL</TargetName>
</PropertyGroup>
@ -145,7 +146,7 @@
<ImportLibrary>$(OutDir)$(TargetName).lib</ImportLibrary>
</Link>
<PostBuildEvent>
<Command>copy "$(CompilerPathForVC)\libiomp5md.dll" $(OutputPath)</Command>
<Command>copy "$(INTEL_DEV_REDIST)redist\ia32\compiler\libiomp5md.dll" $(OutputPath)</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Intel_SSA|Win32'">
@ -171,7 +172,7 @@
<ImportLibrary>$(OutDir)$(TargetName).lib</ImportLibrary>
</Link>
<PostBuildEvent>
<Command>copy "$(CompilerPathForVC)\libiomp5md.dll" $(OutputPath)</Command>
<Command>copy "$(INTEL_DEV_REDIST)redist\ia32\compiler\libiomp5md.dll" $(OutputPath)</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@ -198,7 +199,7 @@
<ImportLibrary>$(OutDir)$(TargetName).lib</ImportLibrary>
</Link>
<PostBuildEvent>
<Command>copy "$(CompilerPathForVC)\libiomp5md.dll" $(OutputPath)</Command>
<Command>copy "$(INTEL_DEV_REDIST)redist\intel64\compiler\libiomp5md.dll" $(OutputPath)</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Intel_SSA|x64'">
@ -227,7 +228,7 @@
<ImportLibrary>$(OutDir)$(TargetName).lib</ImportLibrary>
</Link>
<PostBuildEvent>
<Command>copy "$(CompilerPathForVC)\libiomp5md.dll" $(OutputPath)</Command>
<Command>copy "$(INTEL_DEV_REDIST)redist\intel64\compiler\libiomp5md.dll" $(OutputPath)</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@ -253,9 +254,8 @@
<TargetMachine>MachineX86</TargetMachine>
<ImportLibrary>$(OutDir)$(TargetName).lib</ImportLibrary>
</Link>
<PostBuildEvent />
<PostBuildEvent>
<Command>copy "$(CompilerPathForVC)\libiomp5md.dll" $(OutputPath)</Command>
<Command>copy "$(INTEL_DEV_REDIST)redist\ia32\compiler\libiomp5md.dll" $(OutputPath)</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@ -285,7 +285,7 @@
<ImportLibrary>$(OutDir)$(TargetName).lib</ImportLibrary>
</Link>
<PostBuildEvent>
<Command>copy "$(CompilerPathForVC)\libiomp5md.dll" $(OutputPath)</Command>
<Command>copy "$(INTEL_DEV_REDIST)redist\intel64\compiler\libiomp5md.dll" $(OutputPath)</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>

0
src/NativeWrappers/Windows/MKL/MKLWrapper.vcxproj.filters → src/NativeProviders/Windows/MKL/MKLWrapper.vcxproj.filters
View File

Write Preview
Loading…
Cancel
Save