Merge pull request #3574 from cedricjourdain/fix-build-rocm6

[testlib] Fix ROCm build

Author: vkarak

hpctestlib/microbenchmarks/gpu/dgemm/src/makefile.hip

@@ -4,7 +4,7 @@ RSMI_ROOT?=/opt/rocm/rocm_smi
 all: dgemm sgemm
 
 dgemm:
-	hipcc -O3 xgemm.cu -o $@.x -DTARGET_HIP -DGEMM_TYPE=double -DXBLAS_GEMM=XblasDgemm ${CXXFLAGS} -std=c++14 -I${ROCM_ROOT} -I${RSMI_ROOT}/include -lnuma -lrocm_smi64 -lrocblas
+	hipcc -O3 xgemm.cu -o $@.x -DTARGET_HIP -DGEMM_TYPE=double -DXBLAS_GEMM=XblasDgemm ${CXXFLAGS} -std=c++14 -I${ROCM_ROOT}/include/rocblas/ -I${RSMI_ROOT}/include -lnuma -lrocm_smi64 -lrocblas -lpthread
 
 sgemm:
-	hipcc -O3 xgemm.cu -o $@.x -DTARGET_HIP -DGEMM_TYPE=float -DXBLAS_GEMM=XblasSgemm ${CXXFLAGS} -std=c++14 -I${ROCM_ROOT} -I${RSMI_ROOT}/include -lnuma -lrocm_smi64 -lrocblas
+	hipcc -O3 xgemm.cu -o $@.x -DTARGET_HIP -DGEMM_TYPE=float -DXBLAS_GEMM=XblasSgemm ${CXXFLAGS} -std=c++14 -I${ROCM_ROOT}/include/rocblas/ -I${RSMI_ROOT}/include -lnuma -lrocm_smi64 -lrocblas -lpthread

hpctestlib/microbenchmarks/gpu/src/common/Xdevice/hip/smi.hpp

@@ -33,7 +33,7 @@ void Smi::setCpuAffinity(int id)
 {
   checkGpuIdIsSensible(id);
 
-  uint32_t numa_node;
+  int32_t numa_node;
   rsmiCheck( rsmi_topo_numa_affinity_get( id, &numa_node) );
   numa_run_on_node(numa_node);
 }

hpctestlib/microbenchmarks/gpu/src/gpu_burn/makefile.hip

@@ -1,4 +1,5 @@
 RSMI_ROOT?=/opt/rocm/rocm_smi
+ROCM_ROOT?=/opt/rocm/
 
 gpu_burn:
-	hipcc -O3 $@.cu -o $@.x -DTARGET_HIP ${CXXFLAGS} -std=c++14 -I${RSMI_ROOT}/include -lnuma -lrocm_smi64 -lrocblas -pthreads
+	hipcc -O3 $@.cu -o $@.x -DTARGET_HIP ${CXXFLAGS} -std=c++14 -I${ROCM_ROOT}/include/rocblas/ -I${RSMI_ROOT}/include -lnuma -lrocm_smi64 -lrocblas -pthreads