fix

Author: RuohengMa

paddlenlp/peft/lora/lora_model.py

@@ -48,22 +48,24 @@
 from ...utils.tools import get_env_device
 from .lora_config import LoRAConfig
 
+from paddlenlp.utils.log import logger
 
 def get_lora_layers():
     try:
         if get_env_device() == "xpu":
             # If paddle_xpu is not installed, just use PaddleNLP's native lora layers
-            from paddle_xpu.lora_layers import (
+            from paddle_xpu.paddlenlp.lora_layers import (
                 ColumnParallelLoRALinear,
                 ColumnSequenceParallelLoRALinear,
-                LoRAConv2D,
                 LoRALinear,
                 RowParallelLoRALinear,
                 RowSequenceParallelLoRALinear,
             )
 
             from .lora_layers import LoRAConv2D
-    except ImportError:
+    except ImportError as e:
+        logger.info("Failed to import LoRA Linear from paddle_xpu, using PaddleNLP's native implementations.")
+        logger.info(f"{e}")
         from .lora_layers import (
             ColumnParallelLoRALinear,
             ColumnSequenceParallelLoRALinear,
@@ -72,7 +74,6 @@ def get_lora_layers():
             RowParallelLoRALinear,
             RowSequenceParallelLoRALinear,
         )
-        logger.info("Failed to import LoRA Linear from paddle_xpu, using PaddleNLP's native implementations.")
     else:
         logger.info("Succeeded to import LoRA Linear from paddle_xpu.")
 

paddlenlp/transformers/linear_utils.py

@@ -34,14 +34,15 @@
 
 if get_env_device() == "xpu":
     try:
-        import paddle_xpu.distributed.fleet.meta_parallel as mpu
-        from paddle_xpu import nn
-        from paddle_xpu.distributed.fleet.utils import sequence_parallel_utils
+        import paddle_xpu.paddle.distributed.fleet.meta_parallel as mpu
+        from paddle_xpu.paddle import nn
+        from paddle_xpu.paddle.distributed.fleet.utils import sequence_parallel_utils
     except ImportError:
         # If paddle_xpu is not installed, just use Paddle's native Linear implementations
         logger.info("Failed to import Linear from paddle_xpu, using PaddleNLP's native implementations.")
+        logger.info(f"{e}")
     else:
-        logger.info("Succeeded to import Linear from  paddle_xpu.")
+        logger.info("Succeeded to import Linear from paddle_xpu.")
 
 Linear = nn.Linear
 ColumnParallelLinear = mpu.ColumnParallelLinear