Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
T
TensorJoseph
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Package registry
Model registry
Operate
Terraform modules
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Camille Coti
TensorJoseph
Commits
0cb02798
Commit
0cb02798
authored
5 years ago
by
Camille Coti
Browse files
Options
Downloads
Patches
Plain Diff
Typo in the addslave version
parent
385d2478
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/mw_addslave.cpp
+0
-1
0 additions, 1 deletion
src/mw_addslave.cpp
src/utils_parall.cpp
+3
-2
3 additions, 2 deletions
src/utils_parall.cpp
src/utils_parall.h
+1
-1
1 addition, 1 deletion
src/utils_parall.h
with
4 additions
and
4 deletions
src/mw_addslave.cpp
+
0
−
1
View file @
0cb02798
...
...
@@ -92,7 +92,6 @@ gi::ex multiply_1level_master_addslave( tensor3D_t& T, matrix_int_t& J, unsigned
/* Send more work */
send_work_addslave
(
input
,
results
,
src
);
}
else
{
std
::
cerr
<<
"Wrong tag received "
<<
status
.
MPI_TAG
<<
std
::
endl
;
}
...
...
This diff is collapsed.
Click to expand it.
src/utils_parall.cpp
+
3
−
2
View file @
0cb02798
...
...
@@ -151,15 +151,16 @@ void send_expressions_to_add( std::vector<std::string>& results, int peer ) {
/* M -> W: Send either a set of expressions to add, or the end signal */
void
send_add_or_end_addslave
(
std
::
vector
<
std
::
string
>
results
,
int
peer
,
int
*
running
){
void
send_add_or_end_addslave
(
std
::
vector
<
std
::
string
>
&
results
,
int
peer
,
int
*
running
){
/* Do I have a lot of results to be treated in the result queue? */
if
(
results
.
size
()
>
MAXRESULT
)
{
/* if the result queue is too big, send it */
send_expressions_to_add
(
results
,
peer
);
}
else
{
send_end
(
peer
);
(
*
running
)
--
;
(
*
running
)
--
;
}
}
...
...
This diff is collapsed.
Click to expand it.
src/utils_parall.h
+
1
−
1
View file @
0cb02798
...
...
@@ -35,7 +35,7 @@ void send_work( std::vector<parameters_t>& input, int peer, MPI_Comm comm = MPI_
void
send_work
(
std
::
vector
<
parameters_2_t
>&
input
,
int
peer
,
MPI_Comm
comm
=
MPI_COMM_WORLD
);
void
send_expressions_to_add
(
std
::
vector
<
std
::
string
>&
,
int
);
void
send_add_or_end_addslave
(
std
::
vector
<
std
::
string
>
,
int
,
int
*
);
void
send_add_or_end_addslave
(
std
::
vector
<
std
::
string
>
&
,
int
,
int
*
);
void
send_work_addslave
(
std
::
vector
<
parameters_t
>&
,
std
::
vector
<
std
::
string
>&
,
int
)
;
void
send_result
(
gi
::
ex
T
,
MPI_Comm
comm
=
MPI_COMM_WORLD
);
void
send_end
(
int
peer
,
MPI_Comm
comm
=
MPI_COMM_WORLD
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment