diff --git a/RELEASENOTES-MKL.md b/RELEASENOTES-MKL.md index e422e854..ca194ff6 100644 --- a/RELEASENOTES-MKL.md +++ b/RELEASENOTES-MKL.md @@ -1,3 +1,7 @@ +### 1.8.0 - 2015-05-09 +* r8 with Intel MKL 11.2 Update 3 +* New combined NuGet package including both 32 and 64 bit builds and a proper build target (Win only) + ### 1.7.0 - 2014-12-31 * r7 with Intel MKL 11.2 Update 1 * memory functions *~Marcus Cuda* diff --git a/build.fsx b/build.fsx index 029ff957..5e96d2d6 100644 --- a/build.fsx +++ b/build.fsx @@ -737,6 +737,7 @@ let publishReleaseTag title prefix version notes = Target "PublishTag" (fun _ -> publishReleaseTag "Math.NET Numerics" "" packageVersion releaseNotes) Target "MklPublishTag" (fun _ -> publishReleaseTag "Math.NET Numerics MKL Provider" "mkl-" mklPackageVersion mklReleaseNotes) +Target "CudaPublishTag" (fun _ -> publishReleaseTag "Math.NET Numerics CUDA Provider" "cuda-" cudaPackageVersion cudaReleaseNotes) Target "DataPublishTag" (fun _ -> publishReleaseTag "Math.NET Numerics Data Extensions" "data-" dataPackageVersion dataReleaseNotes) Target "PublishMirrors" (fun _ -> @@ -780,6 +781,7 @@ let publishNuGet packageFiles = Target "PublishNuGet" (fun _ -> !! "out/packages/NuGet/*.nupkg" -- "out/packages/NuGet/*.symbols.nupkg" |> publishNuGet) Target "MklPublishNuGet" (fun _ -> !! "out/MKL/packages/NuGet/*.nupkg" |> publishNuGet) +Target "CudaPublishNuGet" (fun _ -> !! "out/CUDA/packages/NuGet/*.nupkg" |> publishNuGet) Target "DataPublishNuGet" (fun _ -> !! "out/Data/packages/NuGet/*.nupkg" |> publishNuGet) Target "Publish" DoNothing @@ -792,6 +794,10 @@ Target "MklPublish" DoNothing "MklPublishTag" ==> "MklPublish" "MklPublishNuGet" ==> "MklPublish" +Target "CudaPublish" DoNothing +"CudaPublishTag" ==> "CudaPublish" +"CudaPublishNuGet" ==> "CudaPublish" + Target "DataPublish" DoNothing "DataPublishTag" ==> "DataPublish" "DataPublishNuGet" ==> "DataPublish" diff --git a/src/NativeProviders/MKL/capabilities.cpp b/src/NativeProviders/MKL/capabilities.cpp index 99397f71..302f5c15 100644 --- a/src/NativeProviders/MKL/capabilities.cpp +++ b/src/NativeProviders/MKL/capabilities.cpp @@ -41,7 +41,7 @@ extern "C" { #endif // COMMON/SHARED - case 64: return 7; // revision + case 64: return 8; // revision case 65: return 1; // numerical consistency, precision and accuracy modes case 66: return 1; // threading control case 67: return 1; // memory management diff --git a/src/NativeProviders/MKL/resource.rc b/src/NativeProviders/MKL/resource.rc index 6604b1a7..bc1116f7 100644 --- a/src/NativeProviders/MKL/resource.rc +++ b/src/NativeProviders/MKL/resource.rc @@ -51,8 +51,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,7,0,0 - PRODUCTVERSION 1,7,0,0 + FILEVERSION 1,8,0,0 + PRODUCTVERSION 1,8,0,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -70,12 +70,12 @@ BEGIN VALUE "Comments", "http://numerics.mathdotnet.com/" VALUE "CompanyName", "Math.NET" VALUE "FileDescription", "MathNET Numerics MKL Native Provider" - VALUE "FileVersion", "1.7.0.0" + VALUE "FileVersion", "1.8.0.0" VALUE "InternalName", "Math.NET" VALUE "LegalCopyright", "Copyright (C) Math.NET 2009-2015" VALUE "OriginalFilename", "MathNet.Numerics.MKL" VALUE "ProductName", "Math.NET Numerics" - VALUE "ProductVersion", "1.7.0.0" + VALUE "ProductVersion", "1.8.0.0" END END BLOCK "VarFileInfo"