X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?p=pysvrt.git;a=blobdiff_plain;f=svrtset.py;h=0a14121c9a838fb15db18e5b3f114dad2f695e60;hp=49f32799da7b0ba4a880d9aacc90278617908220;hb=a4820693a16a173fd21b8a7580342fe0ad9e8af8;hpb=e754d1075d8d0a5949e71f426ab07ce73be6099e

diff --git a/svrtset.py b/svrtset.py
index 49f3279..0a14121 100755
--- a/svrtset.py
+++ b/svrtset.py
@@ -29,6 +29,9 @@ from torch.autograd import Variable
 
 import svrt
 
+# FIXME
+import resource
+
 ######################################################################
 
 def generate_one_batch(s):
@@ -48,10 +51,11 @@ class VignetteSet:
             raise
 
         self.cuda = cuda
-        self.batch_size = batch_size
         self.problem_number = problem_number
-        self.nb_batches = nb_samples // batch_size
-        self.nb_samples = self.nb_batches * self.batch_size
+
+        self.batch_size = batch_size
+        self.nb_samples = nb_samples
+        self.nb_batches = self.nb_samples // self.batch_size
 
         seeds = torch.LongTensor(self.nb_batches).random_()
         mp_args = []
@@ -96,10 +100,12 @@ class CompressedVignetteSet:
             raise
 
         self.cuda = cuda
-        self.batch_size = batch_size
         self.problem_number = problem_number
-        self.nb_batches = nb_samples // batch_size
-        self.nb_samples = self.nb_batches * self.batch_size
+
+        self.batch_size = batch_size
+        self.nb_samples = nb_samples
+        self.nb_batches = self.nb_samples // self.batch_size
+
         self.targets = []
         self.input_storages = []
 
@@ -108,12 +114,17 @@ class CompressedVignetteSet:
         for b in range(0, self.nb_batches):
             target = torch.LongTensor(self.batch_size).bernoulli_(0.5)
             input = svrt.generate_vignettes(problem_number, target)
-            acc += input.float().sum() / input.numel()
-            acc_sq += input.float().pow(2).sum() /  input.numel()
+            acc += input.sum() / input.numel()
+            acc_sq += (input * input).sum() /  input.numel()
             self.targets.append(target)
             self.input_storages.append(svrt.compress(input.storage()))
             if logger is not None: logger(self.nb_batches * self.batch_size, b * self.batch_size)
 
+            # FIXME
+            if resource.getrusage(resource.RUSAGE_SELF).ru_maxrss > 16e6:
+                print('Memory leak?!')
+                raise
+
         self.mean = acc / self.nb_batches
         self.std = sqrt(acc_sq / self.nb_batches - self.mean * self.mean)