Commit a8a79469 authored by Robert Schmidt's avatar Robert Schmidt

Merge remote-tracking branch 'origin/fhi-72-hotfixes' into integration_2024_w50 (!3160)

FHI-72: initialize mask, find correct libxran

See commits for more information
parents 85440e2d f8d7e1fd
...@@ -83,12 +83,15 @@ find_path(xran_INCLUDE_DIR ...@@ -83,12 +83,15 @@ find_path(xran_INCLUDE_DIR
xran_pkt.h xran_pkt.h
xran_pkt_up.h xran_pkt_up.h
xran_sync_api.h xran_sync_api.h
PATHS ${xran_LOCATION} HINTS ${xran_LOCATION}
PATH_SUFFIXES api PATH_SUFFIXES api include
NO_DEFAULT_PATH
) )
find_library(xran_LIBRARY find_library(xran_LIBRARY
NAMES xran NAMES xran
PATHS ${xran_LOCATION}/build HINTS ${xran_LOCATION}
PATH_SUFFIXES build api
NO_DEFAULT_PATH
) )
if (NOT xran_LIBRARY) if (NOT xran_LIBRARY)
message(FATAL_ERROR "could not detect xran build artifacts at ${xran_LOCATION}/build") message(FATAL_ERROR "could not detect xran build artifacts at ${xran_LOCATION}/build")
......
...@@ -452,7 +452,7 @@ static uint64_t get_u64_mask(const paramdef_t *pd) ...@@ -452,7 +452,7 @@ static uint64_t get_u64_mask(const paramdef_t *pd)
for (int i = 0; i < pd->numelt; ++i) { for (int i = 0; i < pd->numelt; ++i) {
int num = pd->iptr[i]; int num = pd->iptr[i];
AssertFatal(num >= 0 && num < 64, "cannot put element of %d in 64-bit mask\n", num); AssertFatal(num >= 0 && num < 64, "cannot put element of %d in 64-bit mask\n", num);
mask |= 1 << num; mask |= 1LL << num;
} }
return mask; return mask;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment