Add xdsl and xdsl-jax as dependencies of Catalyst

Author: mudit2812

.dep-versions

@@ -6,6 +6,10 @@ stablehlo=0a4440a5c8de45c4f9649bf3eb4913bf3f97da0d
 llvm=113f01aa82d055410f22a9d03b3468fa68600589
 enzyme=v0.0.203
 
+# xDSL dependencies
+xdsl=0.55.4
+xdsl_jax=0.1.1
+
 # Always remove custom PL/LQ versions before release.
 
 # For a custom PL version, update the package version here and at

doc/releases/changelog-dev.md

@@ -366,6 +366,9 @@
 
 <h3>Internal changes ⚙️</h3>
 
+* xDSL and xDSL-JAX are now dependencies of Catalyst.
+  [(#22__)](https://github.com/PennyLaneAI/catalyst/pull/22__)
+
 * Integration tests for `qml.specs` have been updated to match the new output format introduced
   in PennyLane.
   [(#2255)](https://github.com/PennyLaneAI/catalyst/pull/2255)

frontend/test/pytest/python_interface/dialects/test_catalyst_dialect.py

@@ -11,17 +11,13 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-
 """Unit test module for the xDSL Catalyst dialect."""
 
 import pytest
 
-# pylint: disable=wrong-import-position
+from catalyst.python_interface.dialects import Catalyst
 
 pytestmark = pytest.mark.xdsl
-xdsl = pytest.importorskip("xdsl")
-
-from catalyst.python_interface.dialects import Catalyst
 
 all_ops = list(Catalyst.operations)
 all_attrs = list(Catalyst.attributes)

frontend/test/pytest/python_interface/dialects/test_mbqc_dialect.py

@@ -11,23 +11,19 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-
 """Unit tests for the xDSL MBQC dialect."""
-
+# pylint: disable=line-too-long
 
 import pytest
-
-# pylint: disable=wrong-import-position,line-too-long
-pytestmark = pytest.mark.xdsl
-xdsl = pytest.importorskip("xdsl")
-
 from xdsl.context import Context
 from xdsl.dialects import arith, builtin, test
 from xdsl.parser import Parser
 from xdsl.utils.exceptions import VerifyException
 
 from catalyst.python_interface.dialects import Quantum, mbqc
 
+pytestmark = pytest.mark.xdsl
+
 all_ops = list(mbqc.MBQC.operations)
 all_attrs = list(mbqc.MBQC.attributes)
 

frontend/test/pytest/python_interface/dialects/test_qec_dialect.py

@@ -11,17 +11,14 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-
 """Unit tests for the xDSL QEC dialect."""
 
 import pytest
 
-# pylint: disable=wrong-import-position
-pytestmark = pytest.mark.xdsl
-xdsl = pytest.importorskip("xdsl")
-
 from catalyst.python_interface.dialects import QEC
 
+pytestmark = pytest.mark.xdsl
+
 all_ops = list(QEC.operations)
 all_attrs = list(QEC.attributes)
 

frontend/test/pytest/python_interface/dialects/test_quantum_dialect.py

@@ -11,14 +11,9 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-
 """Unit tests for the xDSL Quantum dialect."""
-import pytest
-
-# pylint: disable=wrong-import-position
-pytestmark = pytest.mark.xdsl
-xdsl = pytest.importorskip("xdsl")
 
+import pytest
 from xdsl.dialects.builtin import (
     I32,
     ComplexType,
@@ -40,6 +35,8 @@
     QuregType,
 )
 
+pytestmark = pytest.mark.xdsl
+
 all_ops = list(Quantum.operations)
 all_attrs = list(Quantum.attributes)
 

frontend/test/pytest/python_interface/dialects/test_stablehlo_dialect.py

@@ -11,13 +11,12 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-
 """Unit test module for catalyst/python_interface/dialects/stablehlo.py."""
 # pylint: disable=line-too-long
+
 import pytest
 
 pytestmark = pytest.mark.xdsl
-xdsl = pytest.importorskip("xdsl")
 
 
 def test_all_unary_operations(run_filecheck):

frontend/test/pytest/python_interface/dialects/test_transform_dialect.py

@@ -11,17 +11,12 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-
 """Unit tests for the xDSL Transform dialect."""
+# pylint: disable=line-too-long
 
 from dataclasses import dataclass
 
 import pytest
-
-# pylint: disable=wrong-import-position,line-too-long
-pytestmark = pytest.mark.xdsl
-xdsl = pytest.importorskip("xdsl")
-
 from xdsl import passes
 from xdsl.context import Context
 from xdsl.dialects import builtin, transform
@@ -37,6 +32,8 @@
     compiler_transform,
 )
 
+pytestmark = pytest.mark.xdsl
+
 
 def test_dict_options():
     """Test ApplyRegisteredPassOp constructor with DictionaryAttr options."""

frontend/test/pytest/python_interface/inspection/test_draw_unified_compiler.py

@@ -12,23 +12,20 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 """Unit test module for the draw function in the unified compiler inspection module."""
+# pylint: disable=unnecessary-lambda
 
-
-import pytest
-
-pytestmark = pytest.mark.xdsl
-xdsl = pytest.importorskip("xdsl")
-
-# pylint: disable=wrong-import-position,unnecessary-lambda
 import jax
 import pennylane as qml
+import pytest
 
 from catalyst.python_interface.inspection import draw
 from catalyst.python_interface.transforms import (
     iterative_cancel_inverses_pass,
     merge_rotations_pass,
 )
 
+pytestmark = pytest.mark.xdsl
+
 
 @pytest.mark.usefixtures("use_capture")
 class Testdraw:

frontend/test/pytest/python_interface/inspection/test_mlir_graph.py

@@ -16,25 +16,21 @@
 from pathlib import Path
 from subprocess import run
 
-import pytest
-
-# pylint: disable=wrong-import-position
-pytestmark = pytest.mark.xdsl
-xdsl = pytest.importorskip("xdsl")
-graphviz = pytest.importorskip("graphviz")
-
-if run(["/usr/bin/which", "dot"], check=False).returncode != 0:
-    pytest.skip(reason="Graphviz isn't installed.")
-
-
 import pennylane as qml
+import pytest
 
 from catalyst.python_interface.inspection import generate_mlir_graph
 from catalyst.python_interface.transforms import (
     iterative_cancel_inverses_pass,
     merge_rotations_pass,
 )
 
+pytestmark = pytest.mark.xdsl
+graphviz = pytest.importorskip("graphviz")
+
+if run(["/usr/bin/which", "dot"], check=False).returncode != 0:
+    pytest.skip(reason="Graphviz isn't installed.")
+
 
 @pytest.fixture(autouse=True)
 def _chdir_tmp(monkeypatch, tmp_path: Path):