-
Notifications
You must be signed in to change notification settings - Fork 49
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.
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
Бражников Е.А. ЛР№2 Умножение плотных матриц. Элементы типа double. Блочная схема, алгоритм Фокса. OpenMP. #148
Open
Anorak52
wants to merge
13
commits into
valentina-kustikova:master
Choose a base branch
from
Anorak52:Fox-Alg-OpenMP
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
13 commits
Select commit
Hold shift + click to select a range
0408623
18. Нахождение минимальных значений по столбцам матрицы
Anorak52 e3fe768
Create Gather.cpp
Anorak52 c0d35a1
Create Gather.cpp
Anorak52 1a58a48
Gather
Anorak52 dc97e6b
Update Gather(2).cpp
Anorak52 ebebc56
Create main.cpp
Anorak52 8f9847a
Seq ver of Fox Alg
Anorak52 a6e8116
Upd
Anorak52 96d5a08
OpenMP
Anorak52 8079238
Update structure
Anorak52 c85fee9
Fix stuff
Anorak52 2f21cf9
Fix stuff
Anorak52 4c8a9f0
Fix stuff
Anorak52 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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}") = "OpenMP", "OpenMP.vcxproj", "{1B1C8D32-78CD-45DF-9974-696CB25F6C82}" | ||
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 | ||
{1B1C8D32-78CD-45DF-9974-696CB25F6C82}.Debug|x64.ActiveCfg = Debug|x64 | ||
{1B1C8D32-78CD-45DF-9974-696CB25F6C82}.Debug|x64.Build.0 = Debug|x64 | ||
{1B1C8D32-78CD-45DF-9974-696CB25F6C82}.Debug|x86.ActiveCfg = Debug|Win32 | ||
{1B1C8D32-78CD-45DF-9974-696CB25F6C82}.Debug|x86.Build.0 = Debug|Win32 | ||
{1B1C8D32-78CD-45DF-9974-696CB25F6C82}.Release|x64.ActiveCfg = Release|x64 | ||
{1B1C8D32-78CD-45DF-9974-696CB25F6C82}.Release|x64.Build.0 = Release|x64 | ||
{1B1C8D32-78CD-45DF-9974-696CB25F6C82}.Release|x86.ActiveCfg = Release|Win32 | ||
{1B1C8D32-78CD-45DF-9974-696CB25F6C82}.Release|x86.Build.0 = Release|Win32 | ||
EndGlobalSection | ||
GlobalSection(SolutionProperties) = preSolution | ||
HideSolutionNode = FALSE | ||
EndGlobalSection | ||
GlobalSection(ExtensibilityGlobals) = postSolution | ||
SolutionGuid = {6C4D8EEB-51FE-4154-99E4-CDCA1A9EC6A1} | ||
EndGlobalSection | ||
EndGlobal |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,154 @@ | ||
<?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>{1B1C8D32-78CD-45DF-9974-696CB25F6C82}</ProjectGuid> | ||
<RootNamespace>OpenMP</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> | ||
<OpenMPSupport>true</OpenMPSupport> | ||
<AdditionalOptions>/Zc:twoPhase- %(AdditionalOptions)</AdditionalOptions> | ||
</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> | ||
<OpenMPSupport>true</OpenMPSupport> | ||
<AdditionalOptions>/Zc:twoPhase- %(AdditionalOptions)</AdditionalOptions> | ||
</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> | ||
<OpenMPSupport>true</OpenMPSupport> | ||
<AdditionalOptions>/Zc:twoPhase- %(AdditionalOptions)</AdditionalOptions> | ||
</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> | ||
<OpenMPSupport>true</OpenMPSupport> | ||
<AdditionalOptions>/Zc:twoPhase- %(AdditionalOptions)</AdditionalOptions> | ||
</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> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,167 @@ | ||
#include <iostream> | ||
#include <omp.h> | ||
#include <ctime> | ||
#include <random> | ||
|
||
using namespace std; | ||
|
||
void PrintMatrix(double* matrix, int N) { | ||
|
||
for (int i = 0; i < N; i++) { | ||
for (int j = 0; j < N; j++) | ||
{ | ||
cout.width(3); | ||
cout << matrix[i * N + j] << " "; | ||
} | ||
cout << endl; | ||
} | ||
cout << endl; | ||
} | ||
|
||
void MatrixCreate(double* A, double* B, double* C, double *CSeq, int size) { | ||
for (int i = 0; i < size * size; ++i) { | ||
A[i] = rand() % 10 + 1; | ||
B[i] = rand() % 10 + 1; | ||
C[i] = 0; | ||
CSeq[i] = 0; | ||
} | ||
} | ||
|
||
bool matComparison(double* A, double* B, int size) | ||
{ | ||
for (int i = 0; i < size; i++) { | ||
for (int j = 0; j < size; j++) | ||
{ | ||
if (A[i * size + j] != B[i * size + j]) | ||
return false; | ||
} | ||
} | ||
return true; | ||
} | ||
|
||
|
||
void Multiplication(double* Ablock, double* Bblock, double* Cblock, int _blockSize) | ||
{ | ||
double temp; | ||
for (int i = 0; i < _blockSize; i++) | ||
for (int j = 0; j < _blockSize; j++) { | ||
temp = 0; | ||
for (int k = 0; k < _blockSize; k++) | ||
temp += Ablock[i * _blockSize + k] * Bblock[k * _blockSize + j]; | ||
Cblock[i * _blockSize + j] += static_cast<int>(temp * 100) / 100; | ||
} | ||
} | ||
|
||
void SequentialAlgorithm(double* A, double* B, double* C, int size) { | ||
for (int i = 0; i < size * size; ++i) | ||
C[i] = 0; | ||
Multiplication(A, B, C, size); | ||
} | ||
|
||
void Fox(double* A, double* B, double* C, int size, int procNum) { | ||
int Grid = int(sqrt(procNum)); | ||
int BlockSize = size / Grid; | ||
omp_set_num_threads(procNum); | ||
#pragma omp parallel | ||
{ | ||
int numThreads = omp_get_thread_num(); | ||
int RowIndex = numThreads / Grid; | ||
int ColIndex = numThreads % Grid; | ||
for (int iter = 0; iter < Grid; iter++) | ||
{ | ||
for (int i = RowIndex * BlockSize; i < (RowIndex + 1) * BlockSize; i++) | ||
{ | ||
for (int j = ColIndex * BlockSize; j < (ColIndex + 1) * BlockSize; j++) | ||
{ | ||
for (int k = iter * BlockSize; k < (iter + 1) * BlockSize; k++) | ||
{ | ||
C[i * size + j] += A[i * size + k] * B[k * size + j]; | ||
} | ||
} | ||
} | ||
} | ||
} //pragma parallel | ||
} | ||
|
||
int main(int argc, char* argv[]) | ||
{ | ||
double* A; | ||
double* B; | ||
double* CSeq; | ||
double* CFox; | ||
int size, procNum; | ||
double StartFoxAlg = 0, FinFoxAlg = 0, StartSeqAlg = 0, FinSeqAlg = 0; //time | ||
|
||
cout << "input the size and then the procnun: " << endl; | ||
|
||
if (argc > 1) { | ||
size = atoi(argv[1]); | ||
procNum = atoi(argv[2]); | ||
} | ||
else { | ||
cout << "Input the size of matrix and then procnum: " << endl; | ||
cin >> size; | ||
cin >> procNum; | ||
} | ||
|
||
int BlockSize = int(sqrt(procNum)); | ||
|
||
if (BlockSize * BlockSize == procNum && size % BlockSize == 0) { | ||
|
||
|
||
//������������� | ||
A = new double[size * size]; | ||
B = new double[size * size]; | ||
CSeq = new double[size * size]; | ||
CFox = new double[size * size]; | ||
MatrixCreate(A, B, CFox, CSeq,size); | ||
// | ||
|
||
//����� �� ����� | ||
if (size < 30) { | ||
cout << "Matrix A" << endl; | ||
PrintMatrix(A, size); | ||
cout << "Matrix B" << endl; | ||
PrintMatrix(B, size); | ||
} | ||
// | ||
|
||
//FoxAlgPar | ||
if (procNum != 1) { | ||
StartFoxAlg = omp_get_wtime(); //omp_get_wtime (); | ||
Fox(A, B, CFox, size, procNum); | ||
FinFoxAlg = omp_get_wtime(); | ||
} | ||
// | ||
|
||
//FoxAlgSeq | ||
StartSeqAlg = omp_get_wtime(); //omp_get_wtime (); | ||
SequentialAlgorithm(A, B, CSeq, size); | ||
FinSeqAlg = omp_get_wtime(); | ||
// | ||
|
||
//����� �� ����� | ||
if (size < 30) { | ||
cout << "Parallel Alg " << endl; | ||
PrintMatrix(CFox, size); | ||
} | ||
if (size < 30) { | ||
cout << "Seq Alg " << endl; | ||
PrintMatrix(CSeq, size); | ||
} | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Надо сделать автоматическое поэлементное сравнение результатов работы последовательного и параллельного алгоритмов, а не просто вывод результатов. |
||
|
||
if (matComparison(CFox, CSeq, size)) | ||
cout << "Matrix identical\n" << endl; | ||
|
||
cout << "time of parallel alg is " << (FinFoxAlg - StartFoxAlg) << endl; | ||
cout << "time of seq alg is " << (FinSeqAlg - StartSeqAlg) << endl; | ||
// | ||
|
||
delete[] A, B, CSeq, CFox; | ||
} | ||
else | ||
{ | ||
cout << "Error" << endl; | ||
} | ||
|
||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Память из-под матриц нигде не освобождается.