Skip to content

Commit cd97b84

Browse files
SerafeimBakalakosSerafeimBakalakos
authored
Merge pull request #31 from SerafeimBakalakos/develop
Unified distributed vectors/matrices with the rest. No more IGlobalVector, IGlobalMatrix
2 parents f49bebd + 768d92a commit cd97b84

40 files changed

+1850
-414
lines changed

‎MGroup.LinearAlgebra.local_dev.sln‎

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
2+
Microsoft Visual Studio Solution File, Format Version 12.00
3+
# Visual Studio Version 17
4+
VisualStudioVersion = 17.1.32414.318
5+
MinimumVisualStudioVersion = 10.0.40219.1
6+
7+
# ------------------------
8+
# Local Dev Solution File
9+
# ------------------------
10+
# This solution includes external repo dependencies as project references. It is for cross-repo development.
11+
# DO NOT use it for publishing or CI/CD.
12+
# DO NOT COMMIT new code under "dependencies". They are read-only links.
13+
# It includes local project references to the projects:
14+
# - MGroup.Environments
15+
# -------------------------------------------------------------
16+
17+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{960E247E-1475-45BD-8D46-26D3D0677FDA}"
18+
EndProject
19+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{D4252C12-DA3E-4A75-982F-96F9B1603D47}"
20+
EndProject
21+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MGroup.LinearAlgebra", "src\MGroup.LinearAlgebra\MGroup.LinearAlgebra.csproj", "{5B690CA8-85EA-4506-96F9-8BBCA3295966}"
22+
EndProject
23+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MGroup.LinearAlgebra.Tests", "tests\MGroup.LinearAlgebra.Tests\MGroup.LinearAlgebra.Tests.csproj", "{CB28CCAA-76FE-4036-9A11-006F17F5242B}"
24+
EndProject
25+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MGroup.LinearAlgebra.Distributed", "src\MGroup.LinearAlgebra.Distributed\MGroup.LinearAlgebra.Distributed.csproj", "{65C1B9BB-D10A-4F3B-BEDC-7642735491BD}"
26+
EndProject
27+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MGroup.LinearAlgebra.Distributed.Tests", "tests\MGroup.LinearAlgebra.Distributed.Tests\MGroup.LinearAlgebra.Distributed.Tests.csproj", "{0C609D6B-D2CC-4EF9-B1AF-734ABCC2DD4D}"
28+
EndProject
29+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MGroup.LinearAlgebra.Implementations.NativeWin64", "src\MGroup.LinearAlgebra.Implementations.NativeWin64\MGroup.LinearAlgebra.Implementations.NativeWin64.csproj", "{39B4152E-7E5E-480E-956E-CFA62A7FABE5}"
30+
EndProject
31+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "depend", "depend", "{02EA681E-C7D8-13C7-8484-4AC65E1B71E8}"
32+
EndProject
33+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MGroup.Environments", "..\Environments\src\MGroup.Environments\MGroup.Environments.csproj", "{826FD467-A574-5CB6-3EF5-52854C311BAF}"
34+
EndProject
35+
Global
36+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
37+
Debug|Any CPU = Debug|Any CPU
38+
Release|Any CPU = Release|Any CPU
39+
EndGlobalSection
40+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
41+
{5B690CA8-85EA-4506-96F9-8BBCA3295966}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
42+
{5B690CA8-85EA-4506-96F9-8BBCA3295966}.Debug|Any CPU.Build.0 = Debug|Any CPU
43+
{5B690CA8-85EA-4506-96F9-8BBCA3295966}.Release|Any CPU.ActiveCfg = Release|Any CPU
44+
{5B690CA8-85EA-4506-96F9-8BBCA3295966}.Release|Any CPU.Build.0 = Release|Any CPU
45+
{CB28CCAA-76FE-4036-9A11-006F17F5242B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
46+
{CB28CCAA-76FE-4036-9A11-006F17F5242B}.Debug|Any CPU.Build.0 = Debug|Any CPU
47+
{CB28CCAA-76FE-4036-9A11-006F17F5242B}.Release|Any CPU.ActiveCfg = Release|Any CPU
48+
{CB28CCAA-76FE-4036-9A11-006F17F5242B}.Release|Any CPU.Build.0 = Release|Any CPU
49+
{65C1B9BB-D10A-4F3B-BEDC-7642735491BD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
50+
{65C1B9BB-D10A-4F3B-BEDC-7642735491BD}.Debug|Any CPU.Build.0 = Debug|Any CPU
51+
{65C1B9BB-D10A-4F3B-BEDC-7642735491BD}.Release|Any CPU.ActiveCfg = Release|Any CPU
52+
{65C1B9BB-D10A-4F3B-BEDC-7642735491BD}.Release|Any CPU.Build.0 = Release|Any CPU
53+
{0C609D6B-D2CC-4EF9-B1AF-734ABCC2DD4D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
54+
{0C609D6B-D2CC-4EF9-B1AF-734ABCC2DD4D}.Debug|Any CPU.Build.0 = Debug|Any CPU
55+
{0C609D6B-D2CC-4EF9-B1AF-734ABCC2DD4D}.Release|Any CPU.ActiveCfg = Release|Any CPU
56+
{0C609D6B-D2CC-4EF9-B1AF-734ABCC2DD4D}.Release|Any CPU.Build.0 = Release|Any CPU
57+
{39B4152E-7E5E-480E-956E-CFA62A7FABE5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
58+
{39B4152E-7E5E-480E-956E-CFA62A7FABE5}.Debug|Any CPU.Build.0 = Debug|Any CPU
59+
{39B4152E-7E5E-480E-956E-CFA62A7FABE5}.Release|Any CPU.ActiveCfg = Release|Any CPU
60+
{39B4152E-7E5E-480E-956E-CFA62A7FABE5}.Release|Any CPU.Build.0 = Release|Any CPU
61+
{826FD467-A574-5CB6-3EF5-52854C311BAF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
62+
{826FD467-A574-5CB6-3EF5-52854C311BAF}.Debug|Any CPU.Build.0 = Debug|Any CPU
63+
{826FD467-A574-5CB6-3EF5-52854C311BAF}.Release|Any CPU.ActiveCfg = Release|Any CPU
64+
{826FD467-A574-5CB6-3EF5-52854C311BAF}.Release|Any CPU.Build.0 = Release|Any CPU
65+
EndGlobalSection
66+
GlobalSection(SolutionProperties) = preSolution
67+
HideSolutionNode = FALSE
68+
EndGlobalSection
69+
GlobalSection(NestedProjects) = preSolution
70+
{5B690CA8-85EA-4506-96F9-8BBCA3295966} = {960E247E-1475-45BD-8D46-26D3D0677FDA}
71+
{CB28CCAA-76FE-4036-9A11-006F17F5242B} = {D4252C12-DA3E-4A75-982F-96F9B1603D47}
72+
{65C1B9BB-D10A-4F3B-BEDC-7642735491BD} = {960E247E-1475-45BD-8D46-26D3D0677FDA}
73+
{0C609D6B-D2CC-4EF9-B1AF-734ABCC2DD4D} = {D4252C12-DA3E-4A75-982F-96F9B1603D47}
74+
{39B4152E-7E5E-480E-956E-CFA62A7FABE5} = {960E247E-1475-45BD-8D46-26D3D0677FDA}
75+
{826FD467-A574-5CB6-3EF5-52854C311BAF} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
76+
EndGlobalSection
77+
GlobalSection(ExtensibilityGlobals) = postSolution
78+
SolutionGuid = {0B549AB6-C402-4735-9A77-2FC85C81C393}
79+
EndGlobalSection
80+
EndGlobal

‎azure-pipelines.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ steps:
3939
displayName: "Restore nugets"
4040
inputs:
4141
command: 'restore'
42+
projects: 'MGroup.LinearAlgebra.sln'
4243
verbosityRestore: 'Normal'
4344
feedsToUse: 'config'
4445
nugetConfigPath: 'NuGet.Config'
@@ -62,6 +63,7 @@ steps:
6263
displayName: "Build projects"
6364
inputs:
6465
command: 'build'
66+
projects: 'MGroup.LinearAlgebra.sln'
6567
arguments: '--no-restore --nologo --configuration $(buildConfiguration) /p:AssemblyVersion=$(GitVersion.AssemblySemVer) /p:Version=$(GitVersion.SemVer) /p:SourceLinkCreate=true'
6668
versioningScheme: 'byEnvVar'
6769
versionEnvVar: 'GitVersion.AssemblySemVer'

‎src/MGroup.LinearAlgebra.Distributed/MGroup.LinearAlgebra.Distributed.csproj‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,24 @@
1111
<RunAnalyzersDuringLiveAnalysis>False</RunAnalyzersDuringLiveAnalysis>
1212
</PropertyGroup>
1313

14+
<!-- Import the global props file for development on local machines-->
15+
<Import Project="..\..\..\Directory.Build.props" Condition="Exists('..\..\..\Directory.Build.props')" />
16+
<PropertyGroup>
17+
<UseLocalMSolveProjects Condition="'$(UseLocalMSolveProjects)' == ''">false</UseLocalMSolveProjects>
18+
</PropertyGroup>
19+
1420
<ItemGroup>
15-
<PackageReference Include="MGroup.Environments" Version="0.2.0-unstable.12" />
1621
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
1722
</ItemGroup>
1823

24+
<ItemGroup Condition="'$(UseLocalMSolveProjects)' == 'false'">
25+
<PackageReference Include="MGroup.Environments" Version="0.2.0-unstable.12" />
26+
</ItemGroup>
27+
28+
<ItemGroup Condition="'$(UseLocalMSolveProjects)' == 'true'">
29+
<ProjectReference Include="..\..\..\Environments\src\MGroup.Environments\MGroup.Environments.csproj" />
30+
</ItemGroup>
31+
1932
<ItemGroup>
2033
<ProjectReference Include="..\MGroup.LinearAlgebra\MGroup.LinearAlgebra.csproj" />
2134
</ItemGroup>

0 commit comments

Comments
 (0)