Skip to content

Commit a1b14b1

Browse files
epsi1onepsi1on
committed
net45 support, csparse 3.5.0
1 parent c1eb78c commit a1b14b1

File tree

13 files changed

+31
-18
lines changed

13 files changed

+31
-18
lines changed

‎Samples/Examples.CSharp/Examples.CSharp.csproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,15 @@
1414
<TargetFrameworkProfile />
1515
</PropertyGroup>
1616
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
17-
<PlatformTarget>x64</PlatformTarget>
17+
<PlatformTarget>AnyCPU</PlatformTarget>
1818
<DebugSymbols>true</DebugSymbols>
1919
<DebugType>full</DebugType>
2020
<Optimize>false</Optimize>
2121
<OutputPath>bin\Debug\</OutputPath>
2222
<DefineConstants>DEBUG;TRACE</DefineConstants>
2323
<ErrorReport>prompt</ErrorReport>
2424
<WarningLevel>4</WarningLevel>
25+
<Prefer32Bit>false</Prefer32Bit>
2526
</PropertyGroup>
2627
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
2728
<PlatformTarget>AnyCPU</PlatformTarget>

‎Samples/Samples.sln‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Controls", "..\Sources\Cont
1919
EndProject
2020
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CustomElements", "..\Sources\CustomElements\CustomElements.csproj", "{C967A85D-109B-4CB0-9E94-795D80C86A13}"
2121
EndProject
22+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CSparse.Interop", "..\Sources\csparse-interrupt\CSparse.Interop\CSparse.Interop.csproj", "{F931827B-356C-4581-97E8-AB8422451250}"
23+
EndProject
2224
Global
2325
GlobalSection(SolutionConfigurationPlatforms) = preSolution
2426
Debug|Any CPU = Debug|Any CPU
@@ -57,6 +59,10 @@ Global
5759
{C967A85D-109B-4CB0-9E94-795D80C86A13}.Debug|Any CPU.Build.0 = Debug|Any CPU
5860
{C967A85D-109B-4CB0-9E94-795D80C86A13}.Release|Any CPU.ActiveCfg = Release|Any CPU
5961
{C967A85D-109B-4CB0-9E94-795D80C86A13}.Release|Any CPU.Build.0 = Release|Any CPU
62+
{F931827B-356C-4581-97E8-AB8422451250}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
63+
{F931827B-356C-4581-97E8-AB8422451250}.Debug|Any CPU.Build.0 = Debug|Any CPU
64+
{F931827B-356C-4581-97E8-AB8422451250}.Release|Any CPU.ActiveCfg = Release|Any CPU
65+
{F931827B-356C-4581-97E8-AB8422451250}.Release|Any CPU.Build.0 = Release|Any CPU
6066
EndGlobalSection
6167
GlobalSection(SolutionProperties) = preSolution
6268
HideSolutionNode = FALSE

‎Sources/BriefFiniteElementNet/BriefFiniteElementNet.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net6.0;netstandard2.0</TargetFrameworks>
4+
<TargetFrameworks>net6.0;netstandard2.0;net45;</TargetFrameworks>
55
<AssemblyVersion>2.0.5</AssemblyVersion>
66
<FileVersion>2.0.5</FileVersion>
77

@@ -61,7 +61,7 @@
6161
</ItemGroup>
6262

6363
<ItemGroup>
64-
<PackageReference Include="CSparse" Version="3.4.9" />
64+
<PackageReference Include="CSparse" Version="3.5.0" />
6565
</ItemGroup>
6666

6767
<ItemGroup>

‎Sources/Common/Common.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net6.0;netstandard2.0</TargetFrameworks>
4+
<TargetFrameworks>net6.0;netstandard2.0;net45;</TargetFrameworks>
55
<AssemblyVersion>2.0.5</AssemblyVersion>
66
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
77
<GenerateDocumentationFile>false</GenerateDocumentationFile>
@@ -41,7 +41,7 @@
4141
</PropertyGroup>
4242

