已合并
modify the file path #29122
lihui创建于 1月6日
modify the file path #29122
已合并
共 4 个文件变更+5-3
| @@ -36,7 +36,7 @@ class TestNpuDevice(TestCase): | |||
| 36 | self.assertIn("#include <sys/syscall.h>", result) | 36 | self.assertIn("#include <sys/syscall.h>", result) |
| 37 | self.assertIn("#include <torch_npu/csrc/framework/OpCommand.h>", result) | 37 | self.assertIn("#include <torch_npu/csrc/framework/OpCommand.h>", result) |
| 38 | self.assertIn("#include <torch_npu/csrc/core/npu/NPUStream.h>", result) | 38 | self.assertIn("#include <torch_npu/csrc/core/npu/NPUStream.h>", result) |
| 39 | - self.assertIn("#include \"experiment/runtime/runtime/rt.h\"", result) | 39 | + self.assertIn("#include \"runtime/runtime/rt.h\"", result) |
| 40 | 40 | ||
| 41 | def test_cpp_aoti_stream_guard(self): | 41 | def test_cpp_aoti_stream_guard(self): |
| 42 | overrides = NewNPUDeviceOpOverrides() | 42 | overrides = NewNPUDeviceOpOverrides() |
| @@ -334,7 +334,7 @@ class CppWrapperNpu(CppWrapperCpu): | |||
| 334 | maybe_hipify_code_wrapper(self.device_codegen.kernel_driver()) | 334 | maybe_hipify_code_wrapper(self.device_codegen.kernel_driver()) |
| 335 | ) | 335 | ) |
| 336 | self.header.splice("#include <torch_npu/csrc/framework/OpCommand.h>") | 336 | self.header.splice("#include <torch_npu/csrc/framework/OpCommand.h>") |
| 337 | - self.header.splice("#include <experiment/runtime/runtime/rt.h>") | 337 | + self.header.splice("#include <runtime/runtime/rt.h>") |
| 338 | if npu_config.aot_inductor.debug_kernel: | 338 | if npu_config.aot_inductor.debug_kernel: |
| 339 | self.header.splice("#include <torch/torch.h>") | 339 | self.header.splice("#include <torch/torch.h>") |
| 340 | 340 | ||
| @@ -47,6 +47,8 @@ def include_paths(npu: bool = False) -> List[str]: | |||
| 47 | ASCEND_HOME = get_ascend_home() | 47 | ASCEND_HOME = get_ascend_home() |
| 48 | paths.extend([ | 48 | paths.extend([ |
| 49 | os.path.join(ASCEND_HOME, "include"), | 49 | os.path.join(ASCEND_HOME, "include"), |
| 50 | + os.path.join(ASCEND_HOME, "pkg_inc"), | ||
| 51 | + os.path.join(ASCEND_HOME, "pkg_inc/profiling"), | ||
| 50 | os.path.join(ASCEND_HOME, "include/experiment"), | 52 | os.path.join(ASCEND_HOME, "include/experiment"), |
| 51 | os.path.join(ASCEND_HOME, "include/experiment/msprof"), | 53 | os.path.join(ASCEND_HOME, "include/experiment/msprof"), |
| 52 | ]) | 54 | ]) |
| @@ -192,7 +192,7 @@ class NewNPUDeviceOpOverrides(NPUDeviceOpOverrides): | |||
| 192 | #include <sys/syscall.h> | 192 | #include <sys/syscall.h> |
| 193 | #include <torch_npu/csrc/framework/OpCommand.h> | 193 | #include <torch_npu/csrc/framework/OpCommand.h> |
| 194 | #include <torch_npu/csrc/core/npu/NPUStream.h> | 194 | #include <torch_npu/csrc/core/npu/NPUStream.h> |
| 195 | - #include "experiment/runtime/runtime/rt.h" | 195 | + #include "runtime/runtime/rt.h" |
| 196 | """ | 196 | """ |
| 197 | 197 | ||
| 198 | def cpp_stream_type(self): | 198 | def cpp_stream_type(self): |