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

Native: simplify target files further

pull/308/merge
Christoph Ruegg 11 years ago
parent
fafed3cf4a
commit
5cbc44effb
6 changed files with 18 additions and 87 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. 4
      MathNet.Numerics.sln
  2. 6
      build.fsx
  3. 27
      build/MathNet.Numerics.CUDA.Win.targets
  4. 27
      build/MathNet.Numerics.MKL.Win.targets
  5. 27
      build/MathNet.Numerics.OpenBLAS.Win.targets
  6. 14
      build/NativeProvider.targets

4
MathNet.Numerics.sln
View File

@ -28,11 +28,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{A4A66FA9
ProjectSection(SolutionItems) = preProject
docs\tools\build-docs.fsx = docs\tools\build-docs.fsx
build.fsx = build.fsx
build\MathNet.Numerics.CUDA.Win.targets = build\MathNet.Numerics.CUDA.Win.targets
build\MathNet.Numerics.Extension.nuspec = build\MathNet.Numerics.Extension.nuspec
build\MathNet.Numerics.MKL.Win.targets = build\MathNet.Numerics.MKL.Win.targets
build\MathNet.Numerics.nuspec = build\MathNet.Numerics.nuspec
build\MathNet.Numerics.OpenBLAS.Win.targets = build\MathNet.Numerics.OpenBLAS.Win.targets
build\NativeProvider.targets = build\NativeProvider.targets
paket.dependencies = paket.dependencies
paket.lock = paket.lock
EndProjectSection

6
build.fsx
View File

@ -212,7 +212,7 @@ let mklWinPack =
Authors = [ "Christoph Ruegg"; "Marcus Cuda"; "Jurgen Van Gael" ]
Dependencies = []
Files =
[ @"..\..\build\MathNet.Numerics.MKL.Win.targets", Some "build", None;
[ @"..\..\build\NativeProvider.targets", Some "build\MathNet.Numerics.MKL.Win.targets", None;
@"..\..\out\MKL\Windows\x64\libiomp5md.dll", Some @"build\x64", None;
@"..\..\out\MKL\Windows\x64\MathNet.Numerics.MKL.dll", Some @"build\x64", None;
@"..\..\out\MKL\Windows\x86\libiomp5md.dll", Some @"build\x86", None;
@ -286,7 +286,7 @@ let cudaWinPack =
Authors = [ "Matthew A Johnson"; "Christoph Ruegg" ]
Dependencies = []
Files =
[ @"..\..\build\MathNet.Numerics.CUDA.Win.targets", Some "build", None;
[ @"..\..\build\NativeProvider.targets", Some "build\MathNet.Numerics.CUDA.Win.targets", None;
@"..\..\out\CUDA\Windows\x64\cublas64_70.dll", Some "content", None;
@"..\..\out\CUDA\Windows\x64\cudart64_70.dll", Some "content", None;
@"..\..\out\CUDA\Windows\x64\cusolver64_70.dll", Some "content", None;
@ -314,7 +314,7 @@ let openBlasWinPack =
Authors = [ "Kuan Bartel"; "Christoph Ruegg"; "Marcus Cuda" ]
Dependencies = []
Files =
[ @"..\..\build\MathNet.Numerics.OpenBLAS.Win.targets", Some "build", None;
[ @"..\..\build\NativeProvider.targets", Some "build\MathNet.Numerics.OpenBLAS.Win.targets", None;
@"..\..\out\OpenBLAS\Windows\x64\libgcc_s_seh-1.dll", Some @"build\x64", None;
@"..\..\out\OpenBLAS\Windows\x64\libgfortran-3.dll", Some @"build\x64", None;
@"..\..\out\OpenBLAS\Windows\x64\libopenblas.dll", Some @"build\x64", None;

27
build/MathNet.Numerics.CUDA.Win.targets
View File

@ -1,27 +0,0 @@
<!--
*
* MathNet.Numerics.CUDA.Win.targets
*
* WARNING: This MSBuild file requires MSBuild 4.0 features.
*
-->
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<!--
******************************************************************************
** MathNet Interop Library Files **
******************************************************************************
-->
<ItemGroup Condition="'$(MSBuildThisFileDirectory)' != '' And
HasTrailingSlash('$(MSBuildThisFileDirectory)')">
<!--
NOTE: Copy "MathNet.Numerics.CUDA.dll" and all related files, for every
architecture that we support, to the build output directory.
-->
<MathNetInteropFiles Include="$(MSBuildThisFileDirectory)**\*.dll" />
<Content Include="@(MathNetInteropFiles)">
<Link>%(RecursiveDir)%(FileName)%(Extension)</Link>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
</ItemGroup>
</Project>

27
build/MathNet.Numerics.MKL.Win.targets
View File

@ -1,27 +0,0 @@
<!--
*
* MathNet.Numerics.MKL.Win.targets
*
* WARNING: This MSBuild file requires MSBuild 4.0 features.
*
-->
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<!--
******************************************************************************
** MathNet Interop Library Files **
******************************************************************************
-->
<ItemGroup Condition="'$(MSBuildThisFileDirectory)' != '' And
HasTrailingSlash('$(MSBuildThisFileDirectory)')">
<!--
NOTE: Copy "MathNet.Numerics.MKL.dll" and all related files, for every
architecture that we support, to the build output directory.
-->
<MathNetInteropFiles Include="$(MSBuildThisFileDirectory)**\*.dll" />
<Content Include="@(MathNetInteropFiles)">
<Link>%(RecursiveDir)%(FileName)%(Extension)</Link>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
</ItemGroup>
</Project>

27
build/MathNet.Numerics.OpenBLAS.Win.targets
View File

@ -1,27 +0,0 @@
<!--
*
* MathNet.Numerics.OpenBLAS.Win.targets
*
* WARNING: This MSBuild file requires MSBuild 4.0 features.
*
-->
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<!--
******************************************************************************
** MathNet Interop Library Files **
******************************************************************************
-->
<ItemGroup Condition="'$(MSBuildThisFileDirectory)' != '' And
HasTrailingSlash('$(MSBuildThisFileDirectory)')">
<!--
NOTE: Copy "MathNet.Numerics.OpenBLAS.dll" and all related files, for every
architecture that we support, to the build output directory.
-->
<MathNetInteropFiles Include="$(MSBuildThisFileDirectory)**\*.dll" />
<Content Include="@(MathNetInteropFiles)">
<Link>%(RecursiveDir)%(FileName)%(Extension)</Link>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
</ItemGroup>
</Project>

14
build/NativeProvider.targets
View File

@ -0,0 +1,14 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<!--
******************************************************************************
** Math.NET Native Provider Interop Files **
******************************************************************************
-->
<ItemGroup Condition="'$(MSBuildThisFileDirectory)' != '' And HasTrailingSlash('$(MSBuildThisFileDirectory)')">
<MathNetInteropFiles Include="$(MSBuildThisFileDirectory)**\*.dll" />
<Content Include="@(MathNetInteropFiles)">
<Link>%(RecursiveDir)%(FileName)%(Extension)</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
</ItemGroup>
</Project>
Write Preview
Loading…
Cancel
Save