Skip to content

Commit

Permalink
Merge pull request #489 from gizatechxyz/develop
Browse files Browse the repository at this point in the history
Merge Develop Into Main
  • Loading branch information
raphaelDkhn authored Dec 3, 2023
2 parents df6d6b9 + daab398 commit 5728907
Show file tree
Hide file tree
Showing 746 changed files with 31,622 additions and 833 deletions.
27 changes: 27 additions & 0 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,33 @@
"contributions": [
"doc"
]
},
{
"login": "MahmoudMohajer",
"name": "Mahmoud Mohajer",
"avatar_url": "https://avatars.githubusercontent.com/u/89094323?v=4",
"profile": "https://medium.com/@mohajermahmoud3",
"contributions": [
"code"
]
},
{
"login": "HappyTomatoo",
"name": "HappyTomatoo",
"avatar_url": "https://avatars.githubusercontent.com/u/143050661?v=4",
"profile": "https://github.com/HappyTomatoo",
"contributions": [
"bug"
]
},
{
"login": "bilgin-kocak",
"name": "Bilgin Koçak",
"avatar_url": "https://avatars.githubusercontent.com/u/30844607?v=4",
"profile": "https://www.bilginkocak.com/",
"contributions": [
"code"
]
}
],
"contributorsPerLine": 7,
Expand Down
7 changes: 5 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

# Orion: An Open-source Framework for Validity and ZK ML ✨
<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
[![All Contributors](https://img.shields.io/badge/all_contributors-22-orange.svg?style=flat-square)](#contributors-)
[![All Contributors](https://img.shields.io/badge/all_contributors-25-orange.svg?style=flat-square)](#contributors-)
<!-- ALL-CONTRIBUTORS-BADGE:END -->

Orion is an open-source, community-driven framework dedicated to Provable Machine Learning. It provides essential components and a new ONNX runtime for building verifiable Machine Learning models using [STARKs](https://starkware.co/stark/).
Expand Down Expand Up @@ -61,7 +61,7 @@ See [LICENSE](https://github.com/franalgaba/onnx-cairo/blob/main/LICENSE/README.

## Contributors ✨

Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/docs/en/emoji-key)):
Thanks goes to these wonderful people:

<!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
<!-- prettier-ignore-start -->
Expand Down Expand Up @@ -99,6 +99,9 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
<td align="center" valign="top" width="14.28%"><a href="https://audits.quillhash.com/smart-contract-audit"><img src="https://avatars.githubusercontent.com/u/68496788?v=4?s=100" width="100px;" alt="Ephraim Chukwu"/><br /><sub><b>Ephraim Chukwu</b></sub></a><br /><a href="https://github.com/gizatechxyz/orion/commits?author=Ephraim-nonso" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/Bal7hazar"><img src="https://avatars.githubusercontent.com/u/97087040?v=4?s=100" width="100px;" alt="Bal7hazar"/><br /><sub><b>Bal7hazar</b></sub></a><br /><a href="https://github.com/gizatechxyz/orion/issues?q=author%3ABal7hazar" title="Bug reports">🐛</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://okhaimie.com"><img src="https://avatars.githubusercontent.com/u/57156589?v=4?s=100" width="100px;" alt="Tony Stark"/><br /><sub><b>Tony Stark</b></sub></a><br /><a href="https://github.com/gizatechxyz/orion/commits?author=okhaimie-dev" title="Documentation">📖</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://medium.com/@mohajermahmoud3"><img src="https://avatars.githubusercontent.com/u/89094323?v=4?s=100" width="100px;" alt="Mahmoud Mohajer"/><br /><sub><b>Mahmoud Mohajer</b></sub></a><br /><a href="https://github.com/gizatechxyz/orion/commits?author=MahmoudMohajer" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/HappyTomatoo"><img src="https://avatars.githubusercontent.com/u/143050661?v=4?s=100" width="100px;" alt="HappyTomatoo"/><br /><sub><b>HappyTomatoo</b></sub></a><br /><a href="https://github.com/gizatechxyz/orion/issues?q=author%3AHappyTomatoo" title="Bug reports">🐛</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://www.bilginkocak.com/"><img src="https://avatars.githubusercontent.com/u/30844607?v=4?s=100" width="100px;" alt="Bilgin Koçak"/><br /><sub><b>Bilgin Koçak</b></sub></a><br /><a href="https://github.com/gizatechxyz/orion/commits?author=bilgin-kocak" title="Code">💻</a></td>
</tr>
</tbody>
</table>
Expand Down
3 changes: 2 additions & 1 deletion Scarb.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,10 @@ homepage = "https://github.com/gizatechxyz/orion"

[dependencies]
alexandria_data_structures = { git = "https://github.com/keep-starknet-strange/alexandria.git", rev = "f37d73d" }
alexandria_sorting = { git = "https://github.com/keep-starknet-strange/alexandria.git", rev = "f37d73d" }
cubit = { git = "https://github.com/influenceth/cubit.git", rev = "b459053" }

[scripts]
sierra = "cairo-compile . -r"
docgen = "cd docgen && cargo run"
nodegen = "python3 nodegen/node/__init__.py"
nodegen = "python3 nodegen/node/__init__.py"
16 changes: 16 additions & 0 deletions docgen/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,14 @@ fn main() {
doc_trait(trait_path, doc_path, label);
doc_functions(trait_path, doc_path, trait_name, label);

// COMPLEX NUMBER DOC
let trait_path = "src/numbers/complex_number/complex_trait.cairo";
let doc_path = "docs/framework/numbers/complex-number";
let label = "complex";
let trait_name: &str = "ComplexTrait";
doc_trait(trait_path, doc_path, label);
doc_functions(trait_path, doc_path, trait_name, label);

// TREE REGRESSOR DOC
let trait_path = "src/operators/ml/tree_regressor/core.cairo";
let doc_path = "docs/framework/operators/machine-learning/tree-regressor";
Expand All @@ -58,6 +66,14 @@ fn main() {
let trait_name: &str = "XGBoostRegressorTrait";
doc_trait(trait_path, doc_path, label);
doc_functions(trait_path, doc_path, trait_name, label);

// TREE ENSEMBLE CLASSIFIER DOC
let trait_path = "src/operators/ml/tree_ensemble/tree_ensemble_classifier.cairo";
let doc_path = "docs/framework/operators/machine-learning/tree-ensemble-classifier";
let label = "tree_ensemble_classifier";
let trait_name: &str = "TreeEnsembleClassifierTrait";
doc_trait(trait_path, doc_path, label);
doc_functions(trait_path, doc_path, trait_name, label);
}

fn doc_trait(trait_path: &str, doc_path: &str, label: &str) {
Expand Down
10 changes: 10 additions & 0 deletions docs/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,16 @@ All notable changes to this project will be documented in this file.

The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [Unreleased] - 2023-11-27

## Added
- Reduce Prod Operator
-
## [Unreleased] - 2023-11-20

## Added
- Gather Elements Operator.

## [Unreleased] - 2023-11-06

## Added
Expand Down
Loading

0 comments on commit 5728907

Please sign in to comment.