diff --git a/build.fsx b/build.fsx index 83a835b8..3afcf2b4 100644 --- a/build.fsx +++ b/build.fsx @@ -345,14 +345,16 @@ Target "ApplyVersion" (fun _ -> patchVersionInResource "src/NativeProviders/OpenBLAS/resource.rc" openBlasRelease) Target "DotnetRestore" (fun _ -> - DotNetCli.Restore (fun p -> - { p with - Project = "MathNet.Numerics.sln" - NoCache = false }) - DotNetCli.Restore (fun p -> - { p with - Project = "MathNet.Numerics.Data.sln" - NoCache = false })) + restore "MathNet.Numerics.sln" + restore "MathNet.Numerics.Data.sln") + //DotNetCli.Restore (fun p -> + // { p with + // Project = "MathNet.Numerics.sln" + // NoCache = false }) + //DotNetCli.Restore (fun p -> + // { p with + // Project = "MathNet.Numerics.Data.sln" + // NoCache = false })) Target "Prepare" DoNothing "Start" @@ -366,21 +368,22 @@ Target "Prepare" DoNothing // BUILD // -------------------------------------------------------------------------------------- -let dotnetBuild configuration solution = DotNetCli.Build (fun p -> - { p with - Project = solution - Configuration = configuration - AdditionalArgs = ["--no-restore"]}) +//let dotnetBuild configuration solution = DotNetCli.Build (fun p -> +// { p with +// Project = solution +// Configuration = configuration +// AdditionalArgs = ["--no-restore"]}) Target "BuildMain" (fun _ -> - // dotnetBuild "Release" "MathNet.Numerics.sln" - MSBuildHelper.build (fun p -> - { p with - Targets = [ (if hasBuildParam "incremental" then "Build" else "Rebuild") ] - Properties = [ "Configuration", "Release" ] - RestorePackagesFlag = false - Verbosity = Some MSBuildVerbosity.Minimal - }) "MathNet.Numerics.sln") + build "MathNet.Numerics.sln") + + //MSBuildHelper.build (fun p -> + // { p with + // Targets = [ (if hasBuildParam "incremental" then "Build" else "Rebuild") ] + // Properties = [ "Configuration", "Release" ] + // RestorePackagesFlag = false + // Verbosity = Some MSBuildVerbosity.Minimal + // }) "MathNet.Numerics.sln") //MSBuild "" (if hasBuildParam "incremental" then "Build" else "Rebuild") [ "Configuration", "Release" ] (!!"MathNet.Numerics.sln") |> ignore) //Target "BuildSigned" (fun _ -> dotnetBuild "Release-StrongName" "MathNet.Numerics.sln") @@ -390,7 +393,7 @@ Target "Build" DoNothing //=?> ("BuildSigned", hasBuildParam "signed" || hasBuildParam "release") ==> "Build" -Target "DataBuild" (fun _ -> dotnetBuild "Release" "MathNet.Numerics.Data.sln") +Target "DataBuild" (fun _ -> build "MathNet.Numerics.Data.sln") "Prepare" ==> "DataBuild" Target "MklWin32Build" (fun _ -> buildConfig32 "Release-MKL" !! "MathNet.Numerics.NativeProviders.sln") diff --git a/build/build-framework.fsx b/build/build-framework.fsx index 2581f37c..a4a26f95 100644 --- a/build/build-framework.fsx +++ b/build/build-framework.fsx @@ -132,9 +132,23 @@ let patchVersionInProjectFile path (release:Release) = // BUILD // -------------------------------------------------------------------------------------- -let buildConfig config subject = MSBuild "" (if hasBuildParam "incremental" then "Build" else "Rebuild") [ "Configuration", config ] subject |> ignore -let build subject = buildConfig "Release" subject -let buildSigned subject = buildConfig "Release-Signed" subject +let msbuild targets project = + MSBuildHelper.build (fun p -> + { p with + NoLogo = true + NodeReuse = true + Targets = targets + Properties = [ "Configuration", "Release" ] + RestorePackagesFlag = false + Verbosity = Some MSBuildVerbosity.Minimal + }) project + +let restore project = msbuild [ "Restore" ] project +let build project = msbuild [ (if hasBuildParam "incremental" then "Build" else "Rebuild") ] project + +//let buildConfig config subject = MSBuild "" (if hasBuildParam "incremental" then "Build" else "Rebuild") [ "Configuration", config ] subject |> ignore +//let build subject = buildConfig "Release" subject +//let buildSigned subject = buildConfig "Release-Signed" subject let buildConfig32 config subject = MSBuild "" (if hasBuildParam "incremental" then "Build" else "Rebuild") [("Configuration", config); ("Platform","Win32")] subject |> ignore let buildConfig64 config subject = MSBuild "" (if hasBuildParam "incremental" then "Build" else "Rebuild") [("Configuration", config); ("Platform","x64")] subject |> ignore diff --git a/src/UnitTests/RootFindingTests/BroydenTest.cs b/src/UnitTests/RootFindingTests/BroydenTest.cs index bd35cfde..34e75a59 100644 --- a/src/UnitTests/RootFindingTests/BroydenTest.cs +++ b/src/UnitTests/RootFindingTests/BroydenTest.cs @@ -2626,20 +2626,20 @@ namespace MathNet.Numerics.UnitTests.RootFindingTests Assert.AreEqual(1.08137588467567, r[11], 1e-5); Assert.AreEqual(1.06683987591090, r[12], 1e-5); Assert.AreEqual(1.04952829661125, r[13], 1e-5); - Assert.AreEqual(0, fa1(r)[0], 1e-12); - Assert.AreEqual(0, fa1(r)[1], 1e-12); - Assert.AreEqual(0, fa1(r)[2], 1e-12); - Assert.AreEqual(0, fa1(r)[3], 1e-12); - Assert.AreEqual(0, fa1(r)[4], 1e-12); - Assert.AreEqual(0, fa1(r)[5], 1e-12); - Assert.AreEqual(0, fa1(r)[6], 1e-12); - Assert.AreEqual(0, fa1(r)[7], 1e-12); - Assert.AreEqual(0, fa1(r)[8], 1e-12); - Assert.AreEqual(0, fa1(r)[9], 1e-12); - Assert.AreEqual(0, fa1(r)[10], 1e-12); + Assert.AreEqual(0, fa1(r)[0], 1e-10); + Assert.AreEqual(0, fa1(r)[1], 1e-10); + Assert.AreEqual(0, fa1(r)[2], 1e-10); + Assert.AreEqual(0, fa1(r)[3], 1e-10); + Assert.AreEqual(0, fa1(r)[4], 1e-10); + Assert.AreEqual(0, fa1(r)[5], 1e-10); + Assert.AreEqual(0, fa1(r)[6], 1e-10); + Assert.AreEqual(0, fa1(r)[7], 1e-10); + Assert.AreEqual(0, fa1(r)[8], 1e-10); + Assert.AreEqual(0, fa1(r)[9], 1e-10); + Assert.AreEqual(0, fa1(r)[10], 1e-10); Assert.AreEqual(0, fa1(r)[11], 1e-10); Assert.AreEqual(0, fa1(r)[12], 1e-10); - Assert.AreEqual(0, fa1(r)[13], 1e-11); + Assert.AreEqual(0, fa1(r)[13], 1e-10); } ///