Fixed compilation errors

Author: sandy9999

Compiler/decision_tree_new.py

@@ -357,21 +357,21 @@ def _():
 
     def __init__(self, x, y, h, binary=False, attr_lengths=None,
                  n_threads=None):
-    """ Securely Training Decision Trees Efficiently by `Bhardwaj et al.`_ : https://eprint.iacr.org/2024/1077.pdf
+        """ Securely Training Decision Trees Efficiently by `Bhardwaj et al.`_ : https://eprint.iacr.org/2024/1077.pdf
 
-    This protocol has communication complexity O( mN logN + hmN + hN log N) which is an improvement of ~min(h, m, log N) over `Hamada et al.`_ : https://petsymposium.org/popets/2023/popets-2023-0021.pdf
+        This protocol has communication complexity O( mN logN + hmN + hN log N) which is an improvement of ~min(h, m, log N) over `Hamada et al.`_ : https://petsymposium.org/popets/2023/popets-2023-0021.pdf
 
-    To run this protocol, at the root of the MP-SPDZ repo, run Scripts/compile-run.py -H HOSTS -E ring custom_data_dt $((2**13)) 11 4 -Z 3 -R 128
+        To run this protocol, at the root of the MP-SPDZ repo, run Scripts/compile-run.py -H HOSTS -E ring custom_data_dt $((2**13)) 11 4 -Z 3 -R 128
 
-    :param x: Attribute values 
-    :param y: Binary labels 
-    :param h: Height of the decision tree
-    :param binary: Binary attributes instead of continuous
-    :param attr_lengths: Attribute description for mixed data
+        :param x: Attribute values 
+        :param y: Binary labels 
+        :param h: Height of the decision tree
+        :param binary: Binary attributes instead of continuous
+        :param attr_lengths: Attribute description for mixed data
       (list of 0/1 for continuous/binary)
-    :param n_threads: Number of threads 
+        :param n_threads: Number of threads 
 
-    """
+        """
         assert not (binary and attr_lengths)
         if binary:
             attr_lengths = [1] * len(x)

Compiler/sorting.py

@@ -73,3 +73,24 @@ def _():
         @library.else_
         def _():
             reveal_sort(h, D, reverse=True)
+
+def radix_sort_permutation_from_matrix(bs, D):
+    n = len(D)
+    for b in bs:
+        assert(len(b) == n)
+    B = types.sint.Matrix(n, 2)
+    h = types.Array.create_from(types.sint(types.regint.inc(n)))
+    @library.for_range(len(bs))
+    def _(i):
+        b = bs[i]
+        B.set_column(0, 1 - b.get_vector())
+        B.set_column(1, b.get_vector())
+        c = types.Array.create_from(dest_comp(B))
+        reveal_sort(c, h, reverse=False)
+        @library.if_e(i < len(bs) - 1)
+        def _():
+            reveal_sort(h, bs[i + 1], reverse=True)
+        @library.else_
+        def _():
+            reveal_sort(h, D, reverse=True)
+    return h