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
This commit is contained in:
Robert Schmidt
2024-12-16 15:25:52 +01:00
2 changed files with 7 additions and 4 deletions
+6 -3
View File
@@ -83,12 +83,15 @@ find_path(xran_INCLUDE_DIR
xran_pkt.h
xran_pkt_up.h
xran_sync_api.h
PATHS ${xran_LOCATION}
PATH_SUFFIXES api
HINTS ${xran_LOCATION}
PATH_SUFFIXES api include
NO_DEFAULT_PATH
)
find_library(xran_LIBRARY
NAMES xran
PATHS ${xran_LOCATION}/build
HINTS ${xran_LOCATION}
PATH_SUFFIXES build api
NO_DEFAULT_PATH
)
if (NOT xran_LIBRARY)
message(FATAL_ERROR "could not detect xran build artifacts at ${xran_LOCATION}/build")
+1 -1
View File
@@ -452,7 +452,7 @@ static uint64_t get_u64_mask(const paramdef_t *pd)
for (int i = 0; i < pd->numelt; ++i) {
int num = pd->iptr[i];
AssertFatal(num >= 0 && num < 64, "cannot put element of %d in 64-bit mask\n", num);
mask |= 1 << num;
mask |= 1LL << num;
}
return mask;
}