Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
caisar
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
pub
caisar
Commits
498610f2
Commit
498610f2
authored
2 years ago
by
Michele Alberti
Browse files
Options
Downloads
Patches
Plain Diff
Update language to onnx lib new API.
parent
3d4ccfa1
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/language.ml
+8
-7
8 additions, 7 deletions
src/language.ml
with
8 additions
and
7 deletions
src/language.ml
+
8
−
7
View file @
498610f2
...
@@ -58,7 +58,7 @@ let register_nn_as_tuple nb_inputs nb_outputs filename nier env =
...
@@ -58,7 +58,7 @@ let register_nn_as_tuple nb_inputs nb_outputs filename nier env =
(
Ty
.
ty_tuple
(
List
.
init
nb_outputs
~
f
))
(
Ty
.
ty_tuple
(
List
.
init
nb_outputs
~
f
))
in
in
Term
.
Hls
.
add
loaded_nets
ls_net_apply
Term
.
Hls
.
add
loaded_nets
ls_net_apply
{
filename
;
nb_inputs
;
nb_outputs
;
ty_data
=
input_type
;
nier
};
{
filename
;
nb_inputs
;
nb_outputs
;
ty_data
=
input_type
;
nier
};
let
th_uc
=
let
th_uc
=
Pmodule
.
add_pdecl
~
vc
:
false
th_uc
Pmodule
.
add_pdecl
~
vc
:
false
th_uc
(
Pdecl
.
create_pure_decl
(
Decl
.
create_param_decl
ls_net_apply
))
(
Pdecl
.
create_pure_decl
(
Decl
.
create_param_decl
ls_net_apply
))
...
@@ -87,22 +87,23 @@ let nnet_parser env _ filename _ =
...
@@ -87,22 +87,23 @@ let nnet_parser env _ filename _ =
let
model
=
Nnet
.
parse
~
permissive
:
true
filename
in
let
model
=
Nnet
.
parse
~
permissive
:
true
filename
in
match
model
with
match
model
with
|
Error
s
->
Loc
.
errorm
"%s"
s
|
Error
s
->
Loc
.
errorm
"%s"
s
|
Ok
model
->
|
Ok
{
n_inputs
;
n_outputs
;
_
}
->
register_nn_as_tuple
model
.
n_inputs
model
.
n_outputs
filename
None
env
register_nn_as_tuple
n_inputs
n_outputs
filename
None
env
let
onnx_parser
env
_
filename
_
=
let
onnx_parser
env
_
filename
_
=
let
model
=
Onnx
.
parse
filename
in
let
model
=
Onnx
.
parse
filename
in
match
model
with
match
model
with
|
Error
s
->
Loc
.
errorm
"%s"
s
|
Error
s
->
Loc
.
errorm
"%s"
s
|
Ok
(
model
,
nier
)
->
|
Ok
{
n_inputs
;
n_outputs
;
nier
}
->
register_nn_as_tuple
model
.
n_inputs
model
.
n_outputs
filename
(
Some
nier
)
env
let
nier
=
Result
.
ok
nier
(* TODO: Warn about parsing errors? *)
in
register_nn_as_tuple
n_inputs
n_outputs
filename
nier
env
let
ovo_parser
env
_
filename
_
=
let
ovo_parser
env
_
filename
_
=
let
model
=
Ovo
.
parse
filename
in
let
model
=
Ovo
.
parse
filename
in
match
model
with
match
model
with
|
Error
s
->
Loc
.
errorm
"%s"
s
|
Error
s
->
Loc
.
errorm
"%s"
s
|
Ok
model
->
|
Ok
{
n_inputs
;
n_outputs
}
->
register_svm_as_array
model
.
n_inputs
model
.
n_outputs
filename
env
register_svm_as_array
n_inputs
n_outputs
filename
env
let
register_nnet_support
()
=
let
register_nnet_support
()
=
Env
.
register_format
~
desc
:
"NNet format (ReLU only)"
Pmodule
.
mlw_language
Env
.
register_format
~
desc
:
"NNet format (ReLU only)"
Pmodule
.
mlw_language
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment