Skip to content
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

Jump to bottom

romio,hwloc: fix type errors for x86 #12735

Open
wants to merge 1 commit into
base: v4.1.x
Choose a base branch
from
Open

romio,hwloc: fix type errors for x86 #12735

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions ompi/mca/io/romio321/romio/adio/include/adio.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,9 @@
#ifdef MPI_OFFSET_IS_INT
typedef int ADIO_Offset;
# define ADIO_OFFSET MPI_INT
#elif __SIZEOF_SIZE_T__ == 4
typedef long ADIO_Offset;
# define ADIO_OFFSET MPI_LONG
#elif defined(HAVE_LONG_LONG_64)
typedef long long ADIO_Offset;
# ifdef HAVE_MPI_LONG_LONG_INT
Expand Down
10 changes: 5 additions & 5 deletions opal/mca/pmix/pmix3x/pmix/src/hwloc/hwloc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ static bool external_topology = false;

#if HWLOC_API_VERSION >= 0x20000
static size_t shmemsize = 0;
static size_t shmemaddr;
static uintptr_t shmemaddr;
Copy link
Member

Choose a reason for hiding this comment

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

It looks like this value is serialized as a size_t down below. Can you investigate? I don't know where the corresponding deserialization occurs -- you might need to chase that down, too.

I didn't check further to see how the other variables that were converted to uintptr_t are used; those might need to be updated in their usage, too.

Copy link
Member

Choose a reason for hiding this comment

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

@nmorey Any update on this?

static char *shmemfile = NULL;
static int shmemfd = -1;

Expand All @@ -58,10 +58,10 @@ static int parse_map_line(const char *line,
pmix_hwloc_vm_map_kind_t *kindp);
static int use_hole(unsigned long holebegin,
unsigned long holesize,
unsigned long *addrp,
uintptr_t *addrp,
unsigned long size);
static int find_hole(pmix_hwloc_vm_hole_kind_t hkind,
size_t *addrp,
uintptr_t *addrp,
size_t size);
static int enough_space(const char *filename,
size_t space_req,
Expand Down Expand Up @@ -584,7 +584,7 @@ static int parse_map_line(const char *line,

static int use_hole(unsigned long holebegin,
unsigned long holesize,
unsigned long *addrp,
uintptr_t *addrp,
unsigned long size)
{
unsigned long aligned;
Expand Down Expand Up @@ -615,7 +615,7 @@ static int use_hole(unsigned long holebegin,
}

static int find_hole(pmix_hwloc_vm_hole_kind_t hkind,
size_t *addrp, size_t size)
uintptr_t *addrp, size_t size)
{
unsigned long biggestbegin = 0;
unsigned long biggestsize = 0;
Expand Down
10 changes: 5 additions & 5 deletions orte/mca/rtc/hwloc/rtc_hwloc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ orte_rtc_base_module_t orte_rtc_hwloc_module = {

#if HWLOC_API_VERSION >= 0x20000
static size_t shmemsize = 0;
static size_t shmemaddr;
static uintptr_t shmemaddr;
static char *shmemfile = NULL;
static int shmemfd = -1;

Expand All @@ -77,10 +77,10 @@ static int parse_map_line(const char *line,
orte_rtc_hwloc_vm_map_kind_t *kindp);
static int use_hole(unsigned long holebegin,
unsigned long holesize,
unsigned long *addrp,
uintptr_t *addrp,
unsigned long size);
static int find_hole(orte_rtc_hwloc_vm_hole_kind_t hkind,
size_t *addrp,
uintptr_t *addrp,
size_t size);
static int enough_space(const char *filename,
size_t space_req,
Expand Down Expand Up @@ -524,7 +524,7 @@ static int parse_map_line(const char *line,

static int use_hole(unsigned long holebegin,
unsigned long holesize,
unsigned long *addrp,
uintptr_t *addrp,
unsigned long size)
{
unsigned long aligned;
Expand Down Expand Up @@ -576,7 +576,7 @@ static int use_hole(unsigned long holebegin,
}

static int find_hole(orte_rtc_hwloc_vm_hole_kind_t hkind,
size_t *addrp, size_t size)
uintptr_t *addrp, size_t size)
{
unsigned long biggestbegin = 0;
unsigned long biggestsize = 0;
Expand Down
Loading