control: tags -1 patch
Hello, the upstream code for the failing part changed completely, so I had to do a quick and dirty patch (main C casting) to fix the build Patch attached. G.
Description: Fix FTBFS on 32bit archs:
../../../../../../../../opal/mca/pmix/pmix3x/pmix/src/hwloc/hwloc.c: In function ‘find_hole’:
../../../../../../../../opal/mca/pmix/pmix3x/pmix/src/hwloc/hwloc.c:641:47: error: passing argument 3 of ‘use_hole’ from incompatible pointer type [-Wincompatible-pointer-types]
641 | return use_hole(0, begin, addrp, size);
| ^~~~~
| |
| size_t * {aka unsigned int *}
../../../../../../../../opal/mca/pmix/pmix3x/pmix/src/hwloc/hwloc.c:587:36: note: expected ‘long unsigned int *’ but argument is of type ‘size_t *’ {aka ‘unsigned int *’}
587 | unsigned long *addrp,
| ~~~~~~~~~~~~~~~^~~~~
../../../../../../../../opal/mca/pmix/pmix3x/pmix/src/hwloc/hwloc.c:649:65: error: passing argument 3 of ‘use_hole’ from incompatible pointer type [-Wincompatible-pointer-types]
649 | return use_hole(prevend, begin-prevend, addrp, size);
| ^~~~~
| |
| size_t * {aka unsigned int *}
../../../../../../../../opal/mca/pmix/pmix3x/pmix/src/hwloc/hwloc.c:587:36: note: expected ‘long unsigned int *’ but argument is of type ‘size_t *’ {aka ‘unsigned int *’}
587 | unsigned long *addrp,
| ~~~~~~~~~~~~~~~^~~~~
../../../../../../../../opal/mca/pmix/pmix3x/pmix/src/hwloc/hwloc.c:656:65: error: passing argument 3 of ‘use_hole’ from incompatible pointer type [-Wincompatible-pointer-types]
656 | return use_hole(prevend, begin-prevend, addrp, size);
| ^~~~~
| |
| size_t * {aka unsigned int *}
../../../../../../../../opal/mca/pmix/pmix3x/pmix/src/hwloc/hwloc.c:587:36: note: expected ‘long unsigned int *’ but argument is of type ‘size_t *’ {aka ‘unsigned int *’}
587 | unsigned long *addrp,
| ~~~~~~~~~~~~~~~^~~~~
../../../../../../../../opal/mca/pmix/pmix3x/pmix/src/hwloc/hwloc.c:708:52: error: passing argument 3 of ‘use_hole’ from incompatible pointer type [-Wincompatible-pointer-types]
708 | return use_hole(biggestbegin, biggestsize, addrp, size);
| ^~~~~
| |
| size_t * {aka unsigned int *}
../../../../../../../../opal/mca/pmix/pmix3x/pmix/src/hwloc/hwloc.c:587:36: note: expected ‘long unsigned int *’ but argument is of type ‘size_t *’ {aka ‘unsigned int *’}
587 | unsigned long *addrp,
| ~~~~~~~~~~~~~~~^~~~~
../../../../../../../../opal/mca/pmix/pmix3x/pmix/src/hwloc/hwloc.c: In function ‘pmix_hwloc_get_topology’:
../../../../../../../../opal/mca/pmix/pmix3x/pmix/src/hwloc/hwloc.c:397:9: warning: ignoring return value of ‘asprintf’ declared with attribute ‘warn_unused_result’ [-Wunused-result]
397 | asprintf(&shmemfile, "%s/hwloc.sm", pmix_server_globals.tmpdir);
Author: Gianfranco Costamagna <locutusofb...@debian.org>
Last-Update: 2024-08-08
--- openmpi-4.1.6.orig/opal/mca/pmix/pmix3x/pmix/src/hwloc/hwloc.c
+++ openmpi-4.1.6/opal/mca/pmix/pmix3x/pmix/src/hwloc/hwloc.c
@@ -58,7 +58,7 @@ static int parse_map_line(const char *li
pmix_hwloc_vm_map_kind_t *kindp);
static int use_hole(unsigned long holebegin,
unsigned long holesize,
- unsigned long *addrp,
+ size_t *addrp,
unsigned long size);
static int find_hole(pmix_hwloc_vm_hole_kind_t hkind,
size_t *addrp,
@@ -584,7 +584,7 @@ static int parse_map_line(const char *li
static int use_hole(unsigned long holebegin,
unsigned long holesize,
- unsigned long *addrp,
+ size_t *addrp,
unsigned long size)
{
unsigned long aligned;
--- openmpi-4.1.6.orig/orte/mca/rtc/hwloc/rtc_hwloc.c
+++ openmpi-4.1.6/orte/mca/rtc/hwloc/rtc_hwloc.c
@@ -77,7 +77,7 @@ static int parse_map_line(const char *li
orte_rtc_hwloc_vm_map_kind_t *kindp);
static int use_hole(unsigned long holebegin,
unsigned long holesize,
- unsigned long *addrp,
+ size_t *addrp,
unsigned long size);
static int find_hole(orte_rtc_hwloc_vm_hole_kind_t hkind,
size_t *addrp,
@@ -524,7 +524,7 @@ static int parse_map_line(const char *li
static int use_hole(unsigned long holebegin,
unsigned long holesize,
- unsigned long *addrp,
+ size_t *addrp,
unsigned long size)
{
unsigned long aligned;
--- openmpi-4.1.6.orig/ompi/mca/io/romio321/romio/mpi-io/get_posn.c
+++ openmpi-4.1.6/ompi/mca/io/romio321/romio/mpi-io/get_posn.c
@@ -52,7 +52,7 @@ int MPI_File_get_position(MPI_File fh, M
MPIO_CHECK_NOT_SEQUENTIAL_MODE(adio_fh, myname, error_code);
/* --END ERROR HANDLING-- */
- ADIOI_Get_position(adio_fh, offset);
+ ADIOI_Get_position(adio_fh, (ADIO_Offset *)offset);
fn_exit:
return MPI_SUCCESS;
--- openmpi-4.1.6.orig/ompi/mca/io/romio321/romio/mpi-io/get_posn_sh.c
+++ openmpi-4.1.6/ompi/mca/io/romio321/romio/mpi-io/get_posn_sh.c
@@ -53,7 +53,7 @@ int MPI_File_get_position_shared(MPI_Fil
ADIOI_TEST_DEFERRED(adio_fh, myname, &error_code);
- ADIO_Get_shared_fp(adio_fh, 0, offset, &error_code);
+ ADIO_Get_shared_fp(adio_fh, 0, (ADIO_Offset *)offset, &error_code);
/* --BEGIN ERROR HANDLING-- */
if (error_code != MPI_SUCCESS)
error_code = MPIO_Err_return_file(adio_fh, error_code);
--- openmpi-4.1.6.orig/ompi/mca/io/romio321/romio/mpi-io/get_bytoff.c
+++ openmpi-4.1.6/ompi/mca/io/romio321/romio/mpi-io/get_bytoff.c
@@ -63,7 +63,7 @@ int MPI_File_get_byte_offset(MPI_File fh
MPIO_CHECK_NOT_SEQUENTIAL_MODE(adio_fh, myname, error_code);
/* --END ERROR HANDLING-- */
- ADIOI_Get_byte_offset(adio_fh, offset, disp);
+ ADIOI_Get_byte_offset(adio_fh, offset, (ADIO_Offset*)disp);
fn_exit:
--- openmpi-4.1.6.orig/ompi/mca/io/romio321/romio/mpi-io/seek_sh.c
+++ openmpi-4.1.6/ompi/mca/io/romio321/romio/mpi-io/seek_sh.c
@@ -38,7 +38,8 @@ int MPI_File_seek_shared(MPI_File fh, MP
{
int error_code=MPI_SUCCESS, tmp_whence, myrank;
static char myname[] = "MPI_FILE_SEEK_SHARED";
- MPI_Offset curr_offset, eof_offset, tmp_offset;
+ ADIO_Offset curr_offset, eof_offset;
+ MPI_Offset tmp_offset;
ADIO_File adio_fh;
ROMIO_THREAD_CS_ENTER();
--- openmpi-4.1.6.orig/ompi/mca/io/romio321/romio/mpi-io/seek.c
+++ openmpi-4.1.6/ompi/mca/io/romio321/romio/mpi-io/seek.c
@@ -41,7 +41,7 @@ int MPI_File_seek(MPI_File fh, MPI_Offse
int error_code;
ADIO_File adio_fh;
static char myname[] = "MPI_FILE_SEEK";
- MPI_Offset curr_offset, eof_offset;
+ ADIO_Offset curr_offset, eof_offset;
#ifdef MPI_hpux
int fl_xmpi;
--- openmpi-4.1.6.orig/ompi/mca/io/romio321/romio/adio/common/ad_coll_exch_new.c
+++ openmpi-4.1.6/ompi/mca/io/romio321/romio/adio/common/ad_coll_exch_new.c
@@ -134,7 +134,7 @@ void ADIOI_Exch_file_views(int myrank, i
ADIOI_Flatlist_node *flat_mem_p = NULL, *flat_file_p = NULL;
MPI_Count memtype_sz = -1;
int memtype_is_contig = -1;
- ADIO_Offset filetype_sz = -1;
+ MPI_Count filetype_sz = -1;
#ifdef AGGREGATION_PROFILE
MPE_Log_event (5014, 0, NULL);
--- openmpi-4.1.6.orig/ompi/mca/io/romio321/romio/adio/common/ad_read_coll.c
+++ openmpi-4.1.6/ompi/mca/io/romio321/romio/adio/common/ad_read_coll.c
@@ -851,7 +851,7 @@ static void ADIOI_R_Exchange_data(ADIO_F
others_req[i].lens[k] = partial_send[i];
}
ADIOI_Type_create_hindexed_x(count[i],
- &(others_req[i].lens[start_pos[i]]),
+ (const MPI_Count *)&(others_req[i].lens[start_pos[i]]),
&(others_req[i].mem_ptrs[start_pos[i]]),
MPI_BYTE, &send_type);
/* absolute displacement; use MPI_BOTTOM in send */
--- openmpi-4.1.6.orig/ompi/mca/io/romio321/romio/adio/common/ad_write_coll.c
+++ openmpi-4.1.6/ompi/mca/io/romio321/romio/adio/common/ad_write_coll.c
@@ -610,7 +610,7 @@ static void ADIOI_W_Exchange_data(ADIO_F
others_req[i].lens[k] = partial_recv[i];
}
ADIOI_Type_create_hindexed_x(count[i],
- &(others_req[i].lens[start_pos[i]]),
+ (const MPI_Count *)&(others_req[i].lens[start_pos[i]]),
&(others_req[i].mem_ptrs[start_pos[i]]),
MPI_BYTE, recv_types+j);
/* absolute displacements; use MPI_BOTTOM in recv */
OpenPGP_signature.asc
Description: OpenPGP digital signature
-- debian-science-maintainers mailing list debian-science-maintainers@alioth-lists.debian.net https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-science-maintainers
