Skip to content

Бражников Е.А ЛР№1 Умножение плотных матриц. Элементы типа double. Блочная схема, алгоритм Фокса. #156

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Anorak52 wants to merge 11 commits into
base: master
Choose a base branch
from
Open

Бражников Е.А ЛР№1 Умножение плотных матриц. Элементы типа double. Блочная схема, алгоритм Фокса. #156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
0408623
18. Нахождение минимальных значений по столбцам матрицы
Anorak52 Oct 18, 2019
e3fe768
Create Gather.cpp
Anorak52 Nov 23, 2019
c0d35a1
Create Gather.cpp
Anorak52 Nov 23, 2019
1a58a48
Gather
Anorak52 Nov 23, 2019
dc97e6b
Update Gather(2).cpp
Anorak52 Nov 27, 2019
ebebc56
Create main.cpp
Anorak52 Dec 13, 2019
8f9847a
Seq ver of Fox Alg
Anorak52 Mar 23, 2020
a6e8116
Upd
Anorak52 Mar 31, 2020
7a9c3f3
Upd structure
Anorak52 May 7, 2020
f7631fb
Upd
Anorak52 May 18, 2020
7c66eb4
Delete dir
Anorak52 May 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 31 additions & 0 deletions 1706-4/brazhnikov_ea/SequentialFoxAlg/SeqAlgFox.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.29613.14
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SeqAlgFox", "SeqAlgFox.vcxproj", "{633A160D-96F2-4DD2-8654-E4731DC771DC}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{633A160D-96F2-4DD2-8654-E4731DC771DC}.Debug|x64.ActiveCfg = Debug|x64
{633A160D-96F2-4DD2-8654-E4731DC771DC}.Debug|x64.Build.0 = Debug|x64
{633A160D-96F2-4DD2-8654-E4731DC771DC}.Debug|x86.ActiveCfg = Debug|Win32
{633A160D-96F2-4DD2-8654-E4731DC771DC}.Debug|x86.Build.0 = Debug|Win32
{633A160D-96F2-4DD2-8654-E4731DC771DC}.Release|x64.ActiveCfg = Release|x64
{633A160D-96F2-4DD2-8654-E4731DC771DC}.Release|x64.Build.0 = Release|x64
{633A160D-96F2-4DD2-8654-E4731DC771DC}.Release|x86.ActiveCfg = Release|Win32
{633A160D-96F2-4DD2-8654-E4731DC771DC}.Release|x86.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {AEB3D1B8-09CA-423E-9F17-809549113563}
EndGlobalSection
EndGlobal
146 changes: 146 additions & 0 deletions 1706-4/brazhnikov_ea/SequentialFoxAlg/SeqAlgFox.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,146 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|x64">
<Configuration>Release</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<VCProjectVersion>16.0</VCProjectVersion>
<ProjectGuid>{633A160D-96F2-4DD2-8654-E4731DC771DC}</ProjectGuid>
<RootNamespace>SeqAlgFox</RootNamespace>
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v142</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v142</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v142</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v142</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Label="Shared">
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<LinkIncremental>true</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<LinkIncremental>false</LinkIncremental>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="Source.cpp" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
22 changes: 22 additions & 0 deletions 1706-4/brazhnikov_ea/SequentialFoxAlg/SeqAlgFox.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="Исходные файлы">
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
<Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
</Filter>
<Filter Include="Файлы заголовков">
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
<Extensions>h;hh;hpp;hxx;hm;inl;inc;ipp;xsd</Extensions>
</Filter>
<Filter Include="Файлы ресурсов">
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="Source.cpp">
<Filter>Файлы ресурсов</Filter>
</ClCompile>
</ItemGroup>
</Project>
4 changes: 4 additions & 0 deletions 1706-4/brazhnikov_ea/SequentialFoxAlg/SeqAlgFox.vcxproj.user
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup />
</Project>
129 changes: 129 additions & 0 deletions 1706-4/brazhnikov_ea/SequentialFoxAlg/Source.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,129 @@
#include <iostream>
#include <random>
#include <chrono> //����� �������

using namespace std;

void PrintMatrix(double* matrix, int N) {

int M = N;
for (int i = 0; i < N; i++) {
for (int j = 0; j < M; j++)
{
cout.width(3);
cout << matrix[i * M + j] << " ";
}
cout << endl;
}
cout << endl;
}

void MatrixCreate(double* A, double* B, int size) {
for (int i = 0; i < size * size; ++i) {
A[i] = rand() % 10 + 1;
B[i] = rand() % 10 + 1;
}
}

void SequentialAlgorithm(double* A, double* B, double* C, int size) {
for (int i = 0; i < size * size; ++i)
C[i] = 0;

double temp;
for (int i = 0; i < size; i++) {
for (int j = 0; j < size; j++) {
temp = 0;
for (int k = 0; k < size; k++)
temp += A[i * size + k] * B[k * size + j];
C[i * size + j] = temp;
}
}
}

void blockMatrixMult(double* A, double* B, double* C, int size)
{
int block_size = sqrt(size);

for (int i = 0; i < size * size; ++i)
C[i] = 0;

double temp;

for (int i = 0; i < size; i += block_size)
{
for (int j = 0; j < size; j += block_size)
{
for (int k = 0; k < size; k += block_size)
{
for (int a = i; a < min(size, i + block_size); a++)
{
for (int b = j; b < min(size, j + block_size); b++)
{
temp = 0;
for (int c = k; c < min(size, k + block_size); c++)
{
temp += A[a * size + c] * B[c * size + b];
}
C[a * size + b] += temp;
}
}
}
}
}
}

int main()
{
int size = 10;
double* A;
double* B;
double* CSeq;
double* CBlock;

A = new double[size * size];
B = new double[size * size];
CSeq = new double[size * size];
Copy link
Owner

@valentina-kustikova valentina-kustikova May 18, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Нигде не освобождается память из-под массивов.

CBlock = new double[size * size];

MatrixCreate(A, B, size);

if (size < 30) {
cout << "Matrix A" << endl;
cout << endl;
PrintMatrix(A, size);
cout << "Matrix B" << endl;
cout << endl;
PrintMatrix(B, size);
cout << "---------------------" << endl;
cout << endl;
}

auto begin = chrono::steady_clock::now();
SequentialAlgorithm(A, B, CSeq, size);
Copy link
Owner

@valentina-kustikova valentina-kustikova May 18, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Отсутствуют замеры времени.

auto end = std::chrono::steady_clock::now();

auto elapsed_ms = chrono::duration_cast<chrono::milliseconds>(end - begin);

cout << endl;
cout << "SeqAlgTime: " << elapsed_ms.count() << endl;

auto beginFox = chrono::steady_clock::now();
blockMatrixMult(A, B, CBlock, size);
auto endFox = std::chrono::steady_clock::now();
auto elapsed_msFox = chrono::duration_cast<chrono::milliseconds>(endFox - beginFox);

cout << endl;
cout << "Block multiplication time:" << elapsed_msFox.count() << endl;

if (size < 30) {
cout << endl;
cout << "Seq multiplication:" << endl;
PrintMatrix(CSeq, size);
cout << endl;
cout << "Block matrix multiplication:" << endl;
PrintMatrix(CBlock, size);
}

delete A, B, CSeq, CBlock;

}