diff --git a/Package.resolved b/Package.resolved index 1c35aafe..6faea4cf 100644 --- a/Package.resolved +++ b/Package.resolved @@ -1,5 +1,5 @@ { - "originHash" : "c4ccda72589ac888395134589ceb70d0a1ffd78aa23c39f48ac96604e6230ce1", + "originHash" : "7572d80f5e1b472509152be48a76689dac87d51395cc0a295cac04473054c358", "pins" : [ { "identity" : "swift-numerics", diff --git a/Package.swift b/Package.swift index fde853f9..44368603 100644 --- a/Package.swift +++ b/Package.swift @@ -428,13 +428,13 @@ func setupDPFDependency() { } if computeCondition { - let defaultVersion = "0.4.1" + let defaultVersion = "0.5.2" let binary = envBoolValue("OPENATTRIBUTESHIMS_COMPUTE_BINARY", default: false) if binary { let version = envStringValue("OPENATTRIBUTESHIMS_COMPUTE_BINARY_VERSION", default: defaultVersion) let repo = envStringValue("OPENATTRIBUTESHIMS_COMPUTE_BINARY_REPO", default: "jcmosc/Compute") let url = envStringValue("OPENATTRIBUTESHIMS_COMPUTE_BINARY_URL", default: "https://github.com/\(repo)/releases/download/\(version)/Compute.xcframework.zip") - let checksum = envStringValue("OPENATTRIBUTESHIMS_COMPUTE_BINARY_CHECKSUM", default: "322c72be5db233d723564a98c45150a45d3d5e9c0a4d4941d43edd1e2ea20bc4") + let checksum = envStringValue("OPENATTRIBUTESHIMS_COMPUTE_BINARY_CHECKSUM", default: "0eca53a3620776cffcc3d2047d11efaf893b53078b95e59e793f86caa3f2c169") package.targets.append( .binaryTarget( name: "Compute", diff --git a/Scripts/CI/linux_compute_build.sh b/Scripts/CI/linux_compute_build.sh index 98e2712a..efb873c2 100755 --- a/Scripts/CI/linux_compute_build.sh +++ b/Scripts/CI/linux_compute_build.sh @@ -10,4 +10,4 @@ cd $REPO_ROOT # Install Linux dependencies apt-get update -apt-get install -y libssl-dev +apt-get install -y libssl-dev uuid-dev diff --git a/Sources/OpenAttributeGraphShims/Adapter/Compute.swift b/Sources/OpenAttributeGraphShims/Adapter/Compute.swift index 6c392dfa..669645c9 100644 --- a/Sources/OpenAttributeGraphShims/Adapter/Compute.swift +++ b/Sources/OpenAttributeGraphShims/Adapter/Compute.swift @@ -9,7 +9,7 @@ public typealias OAGAttributeInfo = IAGAttributeInfo public typealias OAGCachedValueOptions = CachedValueOptions public typealias OAGChangedValueFlags = IAGChangedValueFlags -public typealias OAGInputOptions = IAGInputOptions +public typealias OAGInputOptions = InputOptions public typealias OAGValue = IAGChangedValue public typealias OAGValueOptions = IAGValueOptions @@ -24,6 +24,12 @@ extension Subgraph { } extension Graph { + public typealias TraceOptions = TraceFlags + + public static func startTracing(_ graph: Graph?, options: TraceOptions) { + startTracing(graph, flags: options) + } + public static func startProfiling() { startProfiling(nil) }