reorganise imports

diff --git a/src/ieee754/add/concurrentunit.py b/src/ieee754/add/concurrentunit.py
index c0053c8b5f26a3d6435d2987f114023621835950..dbe4a964ef4cea1772a23c661f8313754b026cab 100644 (file)
--- a/src/ieee754/add/concurrentunit.py
+++ b/src/ieee754/add/concurrentunit.py
@@ -10,12 +10,12 @@ from singlepipe import PassThroughStage
 from multipipe import CombMuxOutPipe
 from multipipe import PriorityCombMuxInPipe
 
 from multipipe import CombMuxOutPipe
 from multipipe import PriorityCombMuxInPipe
 

-from fpcommon.getop import FPADDBaseData
-from fpcommon.denorm import FPSCData
-from fpcommon.pack import FPPackData
-from fpcommon.normtopack import FPNormToPack
-from fpadd.specialcases import FPAddSpecialCasesDeNorm
-from fpadd.addstages import FPAddAlignSingleAdd
+from ieee754.fpcommon.getop import FPADDBaseData
+from ieee754.fpcommon.denorm import FPSCData
+from ieee754.fpcommon.pack import FPPackData
+from ieee754.fpcommon.normtopack import FPNormToPack
+from ieee754.fpadd.specialcases import FPAddSpecialCasesDeNorm
+from ieee754.fpadd.addstages import FPAddAlignSingleAdd

 
 
 def num_bits(n):
 
 
 def num_bits(n):

diff --git a/src/ieee754/add/nmigen_add_experiment.py b/src/ieee754/add/nmigen_add_experiment.py
index ecb1d35b14350f67e95f51522dc7407b2f056bc8..773e3aee155d6f0d90ed42e99a97f13ae8a14e36 100644 (file)
--- a/src/ieee754/add/nmigen_add_experiment.py
+++ b/src/ieee754/add/nmigen_add_experiment.py
@@ -3,8 +3,8 @@
 # 2013-12-12
 
 from nmigen.cli import main, verilog
 # 2013-12-12
 
 from nmigen.cli import main, verilog

-from fpadd.statemachine import FPADDBase, FPADD
-from fpadd.pipeline import FPADDMuxInOut
+from ieee754.fpadd.statemachine import FPADDBase, FPADD
+from ieee754.fpadd.pipeline import FPADDMuxInOut

 
 if __name__ == "__main__":
     if True:
 
 if __name__ == "__main__":
     if True:

diff --git a/src/ieee754/fpadd/add0.py b/src/ieee754/fpadd/add0.py
index 76790fe22bbd4d48220e98b78d694b8ef2567180..f380d3e5e5c1411759604040e822fdd83777a926 100644 (file)
--- a/src/ieee754/fpadd/add0.py
+++ b/src/ieee754/fpadd/add0.py
@@ -7,7 +7,7 @@ from nmigen.cli import main, verilog
 
 from fpbase import FPNumBase
 from fpbase import FPState
 
 from fpbase import FPNumBase
 from fpbase import FPState

-from fpcommon.denorm import FPSCData
+from ieee754.fpcommon.denorm import FPSCData

 
 
 class FPAddStage0Data:
 
 
 class FPAddStage0Data:

diff --git a/src/ieee754/fpadd/add1.py b/src/ieee754/fpadd/add1.py
index 679f5176d2d9227c41637d9fb9db2d6c08c6845d..1c0ff27a3d7e149ec30c9d121b3c05fe6e130073 100644 (file)
--- a/src/ieee754/fpadd/add1.py
+++ b/src/ieee754/fpadd/add1.py
@@ -7,8 +7,8 @@ from nmigen.cli import main, verilog
 from math import log
 
 from fpbase import FPState
 from math import log
 
 from fpbase import FPState

