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

Release v4.8.1

pull/646/head v4.8.1
Christoph Ruegg 7 years ago
parent
c9c1170caf
commit
83ab6ebd97
9 changed files with 73 additions and 53 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. 3
      RELEASENOTES.md
  2. 36
      build.fsx
  3. 49
      build/build-framework.fsx
  4. 6
      src/FSharp.Tests/AssemblyInfo.fs
  5. 6
      src/FSharp/AssemblyInfo.fs
  6. 8
      src/FSharp/FSharp.fsproj
  7. 6
      src/Numerics.Tests/Properties/AssemblyInfo.cs
  8. 8
      src/Numerics/Numerics.csproj
  9. 4
      src/TestData/Properties/AssemblyInfo.cs

3
RELEASENOTES.md
View File

@ -1,3 +1,6 @@
### 4.8.1 - 2019-06-12
* Packaging fix - signed edition was not properly strong named.
### 4.8.0 - 2019-06-02
* Optimization: Levenberg-Marquardt, Trust-Region Dogleg *~Jong Hyun Kim*
* Optimization: Nelder-Mead-Simplex: Improve convergence for symmetrical functions *~Erik Ovegard*

36
build.fsx
View File

@ -177,7 +177,7 @@ Target "ApplyVersion" (fun _ ->
patchVersionInResource "src/NativeProviders/CUDA/resource.rc" cudaRelease
patchVersionInResource "src/NativeProviders/OpenBLAS/resource.rc" openBlasRelease)
Target "Restore" (fun _ -> allSolutions |> List.iter restore)
Target "Restore" (fun _ -> allSolutions |> List.iter restoreWeak)
"Start"
=?> ("Clean", not (hasBuildParam "incremental"))
==> "Restore"
@ -201,24 +201,24 @@ Target "Build" (fun _ ->
// Strong Name Build (with strong name, without certificate signature)
if hasBuildParam "strongname" then
CleanDirs (!! "src/**/obj/" ++ "src/**/bin/" )
restoreSN numericsSolution
buildSN numericsSolution
restoreStrong numericsSolution
buildStrong numericsSolution
if isWindows && hasBuildParam "sign" then sign fingerprint timeserver numericsSolution
collectBinariesSN numericsSolution
zip numericsStrongNameZipPackage numericsSolution.OutputZipDir numericsSolution.OutputLibStrongNameDir (fun f -> f.Contains("MathNet.Numerics.") || f.Contains("System.Threading.") || f.Contains("FSharp.Core."))
if isWindows then
packSN numericsSolution
packStrong numericsSolution
collectNuGetPackages numericsSolution
// Normal Build (without strong name, with certificate signature)
CleanDirs (!! "src/**/obj/" ++ "src/**/bin/" )
restore numericsSolution
build numericsSolution
restoreWeak numericsSolution
buildWeak numericsSolution
if isWindows && hasBuildParam "sign" then sign fingerprint timeserver numericsSolution
collectBinaries numericsSolution
zip numericsZipPackage numericsSolution.OutputZipDir numericsSolution.OutputLibDir (fun f -> f.Contains("MathNet.Numerics.") || f.Contains("System.Threading.") || f.Contains("FSharp.Core."))
if isWindows then
pack numericsSolution
packWeak numericsSolution
collectNuGetPackages numericsSolution
// NuGet Sign (all or nothing)
@ -232,26 +232,26 @@ Target "DataBuild" (fun _ ->
// Strong Name Build (with strong name, without certificate signature)
if hasBuildParam "strongname" then
CleanDirs (!! "src/**/obj/" ++ "src/**/bin/" )
restoreSN dataSolution
buildSN dataSolution
restoreStrong dataSolution
buildStrong dataSolution
if isWindows && hasBuildParam "sign" then sign fingerprint timeserver dataSolution
collectBinariesSN dataSolution
zip dataStrongNameZipPackage dataSolution.OutputZipDir dataSolution.OutputLibStrongNameDir (fun f -> f.Contains("MathNet.Numerics.Data."))
if isWindows then
packProjectSN dataTextProject
packProjectSN dataMatlabProject
packProjectStrong dataTextProject
packProjectStrong dataMatlabProject
collectNuGetPackages dataSolution
// Normal Build (without strong name, with certificate signature)
CleanDirs (!! "src/**/obj/" ++ "src/**/bin/" )
restore dataSolution
build dataSolution
restoreWeak dataSolution
buildWeak dataSolution
if isWindows && hasBuildParam "sign" then sign fingerprint timeserver dataSolution
collectBinaries dataSolution
zip dataZipPackage dataSolution.OutputZipDir dataSolution.OutputLibDir (fun f -> f.Contains("MathNet.Numerics.Data."))
if isWindows then
packProject dataTextProject
packProject dataMatlabProject
packProjectWeak dataTextProject
packProjectWeak dataMatlabProject
collectNuGetPackages dataSolution
// NuGet Sign (all or nothing)
@ -262,7 +262,7 @@ Target "DataBuild" (fun _ ->
Target "MklWinBuild" (fun _ ->
restore mklSolution
restoreWeak mklSolution
buildConfig32 "Release-MKL" !! "MathNet.Numerics.MKL.sln"
buildConfig64 "Release-MKL" !! "MathNet.Numerics.MKL.sln"
CreateDir mklSolution.OutputZipDir
@ -278,7 +278,7 @@ Target "MklWinBuild" (fun _ ->
Target "CudaWinBuild" (fun _ ->
restore cudaSolution
restoreWeak cudaSolution
buildConfig64 "Release-CUDA" !! "MathNet.Numerics.CUDA.sln"
CreateDir cudaSolution.OutputZipDir
zip cudaWinZipPackage cudaSolution.OutputZipDir "out/CUDA/Windows" (fun f -> f.Contains("MathNet.Numerics.CUDA.") || f.Contains("cublas") || f.Contains("cudart") || f.Contains("cusolver"))
@ -293,7 +293,7 @@ Target "CudaWinBuild" (fun _ ->
Target "OpenBlasWinBuild" (fun _ ->
restore openBlasSolution
restoreWeak openBlasSolution
buildConfig32 "Release-OpenBLAS" !! "MathNet.Numerics.OpenBLAS.sln"
buildConfig64 "Release-OpenBLAS" !! "MathNet.Numerics.OpenBLAS.sln"
CreateDir openBlasSolution.OutputZipDir

49
build/build-framework.fsx
View File

@ -32,6 +32,21 @@ trace rootDir
// --------------------------------------------------------------------------------------
let msbuild targets configuration project =
let properties =
[
yield "Configuration", configuration
]
MSBuildHelper.build (fun p ->
{ p with
NoLogo = true
NodeReuse = false
Targets = targets
Properties = properties
RestorePackagesFlag = false
Verbosity = Some MSBuildVerbosity.Minimal
}) project
let msbuildWeak targets configuration project =
let properties =
[
yield "Configuration", configuration
@ -47,7 +62,7 @@ let msbuild targets configuration project =
Verbosity = Some MSBuildVerbosity.Minimal
}) project
let msbuildSN targets configuration project =
let msbuildStrong targets configuration project =
let properties =
[
yield "Configuration", configuration
@ -72,7 +87,17 @@ let dotnet workingDir command =
(fun c -> { c with WorkingDir = workingDir})
(command + suffix)
let dotnetSN workingDir command =
let dotnetWeak workingDir command =
let properties =
[
yield "StrongName", "False"
]
let suffix = properties |> List.map (fun (name, value) -> sprintf """ /p:%s="%s" """ name value) |> String.concat ""
DotNetCli.RunCommand
(fun c -> { c with WorkingDir = workingDir})
(command + suffix)
let dotnetStrong workingDir command =
let properties =
[
yield "StrongName", "True"
@ -283,20 +308,20 @@ let patchVersionInProjectFile (project:Project) =
let clean (solution:Solution) = msbuild [ "Clean" ] "Release" solution.SolutionFile
let restore (solution:Solution) = msbuild [ "Restore" ] "Release" solution.SolutionFile
let restoreSN (solution:Solution) = msbuildSN [ "Restore" ] "Release" solution.SolutionFile
let restoreWeak (solution:Solution) = msbuildWeak [ "Restore" ] "Release" solution.SolutionFile
let restoreStrong (solution:Solution) = msbuildStrong [ "Restore" ] "Release" solution.SolutionFile
let build (solution:Solution) = msbuild [ (if hasBuildParam "incremental" then "Build" else "Rebuild") ] "Release" solution.SolutionFile
let buildSN (solution:Solution) = msbuildSN [ (if hasBuildParam "incremental" then "Build" else "Rebuild") ] "Release" solution.SolutionFile
let buildWeak (solution:Solution) = msbuildWeak [ (if hasBuildParam "incremental" then "Build" else "Rebuild") ] "Release" solution.SolutionFile
let buildStrong (solution:Solution) = msbuildStrong [ (if hasBuildParam "incremental" then "Build" else "Rebuild") ] "Release" solution.SolutionFile
let pack (solution:Solution) = dotnet rootDir (sprintf "pack %s --configuration Release --no-restore --no-build" solution.SolutionFile)
let packSN (solution:Solution) = dotnetSN rootDir (sprintf "pack %s --configuration Release --no-restore --no-build" solution.SolutionFile)
let packWeak (solution:Solution) = dotnetWeak rootDir (sprintf "pack %s --configuration Release --no-restore --no-build" solution.SolutionFile)
let packStrong (solution:Solution) = dotnetStrong rootDir (sprintf "pack %s --configuration Release --no-restore --no-build" solution.SolutionFile)
let packProject = function
| VisualStudio p -> dotnet rootDir (sprintf "pack %s --configuration Release --no-restore --no-build" p.ProjectFile)
let packProjectWeak = function
| VisualStudio p -> dotnetWeak rootDir (sprintf "pack %s --configuration Release --no-restore --no-build" p.ProjectFile)
| _ -> failwith "Project type not supported"
let packProjectSN = function
| VisualStudio p -> dotnetSN rootDir (sprintf "pack %s --configuration Release --no-restore --no-build" p.ProjectFile)
let packProjectStrong = function
| VisualStudio p -> dotnetStrong rootDir (sprintf "pack %s --configuration Release --no-restore --no-build" p.ProjectFile)
| _ -> failwith "Project type not supported"
//let buildConfig config subject = MSBuild "" (if hasBuildParam "incremental" then "Build" else "Rebuild") [ "Configuration", config ] subject |> ignore

6
src/FSharp.Tests/AssemblyInfo.fs
View File

@ -10,9 +10,9 @@ open System.Runtime.InteropServices
[<assembly: AssemblyProduct("Math.NET Numerics")>]
[<assembly: AssemblyCopyright("Copyright (c) Math.NET Project")>]
[<assembly: AssemblyVersion("4.8.0.0")>]
[<assembly: AssemblyFileVersion("4.8.0.0")>]
[<assembly: AssemblyInformationalVersion("4.8.0")>]
[<assembly: AssemblyVersion("4.8.1.0")>]
[<assembly: AssemblyFileVersion("4.8.1.0")>]
[<assembly: AssemblyInformationalVersion("4.8.1")>]
[<assembly: ComVisible(false)>]
[<assembly: Guid("C9AA6156-F799-42E4-B50D-2E88AD7D1750")>]

6
src/FSharp/AssemblyInfo.fs
View File

@ -44,9 +44,9 @@ open System.Runtime.InteropServices
[<assembly: AssemblyCulture("")>]
[<assembly: NeutralResourcesLanguage("en")>]
[<assembly: AssemblyVersion("4.8.0.0")>]
[<assembly: AssemblyFileVersion("4.8.0.0")>]
[<assembly: AssemblyInformationalVersion("4.8.0")>]
[<assembly: AssemblyVersion("4.8.1.0")>]
[<assembly: AssemblyFileVersion("4.8.1.0")>]
[<assembly: AssemblyInformationalVersion("4.8.1")>]
[<assembly: ComVisible(false)>]
[<assembly: Guid("048BC4EB-CE2B-4040-9967-4784F5405B0F")>]

8
src/FSharp/FSharp.fsproj
View File

@ -7,15 +7,11 @@
<RootNamespace>MathNet.Numerics</RootNamespace>
<IsPackable>true</IsPackable>
<PackageId>MathNet.Numerics.FSharp$(PackageIdSuffix)</PackageId>
<VersionPrefix>4.8.0</VersionPrefix>
<VersionPrefix>4.8.1</VersionPrefix>
<VersionSuffix></VersionSuffix>
<Title>Math.NET Numerics for F#$(TitleSuffix)</Title>
<Description>F# Modules for Math.NET Numerics, the numerical foundation of the Math.NET project, aiming to provide methods and algorithms for numerical computations in science, engineering and every day use. Supports .Net Framework 4.5 or higher and .Net Standard 1.6 or higher, on Windows, Linux and Mac.$(DescriptionSuffix)</Description>
<PackageReleaseNotes>Optimization: Levenberg-Marquardt, Trust-Region Dogleg ~Jong Hyun Kim
Optimization: Nelder-Mead-Simplex: Improve convergence for symmetrical functions ~Erik Ovegard
BUG: Optimization: Nelder-Mead-Simplex did not return the best evaluated point in some cases ~Eric Scott Salem
Factorial: first 170 values now constant (data segment) instead of precomputed on first use ~Portalez Regis
Window Functions: Tukey window ~Marco Ross</PackageReleaseNotes>
<PackageReleaseNotes>Packaging fix - signed edition was not properly strong named.</PackageReleaseNotes>
<PackageTags>fsharp F# math numeric statistics probability integration interpolation regression solve fit linear algebra matrix fft</PackageTags>
<IsTool>false</IsTool>
<NeutralLanguage>en</NeutralLanguage>

6
src/Numerics.Tests/Properties/AssemblyInfo.cs
View File

@ -9,8 +9,8 @@ using MathNet.Numerics.UnitTests;
[assembly: ComVisible(false)]
[assembly: Guid("04157581-63f3-447b-a277-83c6e69126a4")]
[assembly: AssemblyVersion("4.8.0.0")]
[assembly: AssemblyFileVersion("4.8.0.0")]
[assembly: AssemblyInformationalVersion("4.8.0")]
[assembly: AssemblyVersion("4.8.1.0")]
[assembly: AssemblyFileVersion("4.8.1.0")]
[assembly: AssemblyInformationalVersion("4.8.1")]
[assembly: UseLinearAlgebraProvider]

8
src/Numerics/Numerics.csproj
View File

@ -7,15 +7,11 @@
<RootNamespace>MathNet.Numerics</RootNamespace>
<IsPackable>true</IsPackable>
<PackageId>MathNet.Numerics$(PackageIdSuffix)</PackageId>
<VersionPrefix>4.8.0</VersionPrefix>
<VersionPrefix>4.8.1</VersionPrefix>
<VersionSuffix></VersionSuffix>
<Title>Math.NET Numerics$(TitleSuffix)</Title>
<Description>Math.NET Numerics is the numerical foundation of the Math.NET project, aiming to provide methods and algorithms for numerical computations in science, engineering and every day use. Supports .Net Framework 4.0 or higher and .Net Standard 1.3 or higher, on Windows, Linux and Mac.$(DescriptionSuffix)</Description>
<PackageReleaseNotes>Optimization: Levenberg-Marquardt, Trust-Region Dogleg ~Jong Hyun Kim
Optimization: Nelder-Mead-Simplex: Improve convergence for symmetrical functions ~Erik Ovegard
BUG: Optimization: Nelder-Mead-Simplex did not return the best evaluated point in some cases ~Eric Scott Salem
Factorial: first 170 values now constant (data segment) instead of precomputed on first use ~Portalez Regis
Window Functions: Tukey window ~Marco Ross</PackageReleaseNotes>
<PackageReleaseNotes>Packaging fix - signed edition was not properly strong named.</PackageReleaseNotes>
<PackageTags>math numeric statistics probability integration interpolation regression solve fit linear algebra matrix fft</PackageTags>
<IsTool>false</IsTool>
<NeutralLanguage>en</NeutralLanguage>

4
src/TestData/Properties/AssemblyInfo.cs
View File

@ -14,5 +14,5 @@ using System.Runtime.InteropServices;
[assembly: Guid("a4a6a08e-5265-4608-a43d-e4f2e210ba2d")]
[assembly: AssemblyVersion("4.8.0.0")]
[assembly: AssemblyFileVersion("4.8.0.0")]
[assembly: AssemblyVersion("4.8.1.0")]
[assembly: AssemblyFileVersion("4.8.1.0")]

Write Preview
Loading…
Cancel
Save