Mentions légales du service
Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Chameleon
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Operate
Environments
Terraform modules
Monitor
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
solverstack
Chameleon
Commits
e6bb66c8
Commit
e6bb66c8
authored
5 months ago
by
Mathieu Faverge
Browse files
Options
Downloads
Patches
Plain Diff
control: Add a copy of the defines as integer to silent the warning on the switch case
parent
465d34b5
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!492
Fix pedantic compilation warnings
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
control/descriptor.c
+4
-4
4 additions, 4 deletions
control/descriptor.c
include/chameleon/constants.h
+7
-0
7 additions, 0 deletions
include/chameleon/constants.h
with
11 additions
and
4 deletions
control/descriptor.c
+
4
−
4
View file @
e6bb66c8
...
@@ -19,7 +19,7 @@
...
@@ -19,7 +19,7 @@
* @author Raphael Boucherie
* @author Raphael Boucherie
* @author Samuel Thibault
* @author Samuel Thibault
* @author Lionel Eyraud-Dubois
* @author Lionel Eyraud-Dubois
* @date 202
3-07-06
* @date 202
4-10-18
*
*
***
***
*
*
...
@@ -295,7 +295,7 @@ int chameleon_desc_init_internal( CHAM_desc_t *desc, const char *name, void *mat
...
@@ -295,7 +295,7 @@ int chameleon_desc_init_internal( CHAM_desc_t *desc, const char *name, void *mat
desc
->
ooc
=
0
;
desc
->
ooc
=
0
;
switch
(
(
intptr_t
)
mat
)
{
switch
(
(
intptr_t
)
mat
)
{
case
(
intptr_t
)
CHAMELEON_MAT_ALLOC_TILE
:
case
CHAMELEON_MAT_
CASE_
ALLOC_TILE
:
if
(
chamctxt
->
scheduler
==
RUNTIME_SCHED_STARPU
)
{
if
(
chamctxt
->
scheduler
==
RUNTIME_SCHED_STARPU
)
{
/* Let's use the allocation on the fly as in OOC */
/* Let's use the allocation on the fly as in OOC */
desc
->
get_blkaddr
=
chameleon_getaddr_null
;
desc
->
get_blkaddr
=
chameleon_getaddr_null
;
...
@@ -305,13 +305,13 @@ int chameleon_desc_init_internal( CHAM_desc_t *desc, const char *name, void *mat
...
@@ -305,13 +305,13 @@ int chameleon_desc_init_internal( CHAM_desc_t *desc, const char *name, void *mat
/* Otherwise we switch back to the full allocation */
/* Otherwise we switch back to the full allocation */
chameleon_attr_fallthrough
;
chameleon_attr_fallthrough
;
case
(
intptr_t
)
CHAMELEON_MAT_ALLOC_GLOBAL
:
case
CHAMELEON_MAT_
CASE_
ALLOC_GLOBAL
:
rc
=
chameleon_desc_mat_alloc
(
desc
);
rc
=
chameleon_desc_mat_alloc
(
desc
);
desc
->
alloc_mat
=
1
;
desc
->
alloc_mat
=
1
;
desc
->
use_mat
=
1
;
desc
->
use_mat
=
1
;
break
;
break
;
case
(
intptr_t
)
CHAMELEON_MAT_OOC
:
case
CHAMELEON_MAT_
CASE_
OOC
:
if
(
chamctxt
->
scheduler
!=
RUNTIME_SCHED_STARPU
)
{
if
(
chamctxt
->
scheduler
!=
RUNTIME_SCHED_STARPU
)
{
chameleon_error
(
"CHAMELEON_Desc_Create"
,
"CHAMELEON Out-of-Core descriptors are supported only with StarPU"
);
chameleon_error
(
"CHAMELEON_Desc_Create"
,
"CHAMELEON Out-of-Core descriptors are supported only with StarPU"
);
return
CHAMELEON_ERR_NOT_SUPPORTED
;
return
CHAMELEON_ERR_NOT_SUPPORTED
;
...
...
This diff is collapsed.
Click to expand it.
include/chameleon/constants.h
+
7
−
0
View file @
e6bb66c8
...
@@ -353,6 +353,13 @@ typedef enum chameleon_translation_e {
...
@@ -353,6 +353,13 @@ typedef enum chameleon_translation_e {
#define CHAMELEON_MAT_ALLOC_TILE ((void*)-1)
#define CHAMELEON_MAT_ALLOC_TILE ((void*)-1)
#define CHAMELEON_MAT_OOC ((void*)-2)
#define CHAMELEON_MAT_OOC ((void*)-2)
/**
* @brief Integer constant matching the previous ones for case values
*/
#define CHAMELEON_MAT_CASE_ALLOC_GLOBAL 0
#define CHAMELEON_MAT_CASE_ALLOC_TILE -1
#define CHAMELEON_MAT_CASE_OOC -2
/**
/**
* CHAMELEON constants - success & error codes
* CHAMELEON constants - success & error codes
*/
*/
...
...
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