-from fpcommon.postcalc import FPAddStage1Data
-from fpadd.add0 import FPAddStage0Data
+from ieee754.fpcommon.postcalc import FPAddStage1Data
+from .add0 import FPAddStage0Data

 
 
 class FPAddStage1Mod(FPState, Elaboratable):
 
 
 class FPAddStage1Mod(FPState, Elaboratable):

diff --git a/src/ieee754/fpadd/addstages.py b/src/ieee754/fpadd/addstages.py
index f5703aeceaacd6c99855b9977aab4d95a8432b62..62452c37c8478dba1dfa030da619a8409322672c 100644 (file)
--- a/src/ieee754/fpadd/addstages.py
+++ b/src/ieee754/fpadd/addstages.py
@@ -9,11 +9,11 @@ from singlepipe import (StageChain, SimpleHandshake,
                         PassThroughStage)
 
 from fpbase import FPState
                         PassThroughStage)
 
 from fpbase import FPState

-from fpcommon.denorm import FPSCData
-from fpcommon.postcalc import FPAddStage1Data
-from fpadd.align import FPAddAlignSingleMod
-from fpadd.add0 import FPAddStage0Mod
-from fpadd.add1 import FPAddStage1Mod
+from ieee754.fpcommon.denorm import FPSCData
+from ieee754.fpcommon.postcalc import FPAddStage1Data
+from .align import FPAddAlignSingleMod
+from .add0 import FPAddStage0Mod
+from .add1 import FPAddStage1Mod

 
 
 class FPAddAlignSingleAdd(FPState, SimpleHandshake):
 
 
 class FPAddAlignSingleAdd(FPState, SimpleHandshake):

diff --git a/src/ieee754/fpadd/align.py b/src/ieee754/fpadd/align.py
index 9837a0b8c91b39270f211872bae793b83b172094..c4b4d52fe238b19926fca7d81599c30b3b7e9ce1 100644 (file)
--- a/src/ieee754/fpadd/align.py
+++ b/src/ieee754/fpadd/align.py
@@ -8,7 +8,7 @@ from nmigen.cli import main, verilog
 from fpbase import FPNumOut, FPNumIn, FPNumBase
 from fpbase import MultiShiftRMerge
 from fpbase import FPState
 from fpbase import FPNumOut, FPNumIn, FPNumBase
 from fpbase import MultiShiftRMerge
 from fpbase import FPState

-from fpcommon.denorm import FPSCData
+from ieee754.fpcommon.denorm import FPSCData

 
 
 class FPNumIn2Ops:
 
 
 class FPNumIn2Ops:

diff --git a/src/ieee754/fpadd/pipeline.py b/src/ieee754/fpadd/pipeline.py
index e244ee60e2f373d917de6eaeaca4a6e7f74d9f32..5c4eed18d9aba94a9956c425e216e1ba579192dd 100644 (file)
--- a/src/ieee754/fpadd/pipeline.py
+++ b/src/ieee754/fpadd/pipeline.py
@@ -9,12 +9,12 @@ from singlepipe import (ControlBase, SimpleHandshake, PassThroughStage)
 from multipipe import CombMuxOutPipe
 from multipipe import PriorityCombMuxInPipe
 
 from multipipe import CombMuxOutPipe
 from multipipe import PriorityCombMuxInPipe
 

-from fpcommon.getop import FPADDBaseData
-from fpcommon.denorm import FPSCData
-from fpcommon.pack import FPPackData
-from fpcommon.normtopack import FPNormToPack
-from fpadd.specialcases import FPAddSpecialCasesDeNorm
-from fpadd.addstages import FPAddAlignSingleAdd
+from ieee754.fpcommon.getop import FPADDBaseData
+from ieee754.fpcommon.denorm import FPSCData
+from ieee754.fpcommon.pack import FPPackData
+from ieee754.fpcommon.normtopack import FPNormToPack
+from .specialcases import FPAddSpecialCasesDeNorm
+from .addstages import FPAddAlignSingleAdd

 
 from concurrentunit import ReservationStations, num_bits
 
 
 from concurrentunit import ReservationStations, num_bits
 

