diff --git a/python/setup_tools/utils/ascend.py b/python/setup_tools/utils/ascend.py index 53bf7178a..b311c2f29 100644 --- a/python/setup_tools/utils/ascend.py +++ b/python/setup_tools/utils/ascend.py @@ -4,7 +4,7 @@ downloader = DownloadManager() submodules = (Module(name="ascendnpu-ir", url="https://gitcode.com/Ascend/AscendNPU-IR.git", - commit_id="04045a06ec7c9592b17de659307d5debe7be590a", + commit_id="0501294d3e", dst_path=os.path.join(flagtree_configs.flagtree_submodule_dir, "ascendnpu-ir")), ) diff --git a/python/triton/compiler/compiler.py b/python/triton/compiler/compiler.py index 1df49e6aa..c8d52c344 100644 --- a/python/triton/compiler/compiler.py +++ b/python/triton/compiler/compiler.py @@ -289,7 +289,7 @@ def compile(src, target=None, options=None): except Exception as e: # flagtree backend specialization from triton.runtime.driver import spec - spec("handle_compile_error", e, ext) + spec("handle_compile_error", e, ext, fn_cache_manager) ir_filename = f"{file_name}.{ext}" if (fn_override_manager is not None and (full_name := fn_override_manager.get_file(ir_filename)) is not None): diff --git a/third_party/ascend/backend/spec/triton/compiler/compiler.py b/third_party/ascend/backend/spec/triton/compiler/compiler.py index 0abc61bf6..c33274e9b 100644 --- a/third_party/ascend/backend/spec/triton/compiler/compiler.py +++ b/third_party/ascend/backend/spec/triton/compiler/compiler.py @@ -20,7 +20,7 @@ def set_CompiledKernel_metadata_stream(compiled_kernel, stream): return compiled_kernel.metadata.stream -def handle_compile_error(e, ext): +def handle_compile_error(e, ext, fn_cache_manager): from .errors import MLIRCompilationError if (ext == "ttadapter"): stage_name = "ConvertTritonIRToLinalgIR" diff --git a/third_party/ascend/triton_ascend.cpp b/third_party/ascend/triton_ascend.cpp index b3d67f752..c1ba7b873 100644 --- a/third_party/ascend/triton_ascend.cpp +++ b/third_party/ascend/triton_ascend.cpp @@ -8,8 +8,8 @@ #include "incubated/Conversion/TritonToLinalgIncubated/TritonToLinalgIncubatedPass.h" #include "incubated/Conversion/TritonToUnstructureIncubated/UnstructureConversionPass.h" #include "mlir/Pass/PassManager.h" -#include "npu/Conversion/TritonToHFusion/TritonToHFusion.h" -#include "npu/Conversion/TritonToHIVM/TritonToHIVM.h" +#include "npu/Conversion/TritonToHFusion/Passes.h" +#include "npu/Conversion/TritonToHIVM/Passes.h" #include "npu/Conversion/TritonToLLVM/TritonToLLVM.h" #include "passes.h" #include "triton-shared/Conversion/TritonToLinalgExperimental/TritonToLinalgExperimental.h"