Merge pull request #295 from intel/update-branch

feat: update xeon installation flow (#780)

Author: gooishin

gpu_installer.sh

@@ -48,7 +48,6 @@ readonly DEPENDENCIES=(
 
 # Combined GPU packages for cleaner installation
 readonly COMMON_GPU_PACKAGES=(
-   "intel-level-zero-gpu"
    "${COMPUTE_PACKAGES[@]}"
 )
 
@@ -58,7 +57,7 @@ readonly MEDIA_GPU_PACKAGES=(
 
 readonly OPTIONAL_GPU_PACKAGES=(
    "intel-ocloc"
-   "level-zero-dev"
+   "libze-dev"
 )
 
 # GPU detection - simplified approach
@@ -282,7 +281,7 @@ install_gpu_drivers() {
    echo -e "\n# Post-installation configuration"
 
    # Verify critical packages
-   local critical_packages=("intel-level-zero-gpu" "intel-opencl-icd" "libze-intel-gpu1")
+   local critical_packages=("intel-opencl-icd" "libze-intel-gpu1")
    local missing_packages=()
 
    for pkg in "${critical_packages[@]}"; do

main_installer.sh

@@ -95,7 +95,6 @@ download_scripts() {
         "gpu_installer.sh"
         "npu_installer.sh"
         "openvino_installer.sh"
-        "platform_detection.sh"
         "print_summary_table.sh"
     )
 
@@ -183,10 +182,26 @@ verify_ubuntu_24() {
 
 # Install NPU drivers (Core Ultra only)
 install_npu_drivers() {
-    echo "Installing NPU drivers for Core Ultra..."
+    # Explicit guard: Only install NPU drivers on Core Ultra platforms
+    if ! is_coreultra; then
+        echo "$S_ERROR NPU drivers are only supported on Core Ultra platforms"
+        echo "Current platform: $CPU_MODEL"
+        echo "Skipping NPU driver installation"
+        return 1
+    fi
+    
+    echo "Installing NPU drivers for Core Ultra platform..."
+    echo "$S_VALID NPU driver installation is supported on this Core Ultra platform"
+    
     # Execute the script instead of sourcing it to avoid context issues
     # shellcheck disable=SC1091
-    bash "$SCRIPT_DIR/npu_installer.sh"
+    if bash "$SCRIPT_DIR/npu_installer.sh"; then
+        echo "$S_VALID NPU drivers installed successfully"
+        return 0
+    else
+        echo "$S_ERROR NPU driver installation failed"
+        return 1
+    fi
 }
 
 # Check for GPU presence
@@ -217,17 +232,26 @@ check_intel_arc_gpu() {
 
 # Install GPU drivers - only if any GPU is present
 install_gpu_drivers() {
+    echo "# GPU Driver Installation Process"
+    
     if check_intel_arc_gpu; then
         echo "Installing Intel GPU drivers..."
         # Execute the script instead of sourcing it to avoid context issues
         # shellcheck disable=SC1091
-        bash "$SCRIPT_DIR/gpu_installer.sh"
-        echo "$S_VALID GPU drivers installed"
-        
-        # Verify OpenCL setup after installation
-        # verify_opencl_setup
+        if bash "$SCRIPT_DIR/gpu_installer.sh"; then
+            echo "$S_VALID GPU drivers installed successfully"
+            
+            # Verify OpenCL setup after installation
+            # verify_opencl_setup
+            return 0
+        else
+            echo "$S_ERROR GPU driver installation failed"
+            return 1
+        fi
     else
         echo "$S_WARNING Skipping GPU driver installation - no GPU devices detected"
+        echo "This is normal for systems without dedicated or integrated GPUs"
+        return 0  # Not an error condition
     fi
 }
 
@@ -333,6 +357,50 @@ verify_opencl_setup() {
     fi
 }
 
+# Platform detection variables
+PLATFORM_FAMILY=""
+CPU_MODEL=""
+IS_COREULTRA=false
+
+# Detect platform information
+detect_platform() {
+    echo "Detecting platform family..."
+
+    # Get CPU model
+    CPU_MODEL=$(grep -m1 "model name" /proc/cpuinfo | cut -d: -f2 | sed 's/^[ \t]*//' || echo "unknown")
+    
+    # Detect platform family using a case statement for better readability
+    case "$CPU_MODEL" in
+        *Ultra*)
+            PLATFORM_FAMILY="coreultra"
+            IS_COREULTRA=true
+            ;;
+        *Xeon*)
+            PLATFORM_FAMILY="xeon"
+            ;;
+        *Atom*|*Core*N[0-9]*)
+            PLATFORM_FAMILY="atom"
+            ;;
+        *Core*)
+            PLATFORM_FAMILY="core"
+            ;;
+        *Processor*)
+            PLATFORM_FAMILY="processor"
+            ;;
+        *)
+            PLATFORM_FAMILY="unknown"
+            ;;
+    esac
+    
+    echo "  CPU Model: $CPU_MODEL"
+    echo "  Platform Family: $PLATFORM_FAMILY"
+}
+
+# Check if Core Ultra platform
+is_coreultra() {
+    [ "$IS_COREULTRA" = true ]
+}
+
 install_openvino(){
       echo ""
       echo "========================================================================"
@@ -419,48 +487,54 @@ main() {
     install_build_essentials
     echo ""
 
-    # 3. Load platform detection
-    # shellcheck disable=SC1091
-    source "$SCRIPT_DIR/platform_detection.sh"
-    
-    # 4. Detect platform and OS
-    echo "# Detecting platform and OS..."
+    # 3. Detect platform
+    echo "# Detecting platform..."
     detect_platform
-    detect_os
     echo ""
 
     # 5. Platform Installation Flow
     echo "# Platform Installation Flow..."
     echo "$S_VALID Platform detected: $CPU_MODEL"
 
     # Determine platform family and execute appropriate flow
-    if is_xeon; then
-        echo "# Xeon platform detected"
-        echo "$S_ERROR Setup skipped for Xeon platforms"
-        echo "Please follow Ubuntu 24.04 Server installation guide:"
-        echo "https://ubuntu.com/download/server"
-        echo "For Xeon-specific optimizations, consult Intel documentation"
+    if is_coreultra; then
+        echo ""
+        echo "========================================================================"
+        echo "# CORE ULTRA PLATFORM INSTALLATION"
+        echo "========================================================================"
+        echo "Platform: Core Ultra CPU"
+        echo "Components: GPU Drivers + NPU Drivers + OpenVINO"
+        echo "NPU Support: Available and will be installed"
+        echo ""
 
-    elif is_coreultra; then
-        echo "# Core Ultra platform detected"
-        install_gpu_drivers  # Will check for Arc GPU presence first
-        install_npu_drivers
+        # Install GPU drivers (will check for GPU presence)
+        install_gpu_drivers || echo "$S_WARNING GPU driver installation had issues"
+        
+        # Install NPU drivers (Core Ultra only)
+        install_npu_drivers || echo "$S_WARNING NPU driver installation had issues"
 
         # Install OpenVINO with error handling
         if ! install_openvino; then
             echo "$S_ERROR Core Ultra platform setup incomplete due to OpenVINO installation failure"
-            echo "NPU and GPU drivers were installed successfully"
             echo "You may retry OpenVINO installation manually: bash $SCRIPT_DIR/openvino_installer.sh"
         fi
 
     else
-        echo "# Atom/Core platform detected"
-        install_gpu_drivers  # Will check for Arc GPU presence first
+        echo ""
+        echo "========================================================================"
+        echo "# STANDARD INTEL PLATFORM INSTALLATION"
+        echo "========================================================================"
+        echo "Platform: $CPU_MODEL (Xeon/Atom/Core)"
+        echo "Components: GPU Drivers (if GPU present) + OpenVINO"
+        echo "NPU Support: Not available (Core Ultra only)"
+        echo ""
+        
+        # Install GPU drivers (will check for GPU presence)
+        install_gpu_drivers || echo "$S_WARNING GPU driver installation had issues"
 
         # Install OpenVINO with error handling
         if ! install_openvino; then
-            echo "$S_ERROR Atom/Core platform setup incomplete due to OpenVINO installation failure"
-            echo "GPU drivers were installed successfully (if Arc GPU was present)"
+            echo "$S_ERROR Platform setup incomplete due to OpenVINO installation failure"
             echo "You may retry OpenVINO installation manually: bash $SCRIPT_DIR/openvino_installer.sh"
         fi
     fi

npu_installer.sh

@@ -1,15 +1,61 @@
 #!/bin/bash
 
-# NPU (Neural Processing Unit) Installer
-# Standardized NPU installation for Core Ultra family
+# NPU (Neural Processing Unit) Installer for Core Ultra platforms
+# Installs Intel NPU drivers with Level Zero support
 # Copyright (C) 2025 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
+#
+# Features:
+# - Installs specific NPU driver versions (manually configured)
+# - Downloads packages from GitHub releases
+# - Supports Ubuntu 24.04 LTS only
+# - Requires Ubuntu 24.04 for dependency compatibility
+#
+# Version Management:
+# - Update the global version variables below when new releases are available
+# - Check for latest releases at: https://github.com/intel/linux-npu-driver/releases
+# - Level Zero compatibility matrix: https://github.com/intel/linux-npu-driver/releases/tag/v<version>
+#
+# Usage:
+#   sudo ./npu_installer.sh
 
-# Global version variables
-NPU_VERSION="1.19.0"
-NPU_BUILD_ID="20250707-16111289554"
+# Global version variables - Update these when new releases are available
+# Source: https://github.com/intel/linux-npu-driver/releases/latest
+NPU_VERSION="1.23.0"
+NPU_BUILD_ID="20250827-17270089246"
 LEVEL_ZERO_VERSION="v1.22.4"
-UBUNTU_VERSION="ubuntu24.04"
+
+# Auto-detect Ubuntu version
+UBUNTU_VERSION=""
+detect_ubuntu_version() {
+   local ubuntu_ver
+   ubuntu_ver=$(lsb_release -r | awk '{print $2}')
+   
+   case "$ubuntu_ver" in
+      "24.04")
+         UBUNTU_VERSION="ubuntu2404"
+         ;;
+      *)
+         print_warning "Unsupported Ubuntu version: $ubuntu_ver"
+         print_warning "This script only supports Ubuntu 24.04 LTS"
+         print_error "Please upgrade to Ubuntu 24.04 LTS for NPU driver support"
+         exit 1
+         ;;
+   esac
+   
+   print_info "Detected Ubuntu version: $ubuntu_ver -> $UBUNTU_VERSION"
+}
+
+# Simple version display function (replaces complex GitHub scraping)
+display_version_info() {
+   print_info "Using NPU Driver Version Information:"
+   print_info "NPU Version: ${NPU_VERSION} | Build: ${NPU_BUILD_ID}"
+   print_info "Level Zero Version: ${LEVEL_ZERO_VERSION}"
+   print_info "Ubuntu Package: ${UBUNTU_VERSION}"
+   print_info ""
+   print_info "Note: To update versions, edit the global variables at the top of this script"
+   print_info "Latest releases: https://github.com/intel/linux-npu-driver/releases"
+}
 
 # Status indicators - using ASCII for better compatibility (conditional definition)
 if [[ -z "$S_ERROR" ]]; then
