Merge pull request #21 from NillionNetwork/feature/nada-numpy-0.1.2

Compatibility with nada numpy 0.1.2
NillionNetwork · Jun 21, 2024 · 4edc47f · 4edc47f
2 parents 2b1500d + 81d694a
commit 4edc47f
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 19 deletions.
diff --git a/.github/workflows/python-publish.yml b/.github/workflows/python-publish.yml
@@ -29,5 +29,5 @@ jobs:
       run: poetry build
     - name: Publish package
       run: |
-        poetry config pypi-token.pypi ${{ secrets.PYPI_TOKEN }}
+        poetry config pypi-token.pypi ${{ secrets.NILLION_PYPI_TOKEN }}
         poetry publish
diff --git a/README.md b/README.md
@@ -1,8 +1,5 @@
 # Nada AI
 
-![GitHub License](https://img.shields.io/github/license/NillionNetwork/nada-ai?style=for-the-badge)
-![GitHub Actions Workflow Status](https://img.shields.io/github/actions/workflow/status/NillionNetwork/nada-ai/test?style=for-the-badge)
-
 Nada AI is a Python library designed for performing ML/AI on top of Nada DSL and the Nillion Network.
 
 It provides an intuitive ML interface and frictionless integration with existing ML frameworks such as PyTorch and Sci-kit learn.

diff --git a/examples/linear_regression/main.py b/examples/linear_regression/main.py
@@ -157,7 +157,7 @@ async def main():
         nillion.Secrets({}),
     )
     # Rescale the obtained result by the quantization scale
-    outputs = [na_client.float_from_rational(result["my_output_0"])]
+    outputs = [na_client.float_from_rational(result["my_output"])]
     print(f"🖥️  The result is {outputs}")
 
     expected = fit_model.predict(np.ones((NUM_FEATS,)).reshape(1, -1))

diff --git a/examples/linear_regression/src/linear_regression.py b/examples/linear_regression/src/linear_regression.py
@@ -1,5 +1,4 @@
 import nada_numpy as na
-from nada_dsl import Output
 
 from nada_ai.linear_model import LinearRegression
 

diff --git a/examples/linear_regression/tests/linear_regression.yaml b/examples/linear_regression/tests/linear_regression.yaml
@@ -54,5 +54,5 @@ inputs:
 expected_outputs:
   # If you go in and crunch the numbers of this one, the result should be 16.877471923828125
   # 16.877471923828125 * 2**16 = 1106085
-  my_output_0:
+  my_output:
     SecretInteger: "1106085"
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "nada-ai"
-version = "0.1.1"
+version = "0.1.2"
 description = "Nada-AI is a Python library designed for AI/ML on top of Nada DSL and Nillion Network."
 authors = ["Mathias Leys <[email protected]>"]
 readme = "README.md"
@@ -13,7 +13,7 @@ scikit-learn = "^1.4.2"
 prophet = "^1.1.5"
 nada-dsl = "^0.2.1"
 py-nillion-client = "^0.2.1"
-nada-numpy = "^0.1.1"
+nada-numpy = "^0.1.2"
 nillion-python-helpers = "^0.1.2"
 
 [tool.poetry.group.dev.dependencies]

diff --git a/tests/nada-tests/src/linear_regression.py b/tests/nada-tests/src/linear_regression.py
@@ -15,4 +15,4 @@ def nada_main():
 
     result = model(x)
 
-    return [Output(result, "output", party)]
+    return na.output(result, party, "my_output")
diff --git a/tests/test_all_nada.py b/tests/test_all_nada.py
@@ -22,7 +22,9 @@
 EXAMPLES = [
     "complex_model",
     "linear_regression",
+    "multi_layer_perceptron",
     "neural_net",
+    "spam_detection",
     # "time_series",
 ]
Original file line number	Diff line number	Diff line change
Expand Up		@@ -15,4 +15,4 @@ def nada_main():

		result = model(x)

		return [Output(result, "output", party)]
		return na.output(result, party, "my_output")