45 parallelize point est hist and naive stack

src/rail/core/data.py

@@ -35,6 +35,7 @@
         self.fileObj = None
         self.groups = None
         self.partial = False
+        self.lenght = None
 
     def open(self, **kwargs):
         """Open and return the associated file
@@ -309,6 +310,17 @@
         if not isinstance(data, qp.Ensemble):
             raise TypeError(f"Expected `data` to be a `qp.Ensemble`, but {type(data)} was provided. Perhaps you meant to use `TableHandle`?")
 
+    # @classmethod
+    def _size(cls, path, **kwargs):
+        if path == 'None':
+            return cls.data.npdf
+        return tables_io.io.getInputDataLengthHdf5(path, groupname='data')
+
+    @classmethod
+    def _iterator(cls, path, **kwargs):
+        """Iterate over the data"""
+        kwargs.pop('groupname','None')
+        return qp.iterator(path, **kwargs)
 
 def default_model_read(modelfile):
     """Default function to read model files, simply used pickle.load"""

src/rail/core/stage.py

@@ -326,10 +326,17 @@ def input_iterator(self, tag, **kwargs):
             These will be passed to the Handle's iterator method
         """
         handle = self.get_handle(tag, allow_missing=True)
-        if self.config.hdf5_groupname and handle.path: 
-            self._input_length = handle.size(groupname=self.config.hdf5_groupname)
+
+        try:
+            self.config.hdf5_groupname
+        except:
+            self.config.hdf5_groupname = None
+        self._input_length = handle.size(groupname=self.config.hdf5_groupname)
+
+        if handle.path and handle.path!='None':
             total_chunks_needed = ceil(self._input_length/self.config.chunk_size)
-            if total_chunks_needed<self.size:  #pragma: no cover
+            # If the number of process is larger than we need, we wemove some of them
+            if total_chunks_needed < self.size:  #pragma: no cover
                 color = self.rank+1 <= total_chunks_needed
                 newcomm = self.comm.Split(color=color,key=self.rank)
                 if color:
@@ -342,17 +349,15 @@ def input_iterator(self, tag, **kwargs):
                           parallel_size=self.size)
             kwcopy.update(**kwargs)
             return handle.iterator(**kwcopy)
-                # If data is in memory and not in a file, it means is small enough to process it
-                # in a single chunk.
+        # If data is in memory and not in a file, it means is small enough to process it
+        # in a single chunk.
         else:  #pragma: no cover
             if self.config.hdf5_groupname:
                 test_data = self.get_data('input')[self.config.hdf5_groupname]
             else:
                 test_data = self.get_data('input')
             s = 0
-            e = len(list(test_data.items())[0][1])
-            self._input_length=e
-            iterator=[[s, e, test_data]]
+            iterator=[[s, self._input_length, test_data]]
             return iterator
 
     def connect_input(self, other, inputTag=None, outputTag=None):

src/rail/estimation/algos/naive_stack.py

@@ -44,18 +44,58 @@
         self.zgrid = None
 
     def run(self):
-        rng = np.random.default_rng(seed=self.config.seed)
-        test_data = self.get_data('input')
+        iterator = self.input_iterator('input')
         self.zgrid = np.linspace(self.config.zmin, self.config.zmax, self.config.nzbins + 1)
-        pdf_vals = test_data.pdf(self.zgrid)
-        yvals = np.expand_dims(np.sum(np.where(np.isfinite(pdf_vals), pdf_vals, 0.), axis=0), 0)
-        qp_d = qp.Ensemble(qp.interp, data=dict(xvals=self.zgrid, yvals=yvals))
+        # Initiallizing the stacking pdf's
+        yvals = np.zeros((1, len(self.zgrid)))
+        bvals = np.zeros((self.config.nsamples, len(self.zgrid)))
+        bootstrap_matrix  = self.broadcast_bootstrap_matrix()
+
+        first = True
+        for s, e, test_data in iterator:
+            print(f"Process {self.rank} running estimator on chunk {s} - {e}")
+            self._process_chunk(s, e, test_data, first, bootstrap_matrix, yvals, bvals)
+            first = False
+        if self.comm is not None:  # pragma: no cover
+            bvals, yvals = self.join_histograms(bvals, yvals)
+
+        if self.rank == 0:
+            sample_ens = qp.Ensemble(qp.interp, data=dict(xvals=self.zgrid, yvals=bvals))
+            qp_d = qp.Ensemble(qp.interp, data=dict(xvals=self.zgrid, yvals=yvals))
+            self.add_data('output', sample_ens)
+            self.add_data('single_NZ', qp_d)
 
