NFC: Align python namespaces of iree-dialects and iree-compiler-api. (#7088)
diff --git a/llvm-external-projects/iree-compiler-api/build_tools/smoketest.py b/llvm-external-projects/iree-compiler-api/build_tools/smoketest.py
index 381cc28..e0f0043 100644
--- a/llvm-external-projects/iree-compiler-api/build_tools/smoketest.py
+++ b/llvm-external-projects/iree-compiler-api/build_tools/smoketest.py
@@ -27,7 +27,7 @@
with ir.Context() as ctx:
chlo.register_chlo_dialect(ctx)
mhlo.register_mhlo_dialect(ctx)
- iree_dialect.register_iree_dialect(ctx)
+ iree_dialect.register_dialect(ctx)
input_module = ir.Module.parse(r"""
builtin.module {
diff --git a/llvm-external-projects/iree-dialects/python/CMakeLists.txt b/llvm-external-projects/iree-dialects/python/CMakeLists.txt
index 9e29cb5..52a0e8f 100644
--- a/llvm-external-projects/iree-dialects/python/CMakeLists.txt
+++ b/llvm-external-projects/iree-dialects/python/CMakeLists.txt
@@ -1,5 +1,9 @@
include(AddMLIRPython)
+# Specifies that all MLIR packages are co-located under npcomp.
+# TODO: Add an upstream cmake param for this vs having a global here.
+add_compile_definitions("MLIR_PYTHON_PACKAGE_PREFIX=iree.compiler.")
+
################################################################################
# Sources
################################################################################
@@ -13,7 +17,7 @@
declare_mlir_dialect_python_bindings(
ADD_TO_PARENT IREEDialectsPythonSources.Dialects
- ROOT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/mlir"
+ ROOT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/iree/compiler"
TD_FILE dialects/IreeBinding.td
SOURCES dialects/iree.py
DIALECT_NAME iree
@@ -21,7 +25,7 @@
declare_mlir_dialect_python_bindings(
ADD_TO_PARENT IREEDialectsPythonSources.Dialects
- ROOT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/mlir"
+ ROOT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/iree/compiler"
TD_FILE dialects/IreePyDmBinding.td
SOURCES
dialects/_iree_pydm_ops_ext.py
@@ -66,14 +70,14 @@
add_mlir_python_common_capi_library(IREEDialectsAggregateCAPI
INSTALL_COMPONENT IREEDialectsPythonModules
INSTALL_DESTINATION python_packages/iree_dialects/mlir/_mlir_libs
- OUTPUT_DIRECTORY "${IREE_DIALECTS_BINARY_DIR}/python_packages/iree_dialects/mlir/_mlir_libs"
+ OUTPUT_DIRECTORY "${IREE_DIALECTS_BINARY_DIR}/python_packages/iree_dialects/iree/compiler/_mlir_libs"
RELATIVE_INSTALL_ROOT "../../../.."
DECLARED_SOURCES ${_source_components}
)
add_mlir_python_modules(IREEDialectsPythonModules
- ROOT_PREFIX "${IREE_DIALECTS_BINARY_DIR}/python_packages/iree_dialects/mlir"
- INSTALL_PREFIX "python_packages/iree_dialects/mlir"
+ ROOT_PREFIX "${IREE_DIALECTS_BINARY_DIR}/python_packages/iree_dialects/iree/compiler"
+ INSTALL_PREFIX "python_packages/iree_dialects/iree/compiler"
DECLARED_SOURCES ${_source_components}
COMMON_CAPI_LINK_LIBS
IREEDialectsAggregateCAPI
diff --git a/llvm-external-projects/iree-dialects/python/mlir/dialects/IreeBinding.td b/llvm-external-projects/iree-dialects/python/iree/compiler/dialects/IreeBinding.td
similarity index 100%
rename from llvm-external-projects/iree-dialects/python/mlir/dialects/IreeBinding.td
rename to llvm-external-projects/iree-dialects/python/iree/compiler/dialects/IreeBinding.td
diff --git a/llvm-external-projects/iree-dialects/python/mlir/dialects/IreePyDmBinding.td b/llvm-external-projects/iree-dialects/python/iree/compiler/dialects/IreePyDmBinding.td
similarity index 100%
rename from llvm-external-projects/iree-dialects/python/mlir/dialects/IreePyDmBinding.td
rename to llvm-external-projects/iree-dialects/python/iree/compiler/dialects/IreePyDmBinding.td
diff --git a/llvm-external-projects/iree-dialects/python/mlir/dialects/_iree_pydm_ops_ext.py b/llvm-external-projects/iree-dialects/python/iree/compiler/dialects/_iree_pydm_ops_ext.py
similarity index 100%
rename from llvm-external-projects/iree-dialects/python/mlir/dialects/_iree_pydm_ops_ext.py
rename to llvm-external-projects/iree-dialects/python/iree/compiler/dialects/_iree_pydm_ops_ext.py
diff --git a/llvm-external-projects/iree-dialects/python/mlir/dialects/iree.py b/llvm-external-projects/iree-dialects/python/iree/compiler/dialects/iree.py
similarity index 100%
rename from llvm-external-projects/iree-dialects/python/mlir/dialects/iree.py
rename to llvm-external-projects/iree-dialects/python/iree/compiler/dialects/iree.py
diff --git a/llvm-external-projects/iree-dialects/python/mlir/dialects/iree_pydm/__init__.py b/llvm-external-projects/iree-dialects/python/iree/compiler/dialects/iree_pydm/__init__.py
similarity index 100%
rename from llvm-external-projects/iree-dialects/python/mlir/dialects/iree_pydm/__init__.py
rename to llvm-external-projects/iree-dialects/python/iree/compiler/dialects/iree_pydm/__init__.py
diff --git a/llvm-external-projects/iree-dialects/python/mlir/dialects/iree_pydm/importer/__init__.py b/llvm-external-projects/iree-dialects/python/iree/compiler/dialects/iree_pydm/importer/__init__.py
similarity index 100%
rename from llvm-external-projects/iree-dialects/python/mlir/dialects/iree_pydm/importer/__init__.py
rename to llvm-external-projects/iree-dialects/python/iree/compiler/dialects/iree_pydm/importer/__init__.py
diff --git a/llvm-external-projects/iree-dialects/python/mlir/dialects/iree_pydm/importer/builtins_intrinsics.py b/llvm-external-projects/iree-dialects/python/iree/compiler/dialects/iree_pydm/importer/builtins_intrinsics.py
similarity index 100%
rename from llvm-external-projects/iree-dialects/python/mlir/dialects/iree_pydm/importer/builtins_intrinsics.py
rename to llvm-external-projects/iree-dialects/python/iree/compiler/dialects/iree_pydm/importer/builtins_intrinsics.py
diff --git a/llvm-external-projects/iree-dialects/python/mlir/dialects/iree_pydm/importer/importer.py b/llvm-external-projects/iree-dialects/python/iree/compiler/dialects/iree_pydm/importer/importer.py
similarity index 100%
rename from llvm-external-projects/iree-dialects/python/mlir/dialects/iree_pydm/importer/importer.py
rename to llvm-external-projects/iree-dialects/python/iree/compiler/dialects/iree_pydm/importer/importer.py
diff --git a/llvm-external-projects/iree-dialects/python/mlir/dialects/iree_pydm/importer/intrinsic_def.py b/llvm-external-projects/iree-dialects/python/iree/compiler/dialects/iree_pydm/importer/intrinsic_def.py
similarity index 100%
rename from llvm-external-projects/iree-dialects/python/mlir/dialects/iree_pydm/importer/intrinsic_def.py
rename to llvm-external-projects/iree-dialects/python/iree/compiler/dialects/iree_pydm/importer/intrinsic_def.py
diff --git a/llvm-external-projects/iree-dialects/python/mlir/dialects/iree_pydm/importer/private_intrinsics.py b/llvm-external-projects/iree-dialects/python/iree/compiler/dialects/iree_pydm/importer/private_intrinsics.py
similarity index 100%
rename from llvm-external-projects/iree-dialects/python/mlir/dialects/iree_pydm/importer/private_intrinsics.py
rename to llvm-external-projects/iree-dialects/python/iree/compiler/dialects/iree_pydm/importer/private_intrinsics.py
diff --git a/llvm-external-projects/iree-dialects/python/mlir/dialects/iree_pydm/importer/test_util.py b/llvm-external-projects/iree-dialects/python/iree/compiler/dialects/iree_pydm/importer/test_util.py
similarity index 100%
rename from llvm-external-projects/iree-dialects/python/mlir/dialects/iree_pydm/importer/test_util.py
rename to llvm-external-projects/iree-dialects/python/iree/compiler/dialects/iree_pydm/importer/test_util.py
diff --git a/llvm-external-projects/iree-dialects/python/mlir/dialects/iree_pydm/importer/util.py b/llvm-external-projects/iree-dialects/python/iree/compiler/dialects/iree_pydm/importer/util.py
similarity index 100%
rename from llvm-external-projects/iree-dialects/python/mlir/dialects/iree_pydm/importer/util.py
rename to llvm-external-projects/iree-dialects/python/iree/compiler/dialects/iree_pydm/importer/util.py
diff --git a/llvm-external-projects/iree-dialects/python/mlir/dialects/iree_pydm/rtl/__init__.py b/llvm-external-projects/iree-dialects/python/iree/compiler/dialects/iree_pydm/rtl/__init__.py
similarity index 100%
rename from llvm-external-projects/iree-dialects/python/mlir/dialects/iree_pydm/rtl/__init__.py
rename to llvm-external-projects/iree-dialects/python/iree/compiler/dialects/iree_pydm/rtl/__init__.py
diff --git a/llvm-external-projects/iree-dialects/python/mlir/dialects/iree_pydm/rtl/base.py b/llvm-external-projects/iree-dialects/python/iree/compiler/dialects/iree_pydm/rtl/base.py
similarity index 100%
rename from llvm-external-projects/iree-dialects/python/mlir/dialects/iree_pydm/rtl/base.py
rename to llvm-external-projects/iree-dialects/python/iree/compiler/dialects/iree_pydm/rtl/base.py
diff --git a/llvm-external-projects/iree-dialects/python/mlir/dialects/iree_pydm/rtl/modules/booleans.py b/llvm-external-projects/iree-dialects/python/iree/compiler/dialects/iree_pydm/rtl/modules/booleans.py
similarity index 100%
rename from llvm-external-projects/iree-dialects/python/mlir/dialects/iree_pydm/rtl/modules/booleans.py
rename to llvm-external-projects/iree-dialects/python/iree/compiler/dialects/iree_pydm/rtl/modules/booleans.py
diff --git a/llvm-external-projects/iree-dialects/python/mlir/dialects/iree_pydm/rtl/modules/constants.py b/llvm-external-projects/iree-dialects/python/iree/compiler/dialects/iree_pydm/rtl/modules/constants.py
similarity index 100%
rename from llvm-external-projects/iree-dialects/python/mlir/dialects/iree_pydm/rtl/modules/constants.py
rename to llvm-external-projects/iree-dialects/python/iree/compiler/dialects/iree_pydm/rtl/modules/constants.py
diff --git a/llvm-external-projects/iree-dialects/python/mlir/dialects/iree_pydm/rtl/modules/macros.py b/llvm-external-projects/iree-dialects/python/iree/compiler/dialects/iree_pydm/rtl/modules/macros.py
similarity index 100%
rename from llvm-external-projects/iree-dialects/python/mlir/dialects/iree_pydm/rtl/modules/macros.py
rename to llvm-external-projects/iree-dialects/python/iree/compiler/dialects/iree_pydm/rtl/modules/macros.py
diff --git a/llvm-external-projects/iree-dialects/python/mlir/dialects/iree_pydm/rtl/modules/numerics.py b/llvm-external-projects/iree-dialects/python/iree/compiler/dialects/iree_pydm/rtl/modules/numerics.py
similarity index 100%
rename from llvm-external-projects/iree-dialects/python/mlir/dialects/iree_pydm/rtl/modules/numerics.py
rename to llvm-external-projects/iree-dialects/python/iree/compiler/dialects/iree_pydm/rtl/modules/numerics.py
diff --git a/llvm-external-projects/iree-dialects/python/mlir/dialects/iree_pydm/rtl/rtl_builder.py b/llvm-external-projects/iree-dialects/python/iree/compiler/dialects/iree_pydm/rtl/rtl_builder.py
similarity index 100%
rename from llvm-external-projects/iree-dialects/python/mlir/dialects/iree_pydm/rtl/rtl_builder.py
rename to llvm-external-projects/iree-dialects/python/iree/compiler/dialects/iree_pydm/rtl/rtl_builder.py
diff --git a/llvm-external-projects/iree-dialects/test/python/iree_pydm/importer/assignment.py b/llvm-external-projects/iree-dialects/test/python/iree_pydm/importer/assignment.py
index a8d116f..830195c 100644
--- a/llvm-external-projects/iree-dialects/test/python/iree_pydm/importer/assignment.py
+++ b/llvm-external-projects/iree-dialects/test/python/iree_pydm/importer/assignment.py
@@ -1,7 +1,7 @@
# RUN: %PYTHON %s | iree-dialects-opt | FileCheck --enable-var-scope --dump-input-filter=all %s
from typing import List
-from mlir.dialects.iree_pydm.importer.test_util import *
+from iree.compiler.dialects.iree_pydm.importer.test_util import *
# CHECK-LABEL: @assign_free_var_not_arg
diff --git a/llvm-external-projects/iree-dialects/test/python/iree_pydm/importer/binary.py b/llvm-external-projects/iree-dialects/test/python/iree_pydm/importer/binary.py
index d9d3d29..0387848 100644
--- a/llvm-external-projects/iree-dialects/test/python/iree_pydm/importer/binary.py
+++ b/llvm-external-projects/iree-dialects/test/python/iree_pydm/importer/binary.py
@@ -1,7 +1,7 @@
# RUN: %PYTHON %s | iree-dialects-opt | FileCheck --enable-var-scope --dump-input-filter=all %s
from typing import List
-from mlir.dialects.iree_pydm.importer.test_util import *
+from iree.compiler.dialects.iree_pydm.importer.test_util import *
# CHECK-LABEL: @binary_add
diff --git a/llvm-external-projects/iree-dialects/test/python/iree_pydm/importer/booleans.py b/llvm-external-projects/iree-dialects/test/python/iree_pydm/importer/booleans.py
index 93f547a..36da239 100644
--- a/llvm-external-projects/iree-dialects/test/python/iree_pydm/importer/booleans.py
+++ b/llvm-external-projects/iree-dialects/test/python/iree_pydm/importer/booleans.py
@@ -1,7 +1,7 @@
# RUN: %PYTHON %s | iree-dialects-opt | FileCheck --enable-var-scope --dump-input-filter=all %s
from typing import List
-from mlir.dialects.iree_pydm.importer.test_util import *
+from iree.compiler.dialects.iree_pydm.importer.test_util import *
# CHECK-LABEL: @logical_and
diff --git a/llvm-external-projects/iree-dialects/test/python/iree_pydm/importer/comparison.py b/llvm-external-projects/iree-dialects/test/python/iree_pydm/importer/comparison.py
index 4c85035..1a0efc7 100644
--- a/llvm-external-projects/iree-dialects/test/python/iree_pydm/importer/comparison.py
+++ b/llvm-external-projects/iree-dialects/test/python/iree_pydm/importer/comparison.py
@@ -4,7 +4,7 @@
# pytype: disable=unsupported-operands
from typing import List
-from mlir.dialects.iree_pydm.importer.test_util import *
+from iree.compiler.dialects.iree_pydm.importer.test_util import *
# CHECK-LABEL: func @binary_lt_
diff --git a/llvm-external-projects/iree-dialects/test/python/iree_pydm/importer/constants.py b/llvm-external-projects/iree-dialects/test/python/iree_pydm/importer/constants.py
index 05218d2..2c6823b 100644
--- a/llvm-external-projects/iree-dialects/test/python/iree_pydm/importer/constants.py
+++ b/llvm-external-projects/iree-dialects/test/python/iree_pydm/importer/constants.py
@@ -1,7 +1,7 @@
# RUN: %PYTHON %s | iree-dialects-opt | FileCheck --enable-var-scope --dump-input-filter=all %s
from typing import List
-from mlir.dialects.iree_pydm.importer.test_util import *
+from iree.compiler.dialects.iree_pydm.importer.test_util import *
# CHECK-LABEL: @const_integer
diff --git a/llvm-external-projects/iree-dialects/test/python/iree_pydm/importer/flow_control.py b/llvm-external-projects/iree-dialects/test/python/iree_pydm/importer/flow_control.py
index fa568d1..c2e2218 100644
--- a/llvm-external-projects/iree-dialects/test/python/iree_pydm/importer/flow_control.py
+++ b/llvm-external-projects/iree-dialects/test/python/iree_pydm/importer/flow_control.py
@@ -1,7 +1,7 @@
# RUN: %PYTHON %s | iree-dialects-opt | FileCheck --enable-var-scope --dump-input-filter=all %s
from typing import List
-from mlir.dialects.iree_pydm.importer.test_util import *
+from iree.compiler.dialects.iree_pydm.importer.test_util import *
# CHECK-LABEL: @simple_if
diff --git a/llvm-external-projects/iree-dialects/test/python/iree_pydm/importer/function_def.py b/llvm-external-projects/iree-dialects/test/python/iree_pydm/importer/function_def.py
index 5bb592a..762f485 100644
--- a/llvm-external-projects/iree-dialects/test/python/iree_pydm/importer/function_def.py
+++ b/llvm-external-projects/iree-dialects/test/python/iree_pydm/importer/function_def.py
@@ -1,7 +1,7 @@
# RUN: %PYTHON %s | iree-dialects-opt | FileCheck --enable-var-scope --dump-input-filter=all %s
from typing import List
-from mlir.dialects.iree_pydm.importer.test_util import *
+from iree.compiler.dialects.iree_pydm.importer.test_util import *
# CHECK-LABEL: func @fully_typed_with_return
diff --git a/llvm-external-projects/iree-dialects/test/python/iree_pydm/importer/intrinsics.py b/llvm-external-projects/iree-dialects/test/python/iree_pydm/importer/intrinsics.py
index 2c238b6..8d0030c 100644
--- a/llvm-external-projects/iree-dialects/test/python/iree_pydm/importer/intrinsics.py
+++ b/llvm-external-projects/iree-dialects/test/python/iree_pydm/importer/intrinsics.py
@@ -1,11 +1,11 @@
# RUN: %PYTHON %s | iree-dialects-opt -split-input-file | FileCheck --enable-var-scope --dump-input-filter=all %s
from typing import List
-from mlir.dialects.iree_pydm.importer import *
-from mlir.dialects.iree_pydm.importer.test_util import *
+from iree.compiler.dialects.iree_pydm.importer import *
+from iree.compiler.dialects.iree_pydm.importer.test_util import *
-from mlir.dialects import iree_pydm as d
-from mlir import ir
+from iree.compiler.dialects import iree_pydm as d
+from iree.compiler import ir
################################################################################
# Pyfunc intrinsics
diff --git a/llvm-external-projects/iree-dialects/test/python/iree_pydm/importer/structural.py b/llvm-external-projects/iree-dialects/test/python/iree_pydm/importer/structural.py
index 80e5d5b..cec5797 100644
--- a/llvm-external-projects/iree-dialects/test/python/iree_pydm/importer/structural.py
+++ b/llvm-external-projects/iree-dialects/test/python/iree_pydm/importer/structural.py
@@ -1,7 +1,7 @@
# RUN: %PYTHON %s | iree-dialects-opt | FileCheck --enable-var-scope --dump-input-filter=all %s
from typing import List
-from mlir.dialects.iree_pydm.importer.test_util import *
+from iree.compiler.dialects.iree_pydm.importer.test_util import *
# CHECK-LABEL @expr_statement
diff --git a/llvm-external-projects/iree-dialects/test/python/iree_pydm/rtl_builder.py b/llvm-external-projects/iree-dialects/test/python/iree_pydm/rtl_builder.py
index d350c9d..733a798 100644
--- a/llvm-external-projects/iree-dialects/test/python/iree_pydm/rtl_builder.py
+++ b/llvm-external-projects/iree-dialects/test/python/iree_pydm/rtl_builder.py
@@ -1,3 +1,3 @@
-# RUN: %PYTHON -m mlir.dialects.iree_pydm.rtl.rtl_builder | iree-dialects-opt -canonicalize
+# RUN: %PYTHON -m iree.compiler.dialects.iree_pydm.rtl.rtl_builder | iree-dialects-opt -canonicalize
# This test is only verifying that the runtime library builds and validates
# by passing it through opt.
diff --git a/llvm-external-projects/iree-dialects/test/python/iree_pydm/to_iree/basic_structure.py b/llvm-external-projects/iree-dialects/test/python/iree_pydm/to_iree/basic_structure.py
index 521365f..1296399 100644
--- a/llvm-external-projects/iree-dialects/test/python/iree_pydm/to_iree/basic_structure.py
+++ b/llvm-external-projects/iree-dialects/test/python/iree_pydm/to_iree/basic_structure.py
@@ -3,7 +3,7 @@
# crash.
from typing import List
-from mlir.dialects.iree_pydm.importer.test_util import *
+from iree.compiler.dialects.iree_pydm.importer.test_util import *
# CHECK-LABEL: @return_none_no_args
diff --git a/llvm-external-projects/iree-dialects/test/python/smoketest.py b/llvm-external-projects/iree-dialects/test/python/smoketest.py
index f92b132..651d9e0 100644
--- a/llvm-external-projects/iree-dialects/test/python/smoketest.py
+++ b/llvm-external-projects/iree-dialects/test/python/smoketest.py
@@ -1,14 +1,14 @@
# RUN: %PYTHON %s
-import mlir.ir
-from mlir.dialects import iree
-from mlir.dialects import iree_pydm
+import iree.compiler.ir
+from iree.compiler.dialects import iree as iree_d
+from iree.compiler.dialects import iree_pydm as pydm_d
-with mlir.ir.Context() as ctx:
- iree.register_dialect()
- iree_pydm.register_dialect()
+with iree.compiler.ir.Context() as ctx:
+ iree_d.register_dialect()
+ pydm_d.register_dialect()
# iree_pydm types.
- bool_t = iree_pydm.BoolType.get()
- typed_object_t = iree_pydm.ObjectType.get_typed(bool_t)
- untyped_object_t = iree_pydm.ObjectType.get()
+ bool_t = pydm_d.BoolType.get()
+ typed_object_t = pydm_d.ObjectType.get_typed(bool_t)
+ untyped_object_t = pydm_d.ObjectType.get()
