From 5cbc44effb5e1f6deb631d1cdf1b70f386e282fc Mon Sep 17 00:00:00 2001 From: Christoph Ruegg Date: Thu, 14 May 2015 16:55:02 +0200 Subject: [PATCH] Native: simplify target files further --- MathNet.Numerics.sln | 4 +-- build.fsx | 6 ++--- build/MathNet.Numerics.CUDA.Win.targets | 27 --------------------- build/MathNet.Numerics.MKL.Win.targets | 27 --------------------- build/MathNet.Numerics.OpenBLAS.Win.targets | 27 --------------------- build/NativeProvider.targets | 14 +++++++++++ 6 files changed, 18 insertions(+), 87 deletions(-) delete mode 100644 build/MathNet.Numerics.CUDA.Win.targets delete mode 100644 build/MathNet.Numerics.MKL.Win.targets delete mode 100644 build/MathNet.Numerics.OpenBLAS.Win.targets create mode 100644 build/NativeProvider.targets diff --git a/MathNet.Numerics.sln b/MathNet.Numerics.sln index bf2a6e2f..f366df26 100644 --- a/MathNet.Numerics.sln +++ b/MathNet.Numerics.sln @@ -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 diff --git a/build.fsx b/build.fsx index 9e73682d..2d98f1fe 100644 --- a/build.fsx +++ b/build.fsx @@ -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; diff --git a/build/MathNet.Numerics.CUDA.Win.targets b/build/MathNet.Numerics.CUDA.Win.targets deleted file mode 100644 index 175782ac..00000000 --- a/build/MathNet.Numerics.CUDA.Win.targets +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - %(RecursiveDir)%(FileName)%(Extension) - Always - - - diff --git a/build/MathNet.Numerics.MKL.Win.targets b/build/MathNet.Numerics.MKL.Win.targets deleted file mode 100644 index b341d614..00000000 --- a/build/MathNet.Numerics.MKL.Win.targets +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - %(RecursiveDir)%(FileName)%(Extension) - Always - - - diff --git a/build/MathNet.Numerics.OpenBLAS.Win.targets b/build/MathNet.Numerics.OpenBLAS.Win.targets deleted file mode 100644 index 2b6d4fc3..00000000 --- a/build/MathNet.Numerics.OpenBLAS.Win.targets +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - %(RecursiveDir)%(FileName)%(Extension) - Always - - - diff --git a/build/NativeProvider.targets b/build/NativeProvider.targets new file mode 100644 index 00000000..1294ec62 --- /dev/null +++ b/build/NativeProvider.targets @@ -0,0 +1,14 @@ + + + + + + %(RecursiveDir)%(FileName)%(Extension) + PreserveNewest + + +