Skip to content

Commit 04dc4a4

Browse files
authored
Integrate torch-mlir at c9694c6 and disable TOSA. (#19976)
Integrated at llvm/torch-mlir@c9694c6 which makes TOSA support controlled by an option. Since we have our own CMakeLists for torch-mlir, which do not add `-DTORCH_MLIR_ENABLE_TOSA`, all we need to do is to drop TOSA files from them. --------- Signed-off-by: Benoit Jacob <[email protected]>
1 parent 73be116 commit 04dc4a4

File tree

4 files changed

+29
-7
lines changed

4 files changed

+29
-7
lines changed

compiler/plugins/input/Torch/torch-mlir/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,6 @@ file(GLOB _ConversionPasses_SRCS
176176
"${TORCH_MLIR_ROOT_DIR}/lib/Conversion/TorchConversionToMLProgram/*.cpp"
177177
"${TORCH_MLIR_ROOT_DIR}/lib/Conversion/TorchToSCF/*.cpp"
178178
"${TORCH_MLIR_ROOT_DIR}/lib/Conversion/TorchToTensor/*.cpp"
179-
"${TORCH_MLIR_ROOT_DIR}/lib/Conversion/TorchToTosa/*.cpp"
180179
"${TORCH_MLIR_ROOT_DIR}/lib/Conversion/TorchToTMTensor/*.cpp"
181180
"${TORCH_MLIR_ROOT_DIR}/lib/Conversion/Utils/*.cpp"
182181
"${TORCH_MLIR_ROOT_DIR}/lib/Dialect/TorchConversion/Transforms/*.cpp"
@@ -202,7 +201,6 @@ iree_cc_library(
202201
MLIRMathDialect
203202
MLIRMLProgramDialect
204203
MLIRSCFDialect
205-
MLIRTosaDialect
206204
)
207205

208206
iree_tablegen_library(

tests/external/iree-test-suites/onnx_ops/onnx_ops_cpu_llvm_sync.json

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -235,9 +235,15 @@
235235
"onnx/node/generated/test_reduce_sum_square_negative_axes_keepdims_random_expanded",
236236
"onnx/node/generated/test_reflect_pad",
237237
"onnx/node/generated/test_reshape_allowzero_reordered",
238+
"onnx/node/generated/test_resize_downsample_scales_cubic",
238239
"onnx/node/generated/test_resize_downsample_scales_cubic_A_n0p5_exclude_outside",
240+
"onnx/node/generated/test_resize_downsample_scales_cubic_align_corners",
239241
"onnx/node/generated/test_resize_downsample_scales_cubic_antialias",
242+
"onnx/node/generated/test_resize_downsample_scales_linear",
243+
"onnx/node/generated/test_resize_downsample_scales_linear_align_corners",
240244
"onnx/node/generated/test_resize_downsample_scales_linear_antialias",
245+
"onnx/node/generated/test_resize_downsample_scales_linear_half_pixel_symmetric",
246+
"onnx/node/generated/test_resize_downsample_scales_nearest",
241247
"onnx/node/generated/test_resize_downsample_sizes_cubic_antialias",
242248
"onnx/node/generated/test_resize_downsample_sizes_linear_antialias",
243249
"onnx/node/generated/test_resize_downsample_sizes_nearest_not_larger",
@@ -246,7 +252,14 @@
246252
"onnx/node/generated/test_resize_tf_crop_and_resize_axes_2_3",
247253
"onnx/node/generated/test_resize_tf_crop_and_resize_axes_3_2",
248254
"onnx/node/generated/test_resize_tf_crop_and_resize_extrapolation_value",
255+
"onnx/node/generated/test_resize_upsample_scales_cubic",
249256
"onnx/node/generated/test_resize_upsample_scales_cubic_A_n0p5_exclude_outside",
257+
"onnx/node/generated/test_resize_upsample_scales_cubic_align_corners",
258+
"onnx/node/generated/test_resize_upsample_scales_cubic_asymmetric",
259+
"onnx/node/generated/test_resize_upsample_scales_linear",
260+
"onnx/node/generated/test_resize_upsample_scales_linear_align_corners",
261+
"onnx/node/generated/test_resize_upsample_scales_linear_half_pixel_symmetric",
262+
"onnx/node/generated/test_resize_upsample_scales_nearest",
250263
"onnx/node/generated/test_resize_upsample_scales_nearest_axes_2_3",
251264
"onnx/node/generated/test_resize_upsample_scales_nearest_axes_3_2",
252265
"onnx/node/generated/test_resize_upsample_sizes_nearest_axes_2_3",
@@ -318,6 +331,7 @@
318331
"onnx/node/generated/test_unique_sorted_with_axis_3d",
319332
"onnx/node/generated/test_unique_sorted_with_negative_axis",
320333
"onnx/node/generated/test_unique_sorted_without_axis",
334+
"onnx/node/generated/test_upsample_nearest",
321335
"onnx/node/generated/test_wrap_pad"
322336
],
323337
"expected_run_failures": [
@@ -354,8 +368,6 @@
354368
"onnx/node/generated/test_reduce_min_bool_inputs",
355369
"onnx/node/generated/test_reduce_min_empty_set",
356370
"onnx/node/generated/test_reduce_sum_empty_set_non_reduced_axis_zero",
357-
"onnx/node/generated/test_resize_downsample_scales_cubic_align_corners",
358-
"onnx/node/generated/test_resize_downsample_scales_linear_align_corners",
359371
"onnx/node/generated/test_scan_sum",
360372
"onnx/node/generated/test_sce_mean_weight",
361373
"onnx/node/generated/test_sce_mean_weight_ii",

tests/external/iree-test-suites/onnx_ops/onnx_ops_gpu_rocm_rdna3.json

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -219,9 +219,15 @@
219219
"onnx/node/generated/test_reduce_sum_square_negative_axes_keepdims_random_expanded",
220220
"onnx/node/generated/test_reflect_pad",
221221
"onnx/node/generated/test_reshape_allowzero_reordered",
222+
"onnx/node/generated/test_resize_downsample_scales_cubic",
222223
"onnx/node/generated/test_resize_downsample_scales_cubic_A_n0p5_exclude_outside",
224+
"onnx/node/generated/test_resize_downsample_scales_cubic_align_corners",
223225
"onnx/node/generated/test_resize_downsample_scales_cubic_antialias",
226+
"onnx/node/generated/test_resize_downsample_scales_linear",
227+
"onnx/node/generated/test_resize_downsample_scales_linear_align_corners",
224228
"onnx/node/generated/test_resize_downsample_scales_linear_antialias",
229+
"onnx/node/generated/test_resize_downsample_scales_linear_half_pixel_symmetric",
230+
"onnx/node/generated/test_resize_downsample_scales_nearest",
225231
"onnx/node/generated/test_resize_downsample_sizes_cubic_antialias",
226232
"onnx/node/generated/test_resize_downsample_sizes_linear_antialias",
227233
"onnx/node/generated/test_resize_downsample_sizes_nearest_not_larger",
@@ -230,7 +236,14 @@
230236
"onnx/node/generated/test_resize_tf_crop_and_resize_axes_2_3",
231237
"onnx/node/generated/test_resize_tf_crop_and_resize_axes_3_2",
232238
"onnx/node/generated/test_resize_tf_crop_and_resize_extrapolation_value",
239+
"onnx/node/generated/test_resize_upsample_scales_cubic",
233240
"onnx/node/generated/test_resize_upsample_scales_cubic_A_n0p5_exclude_outside",
241+
"onnx/node/generated/test_resize_upsample_scales_cubic_align_corners",
242+
"onnx/node/generated/test_resize_upsample_scales_cubic_asymmetric",
243+
"onnx/node/generated/test_resize_upsample_scales_linear",
244+
"onnx/node/generated/test_resize_upsample_scales_linear_align_corners",
245+
"onnx/node/generated/test_resize_upsample_scales_linear_half_pixel_symmetric",
246+
"onnx/node/generated/test_resize_upsample_scales_nearest",
234247
"onnx/node/generated/test_resize_upsample_scales_nearest_axes_2_3",
235248
"onnx/node/generated/test_resize_upsample_scales_nearest_axes_3_2",
236249
"onnx/node/generated/test_resize_upsample_sizes_nearest_axes_2_3",
@@ -306,6 +319,7 @@
306319
"onnx/node/generated/test_unique_sorted_with_axis_3d",
307320
"onnx/node/generated/test_unique_sorted_with_negative_axis",
308321
"onnx/node/generated/test_unique_sorted_without_axis",
322+
"onnx/node/generated/test_upsample_nearest",
309323
"onnx/node/generated/test_wrap_pad"
310324
],
311325
"expected_run_failures": [
@@ -362,8 +376,6 @@
362376
"onnx/node/generated/test_reduce_sum_square_default_axes_keepdims_example_expanded",
363377
"onnx/node/generated/test_reduce_sum_square_default_axes_keepdims_random",
364378
"onnx/node/generated/test_reduce_sum_square_default_axes_keepdims_random_expanded",
365-
"onnx/node/generated/test_resize_downsample_scales_cubic_align_corners",
366-
"onnx/node/generated/test_resize_downsample_scales_linear_align_corners",
367379
"onnx/node/generated/test_scan_sum",
368380
"onnx/node/generated/test_sce_mean_weight",
369381
"onnx/node/generated/test_sce_mean_weight_ii",

third_party/torch-mlir

Submodule torch-mlir updated 36 files

0 commit comments

Comments
 (0)