From 4cd1d97460b677563d57f07a293724bdc02e0ef5 Mon Sep 17 00:00:00 2001
From: Logan Adams <114770087+loadams@users.noreply.github.com>
Date: Tue, 17 Dec 2024 17:30:52 -0800
Subject: [PATCH] Don't error out when cpu accelerator doesn't have torch (as
 default for whl building) (#6886)

This fixes a bug introduced in #6845, which breaks the `no-torch`
workflow that we require in order to do releases where we do not require
torch to be in the environment when building an sdist. This adds the
same logic to the cpuaccelerator that the cudaaccelerator had where we
don't require torch to be installed to build the whl.
---
 .github/workflows/no-torch.yml | 1 +
 accelerator/cpu_accelerator.py | 8 +++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/no-torch.yml b/.github/workflows/no-torch.yml
index 1a13c0f3f4f1..5b89a6f36787 100644
--- a/.github/workflows/no-torch.yml
+++ b/.github/workflows/no-torch.yml
@@ -4,6 +4,7 @@ on:
   workflow_dispatch:
   pull_request:
     paths:
+      - 'accelerator/**'
       - '.github/workflows/no-torch.yml'
       - 'op_builder/**'
   schedule:
diff --git a/accelerator/cpu_accelerator.py b/accelerator/cpu_accelerator.py
index 0e49bd9f6458..de711f73144e 100644
--- a/accelerator/cpu_accelerator.py
+++ b/accelerator/cpu_accelerator.py
@@ -3,9 +3,15 @@
 
 # DeepSpeed Team
 
-import torch
 from .abstract_accelerator import DeepSpeedAccelerator
 
+# During setup stage torch may not be installed, pass on no torch will
+# allow op builder related API to be executed.
+try:
+    import torch
+except ImportError as e:
+    pass
+
 try:
     import oneccl_bindings_for_pytorch  # noqa: F401 # type: ignore
     oneccl_imported_p = True