Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Split transactron core #617

Merged
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion coreblocks/structs_common/rs.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
from amaranth.lib.coding import PriorityEncoder
from transactron import Method, def_method, TModule
from coreblocks.params import RSLayouts, GenParams, OpType
from transactron.core import RecordDict
from transactron.utils import RecordDict
from transactron.utils.transactron_helpers import make_layout

__all__ = ["RS"]
Expand Down
4 changes: 2 additions & 2 deletions test/transactions/test_branches.py
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
from amaranth import *
from itertools import product
from transactron.core import (
CtrlPath,
MethodMap,
TModule,
Method,
Transaction,
TransactionManager,
TransactionModule,
def_method,
)
from transactron.core.tmodule import CtrlPath
from transactron.core.manager import MethodMap
from unittest import TestCase
from transactron.testing import TestCaseWithSimulator
from transactron.utils.dependencies import DependencyContext
Expand Down
3 changes: 1 addition & 2 deletions test/transactions/test_transaction_lib.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,9 @@

from amaranth import *
from transactron import *
from transactron.core import RecordDict
from transactron.lib import *
from coreblocks.utils import *
from transactron.utils._typing import ModuleLike, MethodStruct
from transactron.utils._typing import ModuleLike, MethodStruct, RecordDict
from transactron.utils import ModuleConnector
from transactron.testing import (
SimpleTestCircuit,
Expand Down
2 changes: 1 addition & 1 deletion test/transactions/test_transactions.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@

from transactron.core import (
Priority,
TransactionScheduler,
trivial_roundrobin_cc_scheduler,
eager_deterministic_cc_scheduler,
)
from transactron.core.manager import TransactionScheduler
from transactron.utils.dependencies import DependencyContext


Expand Down
11 changes: 1 addition & 10 deletions transactron/__init__.py
Original file line number Diff line number Diff line change
@@ -1,10 +1 @@
from .core import *

__all__ = [
"TModule",
"TransactionManager",
"TransactionModule",
"Transaction",
"Method",
"def_method",
]
from .core import * # noqa: F401
Loading
Loading