diff --git a/src/ieee754/fpadd/specialcases.py b/src/ieee754/fpadd/specialcases.py
index 6f9d1a08575773c3e57139c480a1b8b84ed5b677..39254a74f772d4565439d975c0857b4c7d02bd19 100644 (file)
--- a/src/ieee754/fpadd/specialcases.py
+++ b/src/ieee754/fpadd/specialcases.py
@@ -10,8 +10,8 @@ from fpbase import FPNumDecode
 from singlepipe import SimpleHandshake, StageChain
 
 from fpbase import FPState, FPID
 from singlepipe import SimpleHandshake, StageChain
 
 from fpbase import FPState, FPID

-from fpcommon.getop import FPADDBaseData
-from fpcommon.denorm import (FPSCData, FPAddDeNormMod)
+from ieee754.fpcommon.getop import FPADDBaseData
+from ieee754.fpcommon.denorm import (FPSCData, FPAddDeNormMod)

 
 
 class FPAddSpecialCasesMod:
 
 
 class FPAddSpecialCasesMod:

diff --git a/src/ieee754/fpadd/statemachine.py b/src/ieee754/fpadd/statemachine.py
index 4418b3fa8f07471b5b9067a6175f0306ad10c5d8..e7f298d3e433eb74c3104625e9d4698066668d17 100644 (file)
--- a/src/ieee754/fpadd/statemachine.py
+++ b/src/ieee754/fpadd/statemachine.py
@@ -11,22 +11,22 @@ from fpbase import Trigger
 from singlepipe import (StageChain, SimpleHandshake)
 
 from fpbase import FPState, FPID
 from singlepipe import (StageChain, SimpleHandshake)
 
 from fpbase import FPState, FPID

-from fpcommon.getop import (FPGetOp, FPADDBaseData, FPGet2Op)
-from fpcommon.denorm import (FPSCData, FPAddDeNorm)
-from fpcommon.postcalc import FPAddStage1Data
-from fpcommon.postnormalise import (FPNorm1Data,
+from ieee754.fpcommon.getop import (FPGetOp, FPADDBaseData, FPGet2Op)
+from ieee754.fpcommon.denorm import (FPSCData, FPAddDeNorm)
+from ieee754.fpcommon.postcalc import FPAddStage1Data
+from ieee754.fpcommon.postnormalise import (FPNorm1Data,

                             FPNorm1Single, FPNorm1Multi)
                             FPNorm1Single, FPNorm1Multi)

-from fpcommon.roundz import (FPRoundData, FPRound)
-from fpcommon.corrections import FPCorrections
-from fpcommon.pack import (FPPackData, FPPackMod, FPPack)
-from fpcommon.normtopack import FPNormToPack
-from fpcommon.putz import (FPPutZ, FPPutZIdx)
-
-from fpadd.specialcases import (FPAddSpecialCases, FPAddSpecialCasesDeNorm)
-from fpadd.align import (FPAddAlignMulti, FPAddAlignSingle)
-from fpadd.add0 import (FPAddStage0Data, FPAddStage0)
-from fpadd.add1 import (FPAddStage1Mod, FPAddStage1)
-from fpadd.addstages import FPAddAlignSingleAdd
+from ieee754.fpcommon.roundz import (FPRoundData, FPRound)
+from ieee754.fpcommon.corrections import FPCorrections
+from ieee754.fpcommon.pack import (FPPackData, FPPackMod, FPPack)
+from ieee754.fpcommon.normtopack import FPNormToPack
+from ieee754.fpcommon.putz import (FPPutZ, FPPutZIdx)
+
+from .specialcases import (FPAddSpecialCases, FPAddSpecialCasesDeNorm)
+from .align import (FPAddAlignMulti, FPAddAlignSingle)
+from .add0 import (FPAddStage0Data, FPAddStage0)
+from .add1 import (FPAddStage1Mod, FPAddStage1)
+from .addstages import FPAddAlignSingleAdd

 
 
 class FPOpData:
 
 
 class FPOpData:

diff --git a/src/ieee754/fpcommon/corrections.py b/src/ieee754/fpcommon/corrections.py
index ce9ba3cd190b7c21cf46b2316396af7f0096a6a4..68340275a904dc163db609ba905d87ad1b1cd5c6 100644 (file)
--- a/src/ieee754/fpcommon/corrections.py
+++ b/src/ieee754/fpcommon/corrections.py
@@ -5,7 +5,7 @@
 from nmigen import Module, Elaboratable
 from nmigen.cli import main, verilog
 from fpbase import FPState
 from nmigen import Module, Elaboratable
 from nmigen.cli import main, verilog
 from fpbase import FPState

-from fpcommon.roundz import FPRoundData
+from .roundz import FPRoundData

 
 
 class FPCorrectionsMod(Elaboratable):
 
 
 class FPCorrectionsMod(Elaboratable):

diff --git a/src/ieee754/fpcommon/normtopack.py b/src/ieee754/fpcommon/normtopack.py
index 87d08125f8723738db9177b4275f2c542b4967d2..7d871f42efe73611a7c47348721e9e1fad07ea8c 100644 (file)
--- a/src/ieee754/fpcommon/normtopack.py
+++ b/src/ieee754/fpcommon/normtopack.py
@@ -7,11 +7,11 @@
 from singlepipe import StageChain, SimpleHandshake
 
 from fpbase import FPState, FPID
 from singlepipe import StageChain, SimpleHandshake
 
 from fpbase import FPState, FPID

-from fpcommon.postcalc import FPAddStage1Data
-from fpcommon.postnormalise import FPNorm1ModSingle
-from fpcommon.roundz import FPRoundMod
-from fpcommon.corrections import FPCorrectionsMod
-from fpcommon.pack import FPPackData, FPPackMod
+from .postcalc import FPAddStage1Data
+from .postnormalise import FPNorm1ModSingle
+from .roundz import FPRoundMod
+from .corrections import FPCorrectionsMod
+from .pack import FPPackData, FPPackMod

 
 
 class FPNormToPack(FPState, SimpleHandshake):
 
 
 class FPNormToPack(FPState, SimpleHandshake):

diff --git a/src/ieee754/fpcommon/pack.py b/src/ieee754/fpcommon/pack.py
index 1464883cdeec57ed4fcc002ecb192b557f7db4fc..18d6921da075d5d0d8aee6739201292928aa5d0d 100644 (file)
--- a/src/ieee754/fpcommon/pack.py
+++ b/src/ieee754/fpcommon/pack.py
@@ -7,7 +7,7 @@ from nmigen.cli import main, verilog
 
 from fpbase import FPNumOut
 from fpbase import FPState
 
 from fpbase import FPNumOut
 from fpbase import FPState

-from fpcommon.roundz import FPRoundData
+from .roundz import FPRoundData

 from singlepipe import Object
 
 
 from singlepipe import Object
 
 

diff --git a/src/ieee754/fpcommon/roundz.py b/src/ieee754/fpcommon/roundz.py
index 420d6669a10799190f23585b1d09c31dad118af2..2b456fba47988865b580fde16c06ce02f4120909 100644 (file)
--- a/src/ieee754/fpcommon/roundz.py
+++ b/src/ieee754/fpcommon/roundz.py
@@ -7,7 +7,7 @@ from nmigen.cli import main, verilog
 
 from fpbase import FPNumBase
 from fpbase import FPState
 
 from fpbase import FPNumBase
 from fpbase import FPState

-from fpcommon.postnormalise import FPNorm1Data
+from .postnormalise import FPNorm1Data

 
 
 class FPRoundData:
 
 
 class FPRoundData: