From 4045d6c5bf14e22bc9f5282b801b75fe2985a41c Mon Sep 17 00:00:00 2001 From: Luke Kenneth Casson Leighton Date: Fri, 29 Mar 2019 12:22:43 +0000 Subject: [PATCH] start removing unneeded imports --- src/add/fpadd/pipeline.py | 27 +++++--------------------- src/add/nmigen_add_experiment.py | 33 -------------------------------- 2 files changed, 5 insertions(+), 55 deletions(-) diff --git a/src/add/fpadd/pipeline.py b/src/add/fpadd/pipeline.py index 7bb0b73f..2e43f072 100644 --- a/src/add/fpadd/pipeline.py +++ b/src/add/fpadd/pipeline.py @@ -7,32 +7,15 @@ from nmigen.lib.coding import PriorityEncoder from nmigen.cli import main, verilog from math import log -from fpbase import FPNumIn, FPNumOut, FPOp, Overflow, FPBase, FPNumBase -from fpbase import MultiShiftRMerge, Trigger -from singlepipe import (ControlBase, StageChain, UnbufferedPipeline, - PassThroughStage) +from singlepipe import (ControlBase, UnbufferedPipeline, PassThroughStage) from multipipe import CombMuxOutPipe from multipipe import PriorityCombMuxInPipe -from fpbase import FPState, FPID -from fpcommon.getop import (FPGetOpMod, FPGetOp, FPNumBase2Ops, FPADDBaseData, - FPGet2OpMod, FPGet2Op) -from fpcommon.denorm import (FPSCData, FPAddDeNormMod, FPAddDeNorm) -from fpcommon.postcalc import FPAddStage1Data -from fpcommon.postnormalise import (FPNorm1Data, FPNorm1ModSingle, - FPNorm1ModMulti, FPNorm1Single, FPNorm1Multi) -from fpcommon.roundz import (FPRoundData, FPRoundMod, FPRound) -from fpcommon.corrections import (FPCorrectionsMod, FPCorrections) -from fpcommon.pack import (FPPackData, FPPackMod, FPPack) +from fpcommon.getop import FPADDBaseData +from fpcommon.denorm import FPSCData +from fpcommon.pack import FPPackData from fpcommon.normtopack import FPNormToPack -from fpcommon.putz import (FPPutZ, FPPutZIdx) - -from fpadd.specialcases import (FPAddSpecialCasesMod, FPAddSpecialCases, - FPAddSpecialCasesDeNorm) -from fpadd.align import (FPAddAlignMulti, FPAddAlignMultiMod, FPNumIn2Ops, - FPAddAlignSingleMod, FPAddAlignSingle) -from fpadd.add0 import (FPAddStage0Data, FPAddStage0Mod, FPAddStage0) -from fpadd.add1 import (FPAddStage1Mod, FPAddStage1) +from fpadd.specialcases import FPAddSpecialCasesDeNorm from fpadd.addstages import FPAddAlignSingleAdd diff --git a/src/add/nmigen_add_experiment.py b/src/add/nmigen_add_experiment.py index b681b946..84e6790c 100644 --- a/src/add/nmigen_add_experiment.py +++ b/src/add/nmigen_add_experiment.py @@ -2,39 +2,6 @@ # Copyright (C) Jonathan P Dawson 2013 # 2013-12-12 -from nmigen import Module, Signal, Cat, Mux, Array, Const -from nmigen.lib.coding import PriorityEncoder -from nmigen.cli import main, verilog -from math import log - -from fpbase import FPNumIn, FPNumOut, FPOp, Overflow, FPBase, FPNumBase -from fpbase import MultiShiftRMerge, Trigger -from singlepipe import (ControlBase, StageChain, UnbufferedPipeline, - PassThroughStage) -from multipipe import CombMuxOutPipe -from multipipe import PriorityCombMuxInPipe - -from fpbase import FPState, FPID -from fpcommon.getop import (FPGetOpMod, FPGetOp, FPNumBase2Ops, FPADDBaseData, - FPGet2OpMod, FPGet2Op) -from fpcommon.denorm import (FPSCData, FPAddDeNormMod, FPAddDeNorm) -from fpcommon.postcalc import FPAddStage1Data -from fpcommon.postnormalise import (FPNorm1Data, FPNorm1ModSingle, - FPNorm1ModMulti, FPNorm1Single, FPNorm1Multi) -from fpcommon.roundz import (FPRoundData, FPRoundMod, FPRound) -from fpcommon.corrections import (FPCorrectionsMod, FPCorrections) -from fpcommon.pack import (FPPackData, FPPackMod, FPPack) -from fpcommon.normtopack import FPNormToPack -from fpcommon.putz import (FPPutZ, FPPutZIdx) - -from fpadd.specialcases import (FPAddSpecialCasesMod, FPAddSpecialCases, - FPAddSpecialCasesDeNorm) -from fpadd.align import (FPAddAlignMulti, FPAddAlignMultiMod, FPNumIn2Ops, - FPAddAlignSingleMod, FPAddAlignSingle) -from fpadd.add0 import (FPAddStage0Data, FPAddStage0Mod, FPAddStage0) -from fpadd.add1 import (FPAddStage1Mod, FPAddStage1) -from fpadd.addstages import FPAddAlignSingleAdd - from fpadd.statemachine import FPADDBase, FPADD from fpadd.pipeline import FPADDMuxInOut -- 2.30.2