4343
<ItemGroup>
44-
<PackageReference Include="CSparse" Version="3.4.9" />
44+
<PackageReference Include="CSparse" Version="3.5.0" />
4545
</ItemGroup>
4646

4747
</Project>

‎Sources/Controls/Controls.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<ProjectGuid>{8DABDE62-8A8E-4153-B753-3A62015A9C16}</ProjectGuid>
4-
<TargetFrameworks>net471</TargetFrameworks>
4+
<TargetFrameworks>net48</TargetFrameworks>
55
<AssemblyVersion>2.0.5</AssemblyVersion>
66
<AssemblyTitle>BriefFiniteElement.Controls</AssemblyTitle>
77
<Product>BriefFiniteElement.Controls</Product>
@@ -21,7 +21,7 @@
2121
<DebugType>pdbonly</DebugType>
2222
</PropertyGroup>
2323
<ItemGroup>
24-
<PackageReference Include="CSparse" Version="3.4.9" />
24+
<PackageReference Include="CSparse" Version="3.5.0" />
2525
<PackageReference Include="HelixToolkit" Version="2.12.0" />
2626
<PackageReference Include="HelixToolkit.Wpf" Version="2.12.0" />
2727
<PackageReference Include="OxyPlot.Core" Version="2.0.0" />

‎Sources/CustomElements/CustomElements.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net6.0;netstandard2.0;</TargetFrameworks>
4+
<TargetFrameworks>net6.0;netstandard2.0;net45;</TargetFrameworks>
55
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
66
<GenerateDocumentationFile>false</GenerateDocumentationFile>
77
<PackageId>BriefFiniteElementNet.CustomElements</PackageId>
@@ -32,7 +32,7 @@
3232
</ItemGroup>
3333

3434
<ItemGroup>
35-
<PackageReference Include="CSparse" Version="3.4.9" />
35+
<PackageReference Include="CSparse" Version="3.5.0" />
3636
</ItemGroup>
3737

3838
<ItemGroup>

‎Sources/Legacy/Legacy.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net6.0;netstandard2.0;</TargetFrameworks>
4+
<TargetFrameworks>net6.0;netstandard2.0;net45;</TargetFrameworks>
55
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
66
<PackageId>BriefFiniteElement.Legacy</PackageId>
77
<Version>2.0.5</Version>

‎Sources/Solvers/CSparse.Interrupts/Interop/Constants.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ namespace CSparse.Interrupts.Interop
88
{
99
public static class NativeBinaryPathes
1010
{
11-
public const string MKL_DLL = @"C:\Program Files (x86)\Intel\oneAPI\mkl\2022.1.0\redist\intel64\mkl_rt.2.dll";
11+
public const string MKL_DLL = @"C:\Users\Administrator\Downloads\intelmkl.redist.win-x64.2022.0.3.171.nupkg\runtimes\win-x64\native\mkl_rt.2.dll";
1212
}
1313
}

‎Sources/Solvers/CSparse.Interrupts/Interop/MKL/Pardiso/PardisoContext.cs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,6 +230,7 @@ protected virtual int DoNumeric()
230230
/// </summary>
231231
protected virtual int DoFactorize()
232232
{
233+
/*
233234
using(var memstr=new System.IO.MemoryStream())
234235
{
235236
var rwtr = new StreamWriter(memstr);
@@ -242,7 +243,9 @@ protected virtual int DoFactorize()
242243
243244
var mtx = rdr.ReadToEnd();
244245
}
245-
246+
*/
247+
248+
246249
int n = matrix.ColumnCount;
247250
int nrhs = 1;
248251

‎Sources/Solvers/MklSolver.cs‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,6 @@ public class MklSolver : ISolver,IDisposable
1616

1717
public void Initialize()
1818
{
19-
var sb = new StringBuilder();
20-
int l = 100;
21-
22-
var ver = new CSparse.Interop.MKL.MKLVersion();
23-
2419
pardiso = new CSparse.Double.Factorization.MKL.Pardiso(A);
2520
pardiso.Factorize();
2621
IsInitialized = true;

0 commit comments

Comments
 (0)