Fix MPI include path for Ubuntu

Author: sayalibhavsar

auto_hpl/build_run_hpl.sh

@@ -505,17 +505,34 @@ build_hpl()
 	cd hpl-$HPL_VER
 
 	# Determine architecture-specific MPI include path
-	case "$arch" in
-		x86_64)
-			mpi_inc="/usr/include/openmpi-x86_64"
-			;;
-		aarch64)
-			mpi_inc="/usr/include/openmpi-aarch64"
-			;;
-		*)
-			mpi_inc="/usr/include/openmpi"
-			;;
-	esac
+	os=$(get_os)
+	if [[ "$os" == "ubuntu" ]]; then
+		# Ubuntu uses multiarch lib path for MPI includes
+		case "$arch" in
+			x86_64)
+				mpi_inc="/usr/lib/x86_64-linux-gnu/openmpi/include"
+				;;
+			aarch64)
+				mpi_inc="/usr/lib/aarch64-linux-gnu/openmpi/include"
+				;;
+			*)
+				mpi_inc="/usr/include/openmpi"
+				;;
+		esac
+	else
+		# RHEL, Amazon Linux, SLES use include path
+		case "$arch" in
+			x86_64)
+				mpi_inc="/usr/include/openmpi-x86_64"
+				;;
+			aarch64)
+				mpi_inc="/usr/include/openmpi-aarch64"
+				;;
+			*)
+				mpi_inc="/usr/include/openmpi"
+				;;
+		esac
+	fi
 
 	# Choose base template makefile and set BLAS library name
 	if [[ "$blaslib" == *"MKL"* ]]; then

auto_hpl/generate_makefile.sh

@@ -83,10 +83,30 @@ if [ -n "$BLAS_DIR" ]; then
         "$TEMPLATE" > "$OUTPUT"
 else
     # For system libraries (OpenBLAS/FlexiBLAS)
-    sed -e "s|^ARCH.*=.*Linux_.*|ARCH         = $ARCH|" \
-        -e "s|^MPinc.*=.*-I/usr/include/openmpi.*|MPinc        = -I$MPI_INC|" \
-        -e "s|^LAlib.*=.*|LAlib        = \$(LAdir)/$BLAS_LIB|" \
-        "$TEMPLATE" > "$OUTPUT"
+    # Detect if Ubuntu - needs different library paths
+    if [[ "$MPI_INC" == *"x86_64-linux-gnu"* ]]; then
+        # Ubuntu x86_64 uses multiarch paths
+        sed -e "s|^ARCH.*=.*Linux_.*|ARCH         = $ARCH|" \
+            -e "s|^MPdir.*=.*|MPdir        = /usr/lib/x86_64-linux-gnu/openmpi|" \
+            -e "s|^MPinc.*=.*-I/usr/include/openmpi.*|MPinc        = -I$MPI_INC|" \
+            -e "s|^LAdir.*=.*|LAdir        = /usr/lib/x86_64-linux-gnu|" \
+            -e "s|^LAlib.*=.*|LAlib        = \$(LAdir)/$BLAS_LIB|" \
+            "$TEMPLATE" > "$OUTPUT"
+    elif [[ "$MPI_INC" == *"aarch64-linux-gnu"* ]]; then
+        # Ubuntu aarch64 uses multiarch paths
+        sed -e "s|^ARCH.*=.*Linux_.*|ARCH         = $ARCH|" \
+            -e "s|^MPdir.*=.*|MPdir        = /usr/lib/aarch64-linux-gnu/openmpi|" \
+            -e "s|^MPinc.*=.*-I/usr/include/openmpi.*|MPinc        = -I$MPI_INC|" \
+            -e "s|^LAdir.*=.*|LAdir        = /usr/lib/aarch64-linux-gnu|" \
+            -e "s|^LAlib.*=.*|LAlib        = \$(LAdir)/$BLAS_LIB|" \
+            "$TEMPLATE" > "$OUTPUT"
+    else
+        # RHEL, Amazon Linux, SLES use standard paths
+        sed -e "s|^ARCH.*=.*Linux_.*|ARCH         = $ARCH|" \
+            -e "s|^MPinc.*=.*-I/usr/include/openmpi.*|MPinc        = -I$MPI_INC|" \
+            -e "s|^LAlib.*=.*|LAlib        = \$(LAdir)/$BLAS_LIB|" \
+            "$TEMPLATE" > "$OUTPUT"
+    fi
 fi
 
 if [ $? -eq 0 ]; then