Adding support for And

.github/workflows/Test.yml

@@ -12,8 +12,8 @@ jobs:
       fail-fast: false
       matrix:
         version:
-          - '1.6'
-          - '1.9'
+          - '1.10'
+          - '1'
         os:
           - ubuntu-latest
         arch:

Project.toml

@@ -1,6 +1,6 @@
 name = "ONNX"
 uuid = "d0dd6a25-fac6-55c0-abf7-829e0c774d20"
-version = "0.2.7"
+version = "0.3.0"
 
 [deps]
 EnumX = "4e289a0a-7415-4d19-859d-a7e5c4648b56"
@@ -18,5 +18,5 @@ EnumX = "1"
 NNlib = "0.8, 0.9"
 ProtoBuf = "1.0"
 StaticArrays = "1"
-Umlaut = "0.4, 0.5, 0.6, 0.7"
-julia = "1.6"
+Umlaut = "0.7"
+julia = "1.10"

src/load.jl

@@ -67,6 +67,10 @@ function load_node!(tape::Tape, ::OpConfig{:ONNX, :Acosh}, args::VarVec, attrs::
     return push_call!(tape, _acosh, args[1])
 end
 
+function load_node!(tape::Tape, ::OpConfig{:ONNX, :And}, args::VarVec, attrs::AttrDict) 
+    return push_call!(tape, and, args...)
+end
+
 function load_node!(tape::Tape, nd::NodeProto, backend::Symbol)
     args = [tape.c.name2var[name] for name in nd.input]
     attrs = convert(Dict{Symbol, Any}, Dict(nd.attribute))

src/ops.jl

@@ -45,6 +45,10 @@ function onnx_flatten(x; axis = 1)
     return flatten(x; dim = dim)
 end
 
+function and(x, y)
+    return x .& y
+end
+
 add(xs...) = .+(xs...)
 sub(xs...) = .-(xs...)
 _sin(x) = sin.(x)

src/save.jl

@@ -136,6 +136,11 @@ function save_node!(g::GraphProto, ::OpConfig{:ONNX, typeof(_acosh)}, op::Umlaut
     push!(g.node, nd)
 end
 
+function save_node!(g::GraphProto, ::OpConfig{:ONNX, typeof(and)}, op::Umlaut.Call)
+    nd = NodeProto("And", op)
+    push!(g.node, nd)
+end
+
 function save_node!(g::GraphProto, ::OpConfig{:ONNX, typeof(*)}, op::Umlaut.Call)
     nd = NodeProto(
         input=[onnx_name(v) for v in reverse(op.args)],

test/Project.toml

@@ -7,4 +7,4 @@ Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 Umlaut = "92992a2b-8ce5-4a9c-bb9d-58be9a7dc841"
 
 [compat]
-Umlaut = "0.4"
+Umlaut = "0.7"

test/saveload.jl

@@ -14,6 +14,16 @@ import ONNX: NodeProto, ValueInfoProto, AttributeProto, onnx_name
         ort_test(tape, args...)
     end
 
+    @testset "And" begin
+        # Testing matricies of similar shape
+        args = rand(Bool, 3, 4), rand(Bool, 3, 4)
+        ort_test(ONNX.and, args...)
+
+        # Testing Numpy-style broadcasting
+        args = rand(Bool, 3, 3), rand(Bool, 1, 3)
+        ort_test(ONNX.and, args...)
+    end
+
     @testset "Basic ops" begin
         args = (rand(3, 4), rand(3, 4))
         ort_test(ONNX.add, args...)