-        bvals = np.empty((self.config.nsamples, len(self.zgrid)))
+
+    def  _process_chunk(self, start, end, data, first, bootstrap_matrix, yvals, bvals):
+        pdf_vals = data.pdf(self.zgrid)
+        yvals += np.expand_dims(np.sum(np.where(np.isfinite(pdf_vals), pdf_vals, 0.), axis=0), 0)
+        # qp_d is the normalized probability of the stack, we need to know how many galaxies were
         for i in range(self.config.nsamples):
-            bootstrap_draws = rng.integers(low=0, high=test_data.npdf, size=test_data.npdf)
-            bvals[i] = np.sum(pdf_vals[bootstrap_draws], axis=0)
-        sample_ens = qp.Ensemble(qp.interp, data=dict(xvals=self.zgrid, yvals=bvals))
+            bootstrap_draws = bootstrap_matrix[:, i]
+            # Neither all of the bootstrap_draws are in this chunk nor the index starts at "start"
+            mask = (bootstrap_draws>=start) & (bootstrap_draws<end)
+            bootstrap_draws = bootstrap_draws[mask] - start
+            bvals[i] += np.sum(pdf_vals[bootstrap_draws], axis=0)
+
+    def broadcast_bootstrap_matrix(self):
+        rng = np.random.default_rng(seed=self.config.seed)
+        # Only one of the nodes needs to produce the bootstrap indices
+        ngal = self._input_length
+        print('i am the rank with number of galaxies',self.rank,ngal)
+        if self.rank == 0:
+            bootstrap_matrix = rng.integers(low=0, high=ngal, size=(ngal,self.config.nsamples))
+        else:  # pragma: no cover
+            bootstrap_matrix = None
+        if self.comm is not None:  # pragma: no cover
+            self.comm.Barrier()
+            bootstrap_matrix = self.comm.bcast(bootstrap_matrix, root = 0)
+        return bootstrap_matrix
+
+    def join_histograms(self, bvals, yvals):
+        bvals_r = self.comm.reduce(bvals)
+        yvals_r = self.comm.reduce(yvals)
+        return(bvals_r, yvals_r)
+
+
+
 
-        self.add_data('output', sample_ens)
-        self.add_data('single_NZ', qp_d)

tests/core/test_core.py

@@ -107,7 +107,7 @@ def test_pq_handle():
 
 
 def test_qp_handle():
-    datapath = os.path.join(RAILDIR, "rail", "examples_data", "testdata", "output_BPZ_lite.fits")
+    datapath = os.path.join(RAILDIR, "rail", "examples_data", "testdata", "output_BPZ_lite.hdf5")
     handle = do_data_handle(datapath, QPHandle)
     qpfile = handle.open()
     assert qpfile

tests/estimation/test_classifier.py

@@ -12,7 +12,7 @@
 DS = RailStage.data_store
 DS.__class__.allow_overwrite = True
 
-inputdata = os.path.join(RAILDIR, 'rail/examples_data/testdata/output_BPZ_lite.fits')
+inputdata = os.path.join(RAILDIR, 'rail/examples_data/testdata/output_BPZ_lite.hdf5')
 
 @pytest.mark.parametrize(
     "input_param", 

tests/estimation/test_summarizers.py

@@ -5,7 +5,7 @@
 from rail.core.utils import RAILDIR
 from rail.estimation.algos import naive_stack, point_est_hist, var_inf
 
-testdata = os.path.join(RAILDIR, "rail/examples_data/testdata/output_BPZ_lite.fits")
+testdata = os.path.join(RAILDIR, "rail/examples_data/testdata/output_BPZ_lite.hdf5")
 DS = RailStage.data_store