Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Chameleon
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
Operations
Operations
Incidents
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
AGULLO Emmanuel
Chameleon
Commits
a5069068
Commit
a5069068
authored
Sep 17, 2015
by
THIBAULT Samuel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename distributed_size/rank into comm_size/rank, and use RUNTIME_barrier
instead of introducing RUNTIME_distributed_barrier
parent
91e7e27a
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
30 additions
and
40 deletions
+30
-40
control/control.c
control/control.c
+19
-9
control/descriptor.c
control/descriptor.c
+3
-3
example/lapack_to_morse/step6.c
example/lapack_to_morse/step6.c
+1
-1
include/runtime.h
include/runtime.h
+2
-3
runtime/quark/control/runtime_control.c
runtime/quark/control/runtime_control.c
+2
-10
runtime/starpu/control/runtime_control.c
runtime/starpu/control/runtime_control.c
+2
-13
timing/timing.c
timing/timing.c
+1
-1
No files found.
control/control.c
View file @
a5069068
...
...
@@ -143,7 +143,7 @@ int MORSE_Finalize(void)
magma_finalize
();
#endif
morse_context_destroy
();
RUNTIME_
distributed_barrier
(
);
RUNTIME_
barrier
(
morse
);
#if defined(CHAMELEON_USE_MPI)
if
(
!
morse
->
mpi_outer_init
)
MPI_Finalize
();
...
...
@@ -213,7 +213,12 @@ int MORSE_Resume(void)
*****************************************************************************/
int
MORSE_Distributed_start
(
void
)
{
RUNTIME_distributed_barrier
();
MORSE_context_t
*
morse
=
morse_context_self
();
if
(
morse
==
NULL
)
{
morse_error
(
"MORSE_Finalize()"
,
"MORSE not initialized"
);
return
MORSE_ERR_NOT_INITIALIZED
;
}
RUNTIME_barrier
(
morse
);
return
MORSE_SUCCESS
;
}
...
...
@@ -231,7 +236,12 @@ int MORSE_Distributed_start(void)
*****************************************************************************/
int
MORSE_Distributed_stop
(
void
)
{
RUNTIME_distributed_barrier
();
MORSE_context_t
*
morse
=
morse_context_self
();
if
(
morse
==
NULL
)
{
morse_error
(
"MORSE_Finalize()"
,
"MORSE not initialized"
);
return
MORSE_ERR_NOT_INITIALIZED
;
}
RUNTIME_barrier
(
morse
);
return
MORSE_SUCCESS
;
}
...
...
@@ -239,7 +249,7 @@ int MORSE_Distributed_stop(void)
*
* @ingroup Control
*
* MORSE_
Distributed
_size - Return the size of the distributed computation
* MORSE_
Comm
_size - Return the size of the distributed computation
*
******************************************************************************
*
...
...
@@ -247,9 +257,9 @@ int MORSE_Distributed_stop(void)
* \retval MORSE_SUCCESS successful exit
*
*****************************************************************************/
int
MORSE_
Distributed
_size
(
int
*
size
)
int
MORSE_
Comm
_size
(
int
*
size
)
{
RUNTIME_
distributed
_size
(
size
);
RUNTIME_
comm
_size
(
size
);
return
MORSE_SUCCESS
;
}
...
...
@@ -257,7 +267,7 @@ int MORSE_Distributed_size( int *size )
*
* @ingroup Control
*
* MORSE_
Distributed
_rank - Return the rank of the distributed computation
* MORSE_
Comm
_rank - Return the rank of the distributed computation
*
******************************************************************************
*
...
...
@@ -265,8 +275,8 @@ int MORSE_Distributed_size( int *size )
* \retval MORSE_SUCCESS successful exit
*
*****************************************************************************/
int
MORSE_
Distributed
_rank
(
int
*
rank
)
int
MORSE_
Comm
_rank
(
int
*
rank
)
{
RUNTIME_
distributed
_rank
(
rank
);
RUNTIME_
comm
_rank
(
rank
);
return
MORSE_SUCCESS
;
}
control/descriptor.c
View file @
a5069068
...
...
@@ -77,7 +77,7 @@ MORSE_desc_t morse_desc_init(MORSE_enum dtyp, int mb, int nb, int bsiz,
desc
.
alloc_mat
=
1
;
desc
.
register_mat
=
1
;
RUNTIME_
distributed
_rank
(
&
(
desc
.
myrank
)
);
RUNTIME_
comm
_rank
(
&
(
desc
.
myrank
)
);
// Grid size
desc
.
p
=
p
;
...
...
@@ -162,7 +162,7 @@ MORSE_desc_t morse_desc_init_diag(MORSE_enum dtyp, int mb, int nb, int bsiz,
desc
.
alloc_mat
=
1
;
desc
.
register_mat
=
1
;
RUNTIME_
distributed
_rank
(
&
(
desc
.
myrank
)
);
RUNTIME_
comm
_rank
(
&
(
desc
.
myrank
)
);
// Grid size
desc
.
p
=
p
;
...
...
@@ -250,7 +250,7 @@ MORSE_desc_t morse_desc_init_user(MORSE_enum dtyp, int mb, int nb, int bsiz,
desc
.
alloc_mat
=
1
;
desc
.
register_mat
=
1
;
RUNTIME_
distributed
_rank
(
&
(
desc
.
myrank
)
);
RUNTIME_
comm
_rank
(
&
(
desc
.
myrank
)
);
// Grid size
desc
.
p
=
p
;
...
...
example/lapack_to_morse/step6.c
View file @
a5069068
...
...
@@ -110,7 +110,7 @@ int main(int argc, char *argv[]) {
MORSE_Set
(
MORSE_INNER_BLOCK_SIZE
,
iparam
[
IPARAM_IB
]
);
#if defined(CHAMELEON_USE_MPI)
MORSE_
Distributed
_size
(
&
NMPIPROC
);
MORSE_
Comm
_size
(
&
NMPIPROC
);
/* Check P */
if
(
(
iparam
[
IPARAM_P
]
>
1
)
&&
(
NMPIPROC
%
iparam
[
IPARAM_P
]
!=
0
)
)
{
...
...
include/runtime.h
View file @
a5069068
...
...
@@ -54,9 +54,8 @@ void RUNTIME_finalize_scheduler (MORSE_context_t*);
void
RUNTIME_barrier
(
MORSE_context_t
*
);
void
RUNTIME_pause
(
MORSE_context_t
*
);
void
RUNTIME_resume
(
MORSE_context_t
*
);
void
RUNTIME_distributed_rank
(
int
*
);
void
RUNTIME_distributed_size
(
int
*
);
void
RUNTIME_distributed_barrier
(
void
);
void
RUNTIME_comm_rank
(
int
*
);
void
RUNTIME_comm_size
(
int
*
);
/*******************************************************************************
* RUNTIME Descriptor
...
...
runtime/quark/control/runtime_control.c
View file @
a5069068
...
...
@@ -90,7 +90,7 @@ void RUNTIME_resume( MORSE_context_t *morse )
/*******************************************************************************
* This returns the rank of this process
**/
void
RUNTIME_
distributed
_rank
(
int
*
rank
)
void
RUNTIME_
comm
_rank
(
int
*
rank
)
{
*
rank
=
0
;
return
;
...
...
@@ -99,16 +99,8 @@ void RUNTIME_distributed_rank( int *rank )
/*******************************************************************************
* This returns the size of the distributed computation
**/
void
RUNTIME_
distributed
_size
(
int
*
size
)
void
RUNTIME_
comm
_size
(
int
*
size
)
{
*
size
=
1
;
return
;
}
/*******************************************************************************
* Barrier between processes of the distributed computation
**/
void
RUNTIME_distributed_barrier
(
void
)
{
return
;
}
runtime/starpu/control/runtime_control.c
View file @
a5069068
...
...
@@ -184,7 +184,7 @@ void RUNTIME_resume( MORSE_context_t *morse )
/*******************************************************************************
* This returns the rank of this process
**/
void
RUNTIME_
distributed
_rank
(
int
*
rank
)
void
RUNTIME_
comm
_rank
(
int
*
rank
)
{
#if defined(CHAMELEON_USE_MPI)
# if defined(HAVE_STARPU_MPI_RANK)
...
...
@@ -201,7 +201,7 @@ void RUNTIME_distributed_rank( int *rank )
/*******************************************************************************
* This returns the size of the distributed computation
**/
void
RUNTIME_
distributed
_size
(
int
*
size
)
void
RUNTIME_
comm
_size
(
int
*
size
)
{
#if defined(CHAMELEON_USE_MPI)
# if defined(HAVE_STARPU_MPI_RANK)
...
...
@@ -214,14 +214,3 @@ void RUNTIME_distributed_size( int *size )
#endif
return
;
}
/*******************************************************************************
* Barrier between processes of the distributed computation
**/
void
RUNTIME_distributed_barrier
(
void
)
{
#if defined(CHAMELEON_USE_MPI)
starpu_mpi_barrier
(
MPI_COMM_WORLD
);
#endif
return
;
}
timing/timing.c
View file @
a5069068
...
...
@@ -622,7 +622,7 @@ main(int argc, char *argv[]) {
MORSE_Enable
(
MORSE_ERRORS
);
#if defined(CHAMELEON_USE_MPI)
MORSE_
Distributed
_size
(
&
nbnode
);
MORSE_
Comm
_size
(
&
nbnode
);
iparam
[
IPARAM_NMPI
]
=
nbnode
;
/* Check P */
if
(
(
iparam
[
IPARAM_P
]
>
1
)
&&
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment