Tests and coverage-related fixes

Author: christiangnrd

lib/mpsgraphs/matmul.jl

@@ -62,13 +62,11 @@ end
 
     matmul = matrixMultiplicationWithPrimaryTensor(graph, broadcastB, broadcastA)
 
-    afteralpha = let
-        alphatensor = constantWithScalar(graph, alpha, castT)
+    afteralpha = let alphatensor = constantWithScalar(graph, alpha, castT)
         multiplicationWithPrimaryTensor(graph, alphatensor, matmul)
     end
 
-    afterbeta = let
-        betatensor = constantWithScalar(graph, beta, castT)
+    afterbeta = let betatensor = constantWithScalar(graph, beta, castT)
         castplaceC = castTensor(graph, placeC, castT, "castplaceC")
         betaC = multiplicationWithPrimaryTensor(graph, betatensor, castplaceC)
         afterbeta = additionWithPrimaryTensor(graph, afteralpha, betaC)

lib/mpsgraphs/operations.jl

@@ -73,4 +73,4 @@ Dumps the `graph`.
 !!! warning
     This function is undocumented from Apple so it may stop working at any time.
 """
-dump_graph(graph::MPSGraph) = @objc [graph::id{MPSGraph} dump]::Nothing
+dump_graph(graph::MPSGraph) = @objc [graph::id{MPSGraph} dump]::Nothing ## COV_EXCL_LINE

test/mpsgraphs/core.jl

@@ -1,44 +1,19 @@
-# # Contains definitions for api from MPSGraphCore.h, MPSGraphDevice.h
 
-# const MPSGraphTensorDataDictionary = NSDictionary#<MPSGraphTensor *,MPSGraphTensorData *>
+if MPS.is_supported(device())
 
-# ## MPSGraphCore.h
-# @objcwrapper MPSGraphObject <: NSObject
+using .MPS: MPSShape
+using .MPSGraphs: MPSGraph, MPSGraphDevice
+@testset "Core" begin
 
-# @objcwrapper MPSGraph <: MPSGraphObject
+graph = MPSGraph()
+@test graph isa MPSGraph
 
-# function MPSGraph()
-#     MPSGraph(@objc [MPSGraph new]::id{MPSGraph})
-# end
+dev = device()
+graphdev = MPSGraphDevice(dev)
+@test graphdev isa MPSGraphDevice
+@test graphdev.type == MPSGraphs.MPSGraphDeviceTypeMetal
+@test graphdev.metalDevice == dev
 
-# @objcwrapper MPSGraphType <: MPSGraphObject
+end # @testset "Core"
 
-# @objcwrapper MPSGraphShapedType <: MPSGraphType
-
-# @objcproperties MPSGraphShapedType begin
-#     @autoproperty shape::id{MPSShape} setter=setShape
-#     @autoproperty dataType::MPSDataType setter=setDataType
-# end
-
-# function MPSGraphShapedType(shape::MPSShape, dataType)
-#     tmp = @objc [MPSGraphShapedType alloc]::id{MPSGraphShapedType}
-#     obj = MPSGraphShapedType(tmp)
-#     finalizer(release, obj)
-#     @objc [obj::id{MPSGraphShapedType} initWithShape:shape::id{MPSShape}
-#                                        dataType:dataType::MPSDataType]::id{MPSGraphShapedType}
-
-#    return obj
-# end
-
-# ## MPSGraphDevice.h
-# @objcwrapper MPSGraphDevice <: MPSGraphType
-
-# @objcproperties MPSGraphDevice begin
-#     @autoproperty type::MPSGraphDeviceType
-#     @autoproperty metalDevice::id{MTLDevice}
-# end
-
-# function MPSGraphDevice(device::MTLDevice)
-#     obj = @objc [MPSGraphDevice deviceWithMTLDevice:device::id{MTLDevice}]::id{MPSGraphDevice}
-#     MPSGraphDevice(obj)
-# end
+end # MPS.is_supported(device())

test/mpsgraphs/linalg.jl

@@ -34,7 +34,6 @@ if MPS.is_supported(device())
     end
 end
 
-# XXX: Batched matlmul not yet working
 @testset "batched matrix matrix multiplication" begin
     M = 8
     N = 7
@@ -95,8 +94,7 @@ end
         MPSGraphs.graph_matvecmul!(buf_c, buf_a, buf_b, alpha, beta)
 
         @test all(Array(buf_c) .≈ truth_c)
-        # @test Array(buf_c) ≈ truth_c
     end
 end
 
-end
+end # MPS.is_supported(device())