@@ -93,25 +139,29 @@ download_npu_packages() {
    print_info "Downloading NPU driver packages ${NPU_VERSION}..."
 
    local base_url="https://github.com/intel/linux-npu-driver/releases/download/v${NPU_VERSION}"
-   local build_suffix="${NPU_VERSION}.${NPU_BUILD_ID}_${UBUNTU_VERSION}_amd64.deb"
-   
-   # Download each package with error checking
-   local files=(
-      "intel-driver-compiler-npu_${build_suffix}"
-      "intel-fw-npu_${build_suffix}"
-      "intel-level-zero-npu_${build_suffix}"
-   )
-   
-   for file in "${files[@]}"; do
-      local url="${base_url}/${file}"
-      print_info "  Downloading ${file}..."
-      if wget -q --timeout=30 "${url}"; then
-         print_success "  Downloaded ${file}"
+   
+   # Download tar.gz archive format
+   print_info "Downloading NPU driver archive..."
+   local archive_name="linux-npu-driver-v${NPU_VERSION}.${NPU_BUILD_ID}-${UBUNTU_VERSION}.tar.gz"
+   local url="${base_url}/${archive_name}"
+   
+   print_info "  Downloading ${archive_name}..."
+   if wget -q --timeout=30 "${url}"; then
+      print_success "  Downloaded ${archive_name}"
+      
+      # Extract the archive
+      print_info "  Extracting ${archive_name}..."
+      if tar -xzf "${archive_name}"; then
+         print_success "  Extracted NPU packages from archive"
+         rm -f "${archive_name}"  # Clean up archive after extraction
       else
-         print_error "  Failed to download ${file} from ${url}"
+         print_error "  Failed to extract ${archive_name}"
          return 1
       fi
-   done
+   else
+      print_error "  Failed to download ${archive_name} from ${url}"
+      return 1
+   fi
 
    print_success "All NPU packages downloaded successfully"
    return 0
@@ -132,7 +182,17 @@ check_level_zero() {
 # Download oneAPI Level Zero package
 download_level_zero_package() {
    print_info "Downloading oneAPI Level Zero ${LEVEL_ZERO_VERSION}..."
-   local lz_url="https://github.com/oneapi-src/level-zero/releases/download/${LEVEL_ZERO_VERSION}/level-zero_1.22.4+u24.04_amd64.deb"
+   print_info "DEBUG: Level Zero version variable: '${LEVEL_ZERO_VERSION}'"
+   
+   # Extract version number without 'v' prefix for filename
+   local lz_version_num
+   # shellcheck disable=SC2001
+   lz_version_num=$(echo "$LEVEL_ZERO_VERSION" | sed 's/^v//')
+   print_info "DEBUG: Extracted version number: '${lz_version_num}'"
+   
+   # Use Ubuntu 24.04 package
+   local lz_url="https://github.com/oneapi-src/level-zero/releases/download/${LEVEL_ZERO_VERSION}/level-zero_${lz_version_num}+u24.04_amd64.deb"
+   print_info "DEBUG: Download URL: ${lz_url}"
 
    if wget -q --timeout=30 "${lz_url}"; then
       print_success "Downloaded Level Zero package"
@@ -265,15 +325,12 @@ verify_installation() {
 # Main installation function
 install_npu() {
    print_info "Starting NPU installation for Core Ultra platform..."
-   print_info "NPU Version: ${NPU_VERSION} | Build: ${NPU_BUILD_ID}"
-   print_info "Level Zero Version: ${LEVEL_ZERO_VERSION}"
-   print_info ""
 
-   # Validate required variables
-   if [[ -z "$NPU_VERSION" || -z "$NPU_BUILD_ID" || -z "$LEVEL_ZERO_VERSION" ]]; then
-      print_error "Required version variables not set"
-      exit 1
-   fi
+   # Detect Ubuntu version
+   detect_ubuntu_version
+   
+   # Display version information
+   display_version_info
 
    # Check if running as root
    if [ "$EUID" -ne 0 ]; then
@@ -333,6 +390,8 @@ install_npu() {
    print_info ""
 }
 
+
+
 # Run installation if script is executed directly
 if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then
    install_npu