Skip to content

Adds an empty _Differentiation module #34367

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 21, 2020

Conversation

texasmichelle
Copy link
Contributor

@texasmichelle texasmichelle commented Oct 20, 2020

Adds an empty _Differentiation module to match the structure in main. We should follow up to either fully mirror that structure or identify what was pulled in from upstream to avoid build breakage on Windows:

LINK : fatal error LNK1181: cannot open input file 'lib\swift\windows\x86_64\swift_Differentiation.lib'

Combined with apple/llvm-project#2005, removes ISO646 definitions that conflict with Builtin, resolving build errors such as:

Bool.swift:61:17: error: module 'Builtin' has no member named 'xor_Int1'
    return Bool(Builtin.xor_Int1(value._value, true._value))

This change unblocks the 0.12 release on Windows.

Add empty _Differentiation module
@texasmichelle
Copy link
Contributor Author

@swift-ci please clean test tensorflow

@compnerd
Copy link
Member

We should be able to reduce this diff to just the change to stdlib/public/Differentiation/Empty.swift as the workaround in the llvm repository should alleviate the need for the rest of the diff.

@texasmichelle
Copy link
Contributor Author

@swift-ci please clean test tensorflow

Copy link
Member

@compnerd compnerd left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@texasmichelle texasmichelle changed the title Remove conflicting ISO646 definitions Adds an empty _Differentiation module Oct 21, 2020
@compnerd
Copy link
Member

@swift-ci please test tensorflow

@texasmichelle texasmichelle merged commit 9ffc1f4 into swiftlang:tensorflow Oct 21, 2020
@texasmichelle texasmichelle deleted the remove-iso646 branch October 21, 2020 20:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants