Chore: Many small corrections and Nada Numpy update to 2.0.0 (#52)

* chore: updated numpy to version 2.0.0 * chore: added optional dependencies for examples and linting * fix: added .gitignore to prevent not found file errors * fix: Added linear_regression to testing infrastructure * chore: bump version number
NillionNetwork · Jul 30, 2024 · fbacdd2 · fbacdd2
1 parent 17b8eca
commit fbacdd2
Show file tree

Hide file tree

Showing 38 changed files with 384 additions and 155 deletions.
diff --git a/examples/broadcasting/main.py b/examples/broadcasting/main.py
@@ -7,9 +7,9 @@
 
 import asyncio
 
-import nada_numpy.client as na_client
 import numpy as np
 import py_nillion_client as nillion
+from common.utils import compute, store_program, store_secret_array
 from config import DIM
 from cosmpy.aerial.client import LedgerClient
 from cosmpy.aerial.wallet import LocalWallet
@@ -20,7 +20,7 @@
                                     get_quote_and_pay, pay_with_quote)
 from py_nillion_client import NodeKey, UserKey
 
-from common.utils import compute, store_program, store_secret_array
+import nada_numpy.client as na_client
 
 home = os.getenv("HOME")
 load_dotenv(f"{home}/.config/nillion/nillion-devnet.env")

diff --git a/examples/broadcasting/src/broadcasting.py b/examples/broadcasting/src/broadcasting.py
@@ -2,11 +2,12 @@
 
 from typing import List
 
-# Step 0: Nada Numpy is imported with this line
-import nada_numpy as na
 from config import DIM
 from nada_dsl import Output, SecretInteger
 
+# Step 0: Nada Numpy is imported with this line
+import nada_numpy as na
+
 
 def nada_main() -> List[Output]:
     """

diff --git a/examples/common/utils.py b/examples/common/utils.py
@@ -4,8 +4,6 @@
 import time
 from typing import Any, Callable, Dict, List
 
-import nada_numpy as na
-import nada_numpy.client as na_client
 import numpy as np
 import py_nillion_client as nillion
 from cosmpy.aerial.client import LedgerClient
@@ -14,6 +12,9 @@
                                     create_payments_config, get_quote,
                                     get_quote_and_pay, pay_with_quote)
 
+import nada_numpy as na
+import nada_numpy.client as na_client
+
 
 def async_timer(file_path: os.PathLike) -> Callable:
     """

diff --git a/examples/dot_product/main.py b/examples/dot_product/main.py
@@ -7,9 +7,9 @@
 
 import asyncio
 
-import nada_numpy.client as na_client
 import numpy as np
 import py_nillion_client as nillion
+from common.utils import compute, store_program, store_secret_array
 from config import DIM
 from cosmpy.aerial.client import LedgerClient
 from cosmpy.aerial.wallet import LocalWallet
@@ -20,11 +20,10 @@
                                     get_quote_and_pay, pay_with_quote)
 from py_nillion_client import NodeKey, UserKey
 
-from common.utils import compute, store_program, store_secret_array
+import nada_numpy.client as na_client
 
 home = os.getenv("HOME")
 load_dotenv(f"{home}/.config/nillion/nillion-devnet.env")
-# load_dotenv(f"/workspaces/ai/.nillion-testnet.env")
 
 
 # Main asynchronous function to coordinate the process

diff --git a/examples/dot_product/src/dot_product.py b/examples/dot_product/src/dot_product.py
@@ -3,10 +3,10 @@
 from typing import List
 
 from config import DIM
+from nada_dsl import Output, SecretInteger
 
 # Step 0: Nada Numpy is imported with this line
 import nada_numpy as na
-from nada_dsl import Output, SecretInteger
 
 
 def nada_main() -> List[Output]:

diff --git a/examples/linear-regression/cleartext.ipynb → examples/linear_regression/cleartext.ipynb b/examples/linear-regression/cleartext.ipynb → examples/linear_regression/cleartext.ipynb
diff --git a/examples/linear-regression/main.py → examples/linear_regression/main.py b/examples/linear-regression/main.py → examples/linear_regression/main.py
@@ -7,9 +7,9 @@
 
 import asyncio
 
-import nada_numpy.client as na_client
 import numpy as np
 import py_nillion_client as nillion
+from common.utils import compute, store_program, store_secret_array
 from cosmpy.aerial.client import LedgerClient
 from cosmpy.aerial.wallet import LocalWallet
 from cosmpy.crypto.keypairs import PrivateKey
@@ -20,12 +20,10 @@
 from py_nillion_client import NodeKey, UserKey
 from sklearn.linear_model import Ridge
 
-from common.utils import compute, store_program, store_secret_array
+import nada_numpy.client as na_client
 
 home = os.getenv("HOME")
-
 load_dotenv(f"{home}/.config/nillion/nillion-devnet.env")
-# load_dotenv(f"/workspaces/ai/.nillion-testnet.env")
 
 
 # Main asynchronous function to coordinate the process

diff --git a/examples/linear-regression/nada-project.toml → examples/linear_regression/nada-project.toml b/examples/linear-regression/nada-project.toml → examples/linear_regression/nada-project.toml
diff --git a/...ples/linear-regression/src/determinant.py → ...ples/linear_regression/src/determinant.py b/...ples/linear-regression/src/determinant.py → ...ples/linear_regression/src/determinant.py
@@ -1,6 +1,7 @@
-import nada_numpy as na
 import numpy as np
 from nada_dsl import *
+
+import nada_numpy as na
 from nada_numpy.array import NadaArray
 
 

diff --git a/...les/linear-regression/src/gauss_jordan.py → ...les/linear_regression/src/gauss_jordan.py b/...les/linear-regression/src/gauss_jordan.py → ...les/linear_regression/src/gauss_jordan.py
@@ -1,8 +1,9 @@
-import nada_numpy as na
 import numpy as np
 from modular_inverse import PRIME, public_modular_inverse
 from nada_dsl import *
 
+import nada_numpy as na
+
 # from nada_crypto import random_lu_matrix, public_modular_inverse
 
 

diff --git a/...inear-regression/src/linear_regression.py → ...inear_regression/src/linear_regression.py b/...inear-regression/src/linear_regression.py → ...inear_regression/src/linear_regression.py
@@ -1,10 +1,11 @@
-import nada_numpy as na
 import numpy as np
 from determinant import determinant
 from gauss_jordan import gauss_jordan_zn
 from modular_inverse import (PRIME, private_modular_inverse,
                              public_modular_inverse)
 from nada_dsl import *
+
+import nada_numpy as na
 from nada_numpy.array import NadaArray
 
 

diff --git a/...r-regression/src/linear_regression_256.py → ...r_regression/src/linear_regression_256.py b/...r-regression/src/linear_regression_256.py → ...r_regression/src/linear_regression_256.py
@@ -1,6 +1,7 @@
-import nada_numpy as na
 import numpy as np
 from nada_dsl import *
+
+import nada_numpy as na
 from nada_numpy.array import NadaArray
 
 # LOG_SCALE = 8

diff --git a/...s/linear-regression/src/matrix_inverse.py → ...s/linear_regression/src/matrix_inverse.py b/...s/linear-regression/src/matrix_inverse.py → ...s/linear_regression/src/matrix_inverse.py
@@ -1,8 +1,9 @@
 import time
 
-import nada_numpy as na
 import numpy as np
 from nada_dsl import *
+
+import nada_numpy as na
 from nada_numpy.array import NadaArray
 
 LOG_SCALE = 16

diff --git a/.../linear-regression/src/modular_inverse.py → .../linear_regression/src/modular_inverse.py b/.../linear-regression/src/modular_inverse.py → .../linear_regression/src/modular_inverse.py
@@ -1,7 +1,8 @@
-import nada_numpy as na
 import numpy as np
 from nada_dsl import *
 
+import nada_numpy as na
+
 LOG_SCALE = 16
 SCALE = 1 << LOG_SCALE
 PRIME_64 = 18446744072637906947

diff --git a/examples/linear_regression/target/.gitignore b/examples/linear_regression/target/.gitignore
@@ -0,0 +1,5 @@
+# This directory is kept purposely, so that no compilation errors arise.
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore
diff --git a/...inear-regression/tests/determinant-3.yaml → ...inear_regression/tests/determinant-3.yaml b/...inear-regression/tests/determinant-3.yaml → ...inear_regression/tests/determinant-3.yaml
diff --git a/...inear-regression/tests/determinant_1.yaml → ...inear_regression/tests/determinant_1.yaml b/...inear-regression/tests/determinant_1.yaml → ...inear_regression/tests/determinant_1.yaml
diff --git a/...inear-regression/tests/determinant_2.yaml → ...inear_regression/tests/determinant_2.yaml b/...inear-regression/tests/determinant_2.yaml → ...inear_regression/tests/determinant_2.yaml
diff --git a/...linear-regression/tests/gauss_jordan.yaml → ...linear_regression/tests/gauss_jordan.yaml b/...linear-regression/tests/gauss_jordan.yaml → ...linear_regression/tests/gauss_jordan.yaml
diff --git a/...regression/tests/linear_regression_1.yaml → ...r_regression/tests/linear_regression.yaml b/...regression/tests/linear_regression_1.yaml → ...r_regression/tests/linear_regression.yaml
diff --git a/examples/linear_regression/tests/linear_regression_1.yaml b/examples/linear_regression/tests/linear_regression_1.yaml
@@ -0,0 +1,38 @@
+---
+program: linear_regression
+inputs:
+  A_0_0:
+      SecretInteger: "-256"
+  A_0_1:
+      SecretInteger: "-199"
+  A_0_2:
+      SecretInteger: "-142"
+  A_1_0:
+      SecretInteger: "-85"
+  A_1_1:
+      SecretInteger: "-28"
+  A_1_2:
+      SecretInteger: "28"
+  A_2_0:
+      SecretInteger: "85"
+  A_2_1:
+      SecretInteger: "142"
+  A_2_2:
+      SecretInteger: "256"
+  b_0:
+      SecretInteger: "-256"
+  b_1:
+      SecretInteger: "-199"
+  b_2:
+      SecretInteger: "-142"
+#   lambda_0: 
+#     Integer: "1"
+expected_outputs:
+  b:
+    SecretInteger: "330643400256"
+  w_0:
+    SecretInteger: "1102041164640"
+  w_1:
+    SecretInteger: "-993683999568"
+  w_2:
+    SecretInteger: "1868226984"
diff --git a/...regression/tests/linear_regression_2.yaml → ...regression/tests/linear_regression_2.yaml b/...regression/tests/linear_regression_2.yaml → ...regression/tests/linear_regression_2.yaml
diff --git a/...ession/tests/linear_regression_256_1.yaml → ...ession/tests/linear_regression_256_1.yaml b/...ession/tests/linear_regression_256_1.yaml → ...ession/tests/linear_regression_256_1.yaml
diff --git a/...ession/tests/linear_regression_256_2.yaml → ...ession/tests/linear_regression_256_2.yaml b/...ession/tests/linear_regression_256_2.yaml → ...ession/tests/linear_regression_256_2.yaml
diff --git a/...near-regression/tests/matrix_inverse.yaml → ...near_regression/tests/matrix_inverse.yaml b/...near-regression/tests/matrix_inverse.yaml → ...near_regression/tests/matrix_inverse.yaml
diff --git a/...ear-regression/tests/modular_inverse.yaml → ...ear_regression/tests/modular_inverse.yaml b/...ear-regression/tests/modular_inverse.yaml → ...ear_regression/tests/modular_inverse.yaml
diff --git a/examples/matrix_multiplication/main.py b/examples/matrix_multiplication/main.py
@@ -7,9 +7,9 @@
 
 import asyncio
 
-import nada_numpy.client as na_client
 import numpy as np
 import py_nillion_client as nillion
+from common.utils import compute, store_program, store_secret_array
 from config import DIM
 from cosmpy.aerial.client import LedgerClient
 from cosmpy.aerial.wallet import LocalWallet
@@ -20,11 +20,10 @@
                                     get_quote_and_pay, pay_with_quote)
 from py_nillion_client import NodeKey, UserKey
 
-from common.utils import compute, store_program, store_secret_array
+import nada_numpy.client as na_client
 
 home = os.getenv("HOME")
 load_dotenv(f"{home}/.config/nillion/nillion-devnet.env")
-# load_dotenv(f"/workspaces/ai/.nillion-testnet.env")
 
 
 # Main asynchronous function to coordinate the process

diff --git a/examples/matrix_multiplication/src/matrix_multiplication.py b/examples/matrix_multiplication/src/matrix_multiplication.py
@@ -2,11 +2,12 @@
 
 from typing import List
 
-# Step 0: Nada Numpy is imported with this line
-import nada_numpy as na
 from config import DIM
 from nada_dsl import Output, SecretInteger
 
+# Step 0: Nada Numpy is imported with this line
+import nada_numpy as na
+
 
 def nada_main() -> List[Output]:
     """

diff --git a/examples/rational_numbers/main.py b/examples/rational_numbers/main.py
@@ -7,9 +7,9 @@
 
 import asyncio
 
-import nada_numpy.client as na_client
 import numpy as np
 import py_nillion_client as nillion
+from common.utils import compute, store_program, store_secret_value
 from cosmpy.aerial.client import LedgerClient
 from cosmpy.aerial.wallet import LocalWallet
 from cosmpy.crypto.keypairs import PrivateKey
@@ -18,11 +18,10 @@
                                     create_payments_config)
 from py_nillion_client import NodeKey, UserKey
 
-from common.utils import compute, store_program, store_secret_value
+import nada_numpy.client as na_client
 
 home = os.getenv("HOME")
 load_dotenv(f"{home}/.config/nillion/nillion-devnet.env")
-# load_dotenv(f"/workspaces/ai/.nillion-testnet.env")
 
 
 # Main asynchronous function to coordinate the process

diff --git a/examples/rational_numbers/src/rational_numbers.py b/examples/rational_numbers/src/rational_numbers.py
@@ -2,9 +2,10 @@
 
 from typing import List
 
-import nada_numpy as na
 from nada_dsl import Output
 
+import nada_numpy as na
+
 
 def nada_main() -> List[Output]:
     """

diff --git a/nada_numpy/array.py b/nada_numpy/array.py
@@ -5,7 +5,7 @@
 
 # pylint:disable=too-many-lines
 
-from typing import Any, Callable, Optional, Sequence, Union, get_args, overload
+from typing import Any, Callable, Optional, Sequence, Union, get_args
 
 import numpy as np
 from nada_dsl import (Boolean, Input, Integer, Output, Party, PublicInteger,
@@ -870,28 +870,6 @@ def item(self, *args, **kwargs):
             return NadaArray(result)
         return result
 
-    @overload
-    def itemset(self, value: Any): ...
-    @overload
-    def itemset(self, item: Any, value: Any): ...
-
-    # pylint:disable=missing-function-docstring
-    @copy_metadata(np.ndarray.itemset)
-    def itemset(self, *args, **kwargs):
-        value = None
-        if len(args) == 1:
-            value = args[0]
-        elif len(args) == 2:
-            value = args[1]
-        else:
-            value = kwargs["value"]
-
-        _check_type_compatibility(value, self.dtype)
-        result = self.inner.itemset(*args, **kwargs)
-        if isinstance(result, np.ndarray):
-            return NadaArray(result)
-        return result
-
     # pylint:disable=missing-function-docstring
     @copy_metadata(np.ndarray.prod)
     def prod(self, *args, **kwargs):