Skip to content

make mmcv available for torch_musa 2.5.0 #3312

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

make mmcv available for torch_musa 2.5.0 #3312

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fa33a9d
make it available for torch_musa 2.5.0
Oct 28, 2025
b86c244
Update to support both the latest and older versions of torch_musa.
Oct 28, 2025
d693ad0
del not need include
Oct 28, 2025
17a4096
update to use torch_musa version
Oct 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion mmcv/ops/csrc/common/pytorch_cuda_helper.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
#include "torch_musa/csrc/aten/musa/MUSAContext.h"
#include "torch_musa/csrc/core/MUSAGuard.h"
#include "torch_musa/share/generated_cuda_compatible/aten/src/THC/THCAtomics.muh"
#include "torch_musa/share/generated_cuda_compatible/include/ATen/musa/MUSA_PORT_ApplyUtils.muh"
#else
#include <ATen/cuda/CUDAContext.h>
#include <c10/cuda/CUDAGuard.h>
Expand All @@ -25,4 +24,17 @@ using phalf = at::Half;
#define __PHALF(x) (x)
#define DIVUP(m, n) ((m) / (n) + ((m) % (n) > 0))

// ======================================================
// 判断 torch_musa 版本：
// 如果版本 > 2.0.0，使用新的 MUSAApplyUtils.muh
// 否则，使用 MUSA_Port_ApplyUtils.muh
// ======================================================
#if defined(USE_NEW_MUSA) && USE_NEW_MUSA
#pragma message("[MUSA HELPER] Using torch_musa/share/generated_cuda_compatible/include/ATen/musa/MUSAApplyUtils.muh for torch_musa > 2.0.0")
#include "torch_musa/share/generated_cuda_compatible/include/ATen/musa/MUSAApplyUtils.muh"
#else
#pragma message("[MUSA HELPER] Using torch_musa/share/generated_cuda_compatible/include/ATen/musa/MUSA_PORT_ApplyUtils.muh for torch_musa <= 2.0.0")
#include "torch_musa/share/generated_cuda_compatible/include/ATen/musa/MUSA_PORT_ApplyUtils.muh"
#endif

#endif // PYTORCH_CUDA_HELPER
17 changes: 16 additions & 1 deletion mmcv/ops/csrc/common/pytorch_musa_helper.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

#include <ATen/ATen.h>

#include <ATen/musa/MUSA_PORT_ApplyUtils.muh>
#include <THC/THCAtomics.muh>

#include "common_musa_helper.hpp"
Expand All @@ -18,4 +17,20 @@ using phalf = at::Half;
#define __PHALF(x) (x)
#define DIVUP(m, n) ((m) / (n) + ((m) % (n) > 0))

// ======================================================
// 判断 torch_musa 版本：
// 如果版本 > 2.0.0，使用新的 MUSAApplyUtils.muh
// 否则，使用 MUSA_Port_ApplyUtils.muh
// ======================================================
#if defined(USE_NEW_MUSA) && USE_NEW_MUSA
#pragma message("[MUSA HELPER] Using <ATen/musa/MUSAApplyUtils.muh> for torch_musa > 2.0.0")
#include <ATen/musa/MUSAApplyUtils.muh>
#else
#pragma message("[MUSA HELPER] Using <ATen/musa/MUSA_PORT_ApplyUtils.muh> for torch_musa <= 2.0.0")
#include <ATen/musa/MUSA_PORT_ApplyUtils.muh>
#endif


#endif // PYTORCH_CUDA_HELPER


13 changes: 12 additions & 1 deletion mmcv/ops/csrc/pytorch/musa/fused_bias_leakyrelu_musa.mu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,18 @@
#include <musa_runtime.h>
#include <torch/types.h>

#include <ATen/musa/MUSA_PORT_ApplyUtils.muh>
// ======================================================
// 判断 torch_musa 版本：
// 如果版本 > 2.0.0，使用新的 MUSAApplyUtils.muh
// 否则，使用 MUSA_Port_ApplyUtils.muh
// ======================================================
#if defined(USE_NEW_MUSA) && USE_NEW_MUSA
#pragma message("[MUSA HELPER] Using <ATen/musa/MUSAApplyUtils.muh> for torch_musa > 2.0.0")
#include <ATen/musa/MUSAApplyUtils.muh>
#else
#pragma message("[MUSA HELPER] Using <ATen/musa/MUSA_PORT_ApplyUtils.muh> for torch_musa <= 2.0.0")
#include <ATen/musa/MUSA_PORT_ApplyUtils.muh>
#endif

template <typename scalar_t>
static __global__ void fused_bias_act_kernel(
Expand Down
10 changes: 9 additions & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
os.getenv('FORCE_MLU', '0') == '1':
from torch_mlu.utils.cpp_extension import BuildExtension
EXT_TYPE = 'pytorch'
elif (hasattr(torch, 'is_musa_available') and torch.is_musa_available()) \
elif (hasattr(torch, 'musa') and hasattr(torch.musa, 'is_available') and torch.musa.is_available()) \
or os.getenv('FORCE_MUSA', '0') == '1':
from torch_musa.utils.musa_extension import BuildExtension
EXT_TYPE = 'pytorch'
Expand Down Expand Up @@ -435,8 +435,16 @@ def get_mluops_version(file_path):
elif hasattr(torch, 'musa') or os.getenv('FORCE_MUSA', '0') == '1':
from torch_musa.testing import get_musa_arch
from torch_musa.utils.musa_extension import MUSAExtension

define_macros += [('MMCV_WITH_MUSA', None),
('MUSA_ARCH', str(get_musa_arch()))]

import torch_musa
if parse_version(torch_musa.__version__.split("+")[0]) > parse_version('2.0.0'):
define_macros += [('USE_NEW_MUSA', '1')]
else:
define_macros += [('USE_NEW_MUSA', '0')]

os.environ['MUSA_ARCH'] = str(get_musa_arch())
op_files = glob.glob('./mmcv/ops/csrc/pytorch/*.cpp') + \
glob.glob('./mmcv/ops/csrc/pytorch/cpu/*.cpp') + \
Expand Down