diff --git a/Compute.xcodeproj/project.pbxproj b/Compute.xcodeproj/project.pbxproj index 46ea079..bb0875a 100644 --- a/Compute.xcodeproj/project.pbxproj +++ b/Compute.xcodeproj/project.pbxproj @@ -293,7 +293,7 @@ ); INFOPLIST_KEY_NSHumanReadableCopyright = ""; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 26.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.6; LD_RUNPATH_SEARCH_PATHS = ( "@executable_path/Frameworks", "@loader_path/Frameworks", @@ -303,8 +303,8 @@ "@loader_path/Frameworks", ); LOCALIZATION_PREFERS_STRING_CATALOGS = YES; - MACOSX_DEPLOYMENT_TARGET = 26.0; - MARKETING_VERSION = 1.0; + MACOSX_DEPLOYMENT_TARGET = 15.6; + MARKETING_VERSION = 0.2.1; MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++"; MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu17 gnu++20"; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; @@ -327,9 +327,9 @@ SWIFT_UPCOMING_FEATURE_MEMBER_IMPORT_VISIBILITY = YES; SWIFT_VERSION = 6.0; SYSTEM_HEADER_SEARCH_PATHS = ( - Submodules/swift-runtime-headers/include, - Submodules/swift-runtime-headers/stdlib/include, - Submodules/swift-runtime-headers/stdlib/public/SwiftShims, + "Submodules/swift-runtime-headers/include", + "Submodules/swift-runtime-headers/stdlib/include", + "Submodules/swift-runtime-headers/stdlib/public/SwiftShims", ); TARGETED_DEVICE_FAMILY = "1,2,7"; USER_HEADER_SEARCH_PATHS = ( @@ -339,7 +339,7 @@ USE_HEADERMAP = NO; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; - XROS_DEPLOYMENT_TARGET = 26.0; + XROS_DEPLOYMENT_TARGET = 1.3; }; name = Debug; }; @@ -405,7 +405,7 @@ ); INFOPLIST_KEY_NSHumanReadableCopyright = ""; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 26.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.6; LD_RUNPATH_SEARCH_PATHS = ( "@executable_path/Frameworks", "@loader_path/Frameworks", @@ -415,8 +415,8 @@ "@loader_path/Frameworks", ); LOCALIZATION_PREFERS_STRING_CATALOGS = YES; - MACOSX_DEPLOYMENT_TARGET = 26.0; - MARKETING_VERSION = 1.0; + MACOSX_DEPLOYMENT_TARGET = 15.6; + MARKETING_VERSION = 0.2.1; MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++"; MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu17 gnu++20"; MTL_ENABLE_DEBUG_INFO = NO; @@ -437,9 +437,9 @@ SWIFT_UPCOMING_FEATURE_MEMBER_IMPORT_VISIBILITY = YES; SWIFT_VERSION = 6.0; SYSTEM_HEADER_SEARCH_PATHS = ( - Submodules/swift-runtime-headers/include, - Submodules/swift-runtime-headers/stdlib/include, - Submodules/swift-runtime-headers/stdlib/public/SwiftShims, + "Submodules/swift-runtime-headers/include", + "Submodules/swift-runtime-headers/stdlib/include", + "Submodules/swift-runtime-headers/stdlib/public/SwiftShims", ); TARGETED_DEVICE_FAMILY = "1,2,7"; USER_HEADER_SEARCH_PATHS = ( @@ -449,7 +449,7 @@ USE_HEADERMAP = NO; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; - XROS_DEPLOYMENT_TARGET = 26.0; + XROS_DEPLOYMENT_TARGET = 1.3; }; name = Release; }; diff --git a/Package.swift b/Package.swift index 84fba68..bcac032 100644 --- a/Package.swift +++ b/Package.swift @@ -11,7 +11,7 @@ var dependencies: [Package.Dependency] = [ let package = Package( name: "Compute", - platforms: [.macOS(.v26)], + platforms: [.macOS(.v15)], products: [ .library(name: "Compute", targets: ["Compute"]), .library(name: "_ComputeTestSupport", targets: ["_ComputeTestSupport"]), diff --git a/Sources/Compute/Graph/TreeElement.swift b/Sources/Compute/Graph/TreeElement.swift index ecd1efb..4868a23 100644 --- a/Sources/Compute/Graph/TreeElement.swift +++ b/Sources/Compute/Graph/TreeElement.swift @@ -12,6 +12,7 @@ extension TreeElement { extension Nodes: @retroactive IteratorProtocol { public typealias Element = AnyAttribute + @inlinable public mutating func next() -> AnyAttribute? { let result = __AGTreeElementGetNextNode(&self) return result == .nil ? nil : result diff --git a/Sources/ComputeCxx/Attribute/AttributeData/Node/IndirectNode.cpp b/Sources/ComputeCxx/Attribute/AttributeData/Node/IndirectNode.cpp index 24ebb26..515f6c7 100644 --- a/Sources/ComputeCxx/Attribute/AttributeData/Node/IndirectNode.cpp +++ b/Sources/ComputeCxx/Attribute/AttributeData/Node/IndirectNode.cpp @@ -14,9 +14,9 @@ const MutableIndirectNode &IndirectNode::to_mutable() const { return static_cast(*this); } -void IndirectNode::modify(WeakAttributeID source, size_t size) { +void IndirectNode::modify(WeakAttributeID source, size_t offset) { _source = source; - _size = size; + _offset = offset; } } // namespace AG diff --git a/Sources/ComputeCxx/Attribute/AttributeData/Node/IndirectNode.h b/Sources/ComputeCxx/Attribute/AttributeData/Node/IndirectNode.h index bde7adc..44fdfde 100644 --- a/Sources/ComputeCxx/Attribute/AttributeData/Node/IndirectNode.h +++ b/Sources/ComputeCxx/Attribute/AttributeData/Node/IndirectNode.h @@ -63,7 +63,7 @@ class IndirectNode { const RelativeAttributeID next_attribute() const { return _next_attribute; } void set_next_attribute(RelativeAttributeID next_attribute) { _next_attribute = next_attribute; } - void modify(WeakAttributeID source, size_t size); + void modify(WeakAttributeID source, size_t offset); }; class MutableIndirectNode : public IndirectNode { diff --git a/Sources/ComputeCxx/Graph/Graph.mm b/Sources/ComputeCxx/Graph/Graph.mm index 84bd15a..7453e8a 100644 --- a/Sources/ComputeCxx/Graph/Graph.mm +++ b/Sources/ComputeCxx/Graph/Graph.mm @@ -921,7 +921,7 @@ int trap_cycles() { } frame_count += 1; - if (frame_count >= max_frames) { + if (max_frames >= 0 && frame_count >= max_frames) { return description; } } @@ -942,7 +942,7 @@ int trap_cycles() { [nodes addObject:[NSNumber numberWithUnsignedInt:frame.attribute.offset()]]; frame_count += 1; - if (frame_count >= max_frames) { + if (max_frames >= 0 && frame_count >= max_frames) { return nodes; } } diff --git a/Sources/ComputeCxx/include/ComputeCxx/AGSubgraph.h b/Sources/ComputeCxx/include/ComputeCxx/AGSubgraph.h index 9aa9fe6..ae86144 100644 --- a/Sources/ComputeCxx/include/ComputeCxx/AGSubgraph.h +++ b/Sources/ComputeCxx/include/ComputeCxx/AGSubgraph.h @@ -166,7 +166,7 @@ void AGSubgraphEndTreeElement(AGAttribute value); AG_EXPORT AG_REFINED_FOR_SWIFT void AGSubgraphSetTreeOwner(AGSubgraphRef subgraph, AGAttribute owner) - AG_SWIFT_NAME(setter:AGSubgraphRef.treeOwner(self:_:)); + AG_SWIFT_NAME(AGSubgraphRef.setTreeOwner(self:_:)); AG_EXPORT AG_REFINED_FOR_SWIFT