diff --git a/modneflib/modnef/modnef_torch/model.py b/modneflib/modnef/modnef_torch/model.py index 0da59bc486daf528582ead68609895f0df203b5f..152cd9337d81bd3a92af86598dc16dcf89877fb7 100644 --- a/modneflib/modnef/modnef_torch/model.py +++ b/modneflib/modnef/modnef_torch/model.py @@ -100,6 +100,21 @@ class ModNEFModel(nn.Module): for m in self.modules(): if isinstance(m, ModNEFNeuron): m.init_quantizer() + + def quantize_weight(self, force_init=False): + """ + Quantize synaptic weight + + Parameters + ---------- + force_init = False : bool + force quantizer initialization + """ + + for m in self.modules(): + if isinstance(m, ModNEFNeuron): + m.init_quantizer() + m.quantize_weight() def quantize(self, force_init=False): """ diff --git a/modneflib/modnef/modnef_torch/modnef_neurons/blif_model/blif.py b/modneflib/modnef/modnef_torch/modnef_neurons/blif_model/blif.py index 50f18d89dd311cfcba5fffe6ead72cdabfe1fa3f..2ba0908b4c4f12c640ac21b2c41a527c76559f73 100644 --- a/modneflib/modnef/modnef_torch/modnef_neurons/blif_model/blif.py +++ b/modneflib/modnef/modnef_torch/modnef_neurons/blif_model/blif.py @@ -232,6 +232,7 @@ class BLIF(ModNEFNeuron): input_.data = self.quantizer(input_.data, True) self.mem.data = self.quantizer(self.mem.data, True) + self.reset = self.mem_reset(self.mem) if self.reset_mechanism == "subtract": @@ -241,9 +242,6 @@ class BLIF(ModNEFNeuron): else: self.mem = self.mem*self.beta - if self.quantization_flag: - self.mem.data = self.quantizer(self.mem.data, True) - if self.hardware_estimation_flag: self.val_min = torch.min(torch.min(input_.min(), self.mem.min()), self.val_min) self.val_max = torch.max(torch.max(input_.max(), self.mem.max()), self.val_max) diff --git a/modneflib/modnef/modnef_torch/modnef_neurons/blif_model/rblif.py b/modneflib/modnef/modnef_torch/modnef_neurons/blif_model/rblif.py index c759fcf8212af5aea1aec88b703bf488f7021f84..586048caef74d987f2ae1b8a6f31e681ce6badd3 100644 --- a/modneflib/modnef/modnef_torch/modnef_neurons/blif_model/rblif.py +++ b/modneflib/modnef/modnef_torch/modnef_neurons/blif_model/rblif.py @@ -258,15 +258,15 @@ class RBLIF(ModNEFNeuron): rec = self.reccurent(self.spk) - # if self.quantization_flag: - # self.mem.data = self.quantizer(self.mem.data, True) - # input_.data = self.quantizer(input_.data, True) - # rec.data = self.quantizer(rec.data, True) - if self.quantization_flag: - self.mem = QuantizeMembrane.apply(self.mem, self.quantizer) - input_ = QuantizeMembrane.apply(input_, self.quantizer) - rec = QuantizeMembrane.apply(rec, self.quantizer) + self.mem.data = self.quantizer(self.mem.data, True) + input_.data = self.quantizer(input_.data, True) + rec.data = self.quantizer(rec.data, True) + + # if self.quantization_flag: + # self.mem = QuantizeMembrane.apply(self.mem, self.quantizer) + # input_ = QuantizeMembrane.apply(input_, self.quantizer) + # rec = QuantizeMembrane.apply(rec, self.quantizer) if self.reset_mechanism == "subtract": self.mem = (self.mem+input_+rec)*self.beta-self.reset*self.threshold @@ -279,8 +279,8 @@ class RBLIF(ModNEFNeuron): self.val_min = torch.min(torch.min(input_.min(), self.mem.min()), self.val_min) self.val_max = torch.max(torch.max(input_.max(), self.mem.max()), self.val_max) - if self.quantization_flag: - self.mem.data = self.quantizer(self.mem.data, True) + # if self.quantization_flag: + # self.mem.data = self.quantizer(self.mem.data, True) self.spk = self.fire(self.mem) diff --git a/modneflib/modnef/modnef_torch/modnef_neurons/srlif_model/shiftlif.py b/modneflib/modnef/modnef_torch/modnef_neurons/srlif_model/shiftlif.py index 1906fb5ceac64fc22f8b4adae6a25d14656ae814..654027d04549b9fa99d0c508ccfdd47fb77b269b 100644 --- a/modneflib/modnef/modnef_torch/modnef_neurons/srlif_model/shiftlif.py +++ b/modneflib/modnef/modnef_torch/modnef_neurons/srlif_model/shiftlif.py @@ -264,8 +264,8 @@ class ShiftLIF(ModNEFNeuron): else: self.mem = self.mem-self.__shift(self.mem) - if self.quantization_flag: - self.mem.data = self.quantizer(self.mem.data, True) + # if self.quantization_flag: + # self.mem.data = self.quantizer(self.mem.data, True) if self.hardware_estimation_flag: self.val_min = torch.min(torch.min(input_.min(), self.mem.min()), self.val_min) @@ -331,6 +331,7 @@ class ShiftLIF(ModNEFNeuron): """ self.threshold.data = self.quantizer(self.threshold.data, unscale) + print(self.threshold) @classmethod diff --git a/modneflib/modnef/quantizer/dynamic_scale_quantizer.py b/modneflib/modnef/quantizer/dynamic_scale_quantizer.py index 2631170b678e8ece885ed61e4e16a2efe17340db..0f25c44624f8e2766923149e70ecf45060e712dd 100644 --- a/modneflib/modnef/quantizer/dynamic_scale_quantizer.py +++ b/modneflib/modnef/quantizer/dynamic_scale_quantizer.py @@ -114,7 +114,7 @@ class DynamicScaleFactorQuantizer(Quantizer): weight = torch.Tensor(weight) if not torch.is_tensor(rec_weight): - rec_weight = torch.Tensor(weight) + rec_weight = torch.Tensor(rec_weight) if self.signed==None: self.signed = torch.min(weight.min(), rec_weight.min())<0.0