Skip to content

Add libSyntax support for #chainableGradient. #18255

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.

Sign up for GitHub

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 7 commits into from
Jul 27, 2018
Merged

Add libSyntax support for #chainableGradient. #18255

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9e93f2b
Add #chainableGradient differential operator for seedable gradient
rxwei Jul 26, 2018
2183d81
Handle ExprKind::ChainableGradient.
rxwei Jul 26, 2018
2c6dc11
Add libSyntax support for #chainableGradient.
rxwei Jul 26, 2018
f1d5d59
Merge branch 'tensorflow' of github.com:apple/swift into diffop-libsy…
rxwei Jul 26, 2018
1d26e5d
Fix test
rxwei Jul 26, 2018
8b31511
Typo
rxwei Jul 26, 2018
74e95d5
Fix test
rxwei Jul 27, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions lib/Parse/ParseExpr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3665,7 +3665,8 @@ ParserResult<Expr> Parser::parseExprTypeOf() {
/// '.' [0-9]+
///
ParserResult<Expr> Parser::parseExprGradientBody(ExprKind kind) {
SyntaxParsingContext GradientContext(SyntaxContext, SyntaxKind::GradientExpr);
SyntaxParsingContext RADEContext(SyntaxContext,
SyntaxKind::ReverseAutoDiffExpr);

assert(Tok.isAny(tok::pound_gradient, tok::pound_valueAndGradient,
tok::pound_chainableGradient));
Expand Down Expand Up @@ -3727,7 +3728,7 @@ ParserResult<Expr> Parser::parseExprGradientBody(ExprKind kind) {
// Function that parses one parameter.
auto parseParam = [&]() -> bool {
SyntaxParsingContext DiffParamContext(
SyntaxContext, SyntaxKind::GradientExprDiffParam);
SyntaxContext, SyntaxKind::ReverseAutoDiffExprParam);
SourceLoc paramLoc;
switch (Tok.getKind()) {
case tok::period_prefix: {
Expand Down Expand Up @@ -3757,7 +3758,8 @@ ParserResult<Expr> Parser::parseExprGradientBody(ExprKind kind) {
while (Tok.isNot(tok::r_paren))
if (parseParam())
return errorAndSkipToEnd();
SyntaxContext->collectNodesInPlace(SyntaxKind::GradientExprParamList);
SyntaxContext->collectNodesInPlace(
SyntaxKind::ReverseAutoDiffExprParamList);
}
// Parse the closing ')'.
if (parseToken(tok::r_paren, rParenLoc, diag::expr_expected_rparen, exprName))
Expand Down
9 changes: 5 additions & 4 deletions test/Syntax/Outputs/round_trip_parse_gen.swift.withkinds
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -561,11 +561,12 @@ func bar<GenericParameterClause><<GenericParameter>T : <SimpleTypeIdentifier>Num
func bar<FunctionSignature><ParameterClause>(<FunctionParameter>_ x: <SimpleTypeIdentifier>Float</SimpleTypeIdentifier>, </FunctionParameter><FunctionParameter>_: <SimpleTypeIdentifier>Float</SimpleTypeIdentifier></FunctionParameter>) </ParameterClause><ReturnClause>-> <SimpleTypeIdentifier>Float </SimpleTypeIdentifier></ReturnClause></FunctionSignature><CodeBlock>{ <ReturnStmt>return <IntegerLiteralExpr>1 </IntegerLiteralExpr></ReturnStmt>}</CodeBlock></FunctionDecl><FunctionDecl><Attribute>

@differentiable(<DifferentiableAttributeArguments>reverse, <DifferentiableAttributeDiffParams>wrt: (<DifferentiableAttributeDiffParam>self, </DifferentiableAttributeDiffParam><DifferentiableAttributeDiffParam><DifferentiationIndexParam>.0</DifferentiationIndexParam>, </DifferentiableAttributeDiffParam><DifferentiableAttributeDiffParam><DifferentiationIndexParam>.1</DifferentiationIndexParam></DifferentiableAttributeDiffParam>), </DifferentiableAttributeDiffParams><DifferentiableAttributeFuncSpecifier>primal: bar, </DifferentiableAttributeFuncSpecifier><DifferentiableAttributeFuncSpecifier>adjoint: foo<DeclNameArguments>(<DeclNameArgument>_:</DeclNameArgument><DeclNameArgument>_:</DeclNameArgument>) </DeclNameArguments></DifferentiableAttributeFuncSpecifier><GenericWhereClause>where <ConformanceRequirement><SimpleTypeIdentifier>T </SimpleTypeIdentifier>: <SimpleTypeIdentifier>FloatingPoint</SimpleTypeIdentifier></ConformanceRequirement></GenericWhereClause></DifferentiableAttributeArguments>)</Attribute>
func bar<GenericParameterClause><<GenericParameter>T : <SimpleTypeIdentifier>Numeric</SimpleTypeIdentifier></GenericParameter>></GenericParameterClause><FunctionSignature><ParameterClause>(<FunctionParameter>_ x: <SimpleTypeIdentifier>T</SimpleTypeIdentifier>, </FunctionParameter><FunctionParameter>_: <SimpleTypeIdentifier>T</SimpleTypeIdentifier></FunctionParameter>) </ParameterClause><ReturnClause>-> <SimpleTypeIdentifier>T </SimpleTypeIdentifier></ReturnClause></FunctionSignature><CodeBlock>{ <ReturnStmt>return <IntegerLiteralExpr>1 </IntegerLiteralExpr></ReturnStmt>}</CodeBlock></FunctionDecl><GradientExpr>
func bar<GenericParameterClause><<GenericParameter>T : <SimpleTypeIdentifier>Numeric</SimpleTypeIdentifier></GenericParameter>></GenericParameterClause><FunctionSignature><ParameterClause>(<FunctionParameter>_ x: <SimpleTypeIdentifier>T</SimpleTypeIdentifier>, </FunctionParameter><FunctionParameter>_: <SimpleTypeIdentifier>T</SimpleTypeIdentifier></FunctionParameter>) </ParameterClause><ReturnClause>-> <SimpleTypeIdentifier>T </SimpleTypeIdentifier></ReturnClause></FunctionSignature><CodeBlock>{ <ReturnStmt>return <IntegerLiteralExpr>1 </IntegerLiteralExpr></ReturnStmt>}</CodeBlock></FunctionDecl><ReverseAutoDiffExpr>

#gradient(<IdentifierExpr>foo</IdentifierExpr>)</GradientExpr><GradientExpr>
#gradient(<IdentifierExpr>foo</IdentifierExpr>, wrt: <GradientExprDiffParam><DifferentiationIndexParam>.0</DifferentiationIndexParam>, </GradientExprDiffParam><GradientExprDiffParam><DifferentiationIndexParam>.1</DifferentiationIndexParam></GradientExprDiffParam>)</GradientExpr><GradientExpr>
#valueAndGradient(<IdentifierExpr>foo</IdentifierExpr>, wrt: <GradientExprDiffParam><DifferentiationIndexParam>.0</DifferentiationIndexParam>, </GradientExprDiffParam><GradientExprDiffParam><DifferentiationIndexParam>.1</DifferentiationIndexParam></GradientExprDiffParam>)</GradientExpr><AdjointExpr>
#gradient(<IdentifierExpr>foo</IdentifierExpr>)</ReverseAutoDiffExpr><ReverseAutoDiffExpr>
#gradient(<IdentifierExpr>foo</IdentifierExpr>, wrt: <ReverseAutoDiffExprParam><DifferentiationIndexParam>.0</DifferentiationIndexParam>, </ReverseAutoDiffExprParam><ReverseAutoDiffExprParam><DifferentiationIndexParam>.1</DifferentiationIndexParam></ReverseAutoDiffExprParam>)</ReverseAutoDiffExpr><ReverseAutoDiffExpr>
#chainableGradient(<IdentifierExpr>foo</IdentifierExpr>, wrt: <ReverseAutoDiffExprParam><DifferentiationIndexParam>.0</DifferentiationIndexParam>, </ReverseAutoDiffExprParam><ReverseAutoDiffExprParam><DifferentiationIndexParam>.1</DifferentiationIndexParam></ReverseAutoDiffExprParam>)</ReverseAutoDiffExpr><ReverseAutoDiffExpr>
#valueAndGradient(<IdentifierExpr>foo</IdentifierExpr>, wrt: <ReverseAutoDiffExprParam><DifferentiationIndexParam>.0</DifferentiationIndexParam>, </ReverseAutoDiffExprParam><ReverseAutoDiffExprParam><DifferentiationIndexParam>.1</DifferentiationIndexParam></ReverseAutoDiffExprParam>)</ReverseAutoDiffExpr><AdjointExpr>

#adjoint(+)</AdjointExpr><AdjointExpr>
#adjoint(foo<DeclNameArguments>(<DeclNameArgument>_:</DeclNameArgument><DeclNameArgument>_:</DeclNameArgument>)</DeclNameArguments>)</AdjointExpr><AdjointExpr>
Expand Down
1 change: 1 addition & 0 deletions test/Syntax/round_trip_parse_gen.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -565,6 +565,7 @@ func bar<T : Numeric>(_ x: T, _: T) -> T { return 1 }

#gradient(foo)
#gradient(foo, wrt: .0, .1)
#chainableGradient(foo, wrt: .0, .1)
#valueAndGradient(foo, wrt: .0, .1)

#adjoint(+)
Expand Down
18 changes: 9 additions & 9 deletions utils/gyb_syntax_support/ExprNodes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -571,14 +571,14 @@
]),

# SWIFT_ENABLE_TENSORFLOW
# Expression generalizing #gradient and #valueAndGradient.
# e.g. #gradient(foo(_:_:), wrt: .0, .1)
Node('GradientExpr', kind='Expr',
# e.g. "#gradient(foo(_:_:), wrt: .0, .1)"
Node('ReverseAutoDiffExpr', kind='Expr',
traits=['Parenthesized'],
children=[
Child('Identifier', kind='Token',
token_choices=[
'PoundGradientToken',
'PoundChainableGradientToken',
'PoundValueAndGradientToken',
]),
Child('LeftParen', kind='LeftParenToken'),
Expand All @@ -587,19 +587,19 @@
Child('WrtLabel', kind='IdentifierToken', is_optional=True,
text_choices=['wrt']),
Child('Colon', kind='ColonToken', is_optional=True),
Child('DiffParams', kind='GradientExprParamList',
Child('DiffParams', kind='ReverseAutoDiffExprParamList',
is_optional=True),
Child('RightParen', kind='RightParenToken'),
]),

# gradient-expr-diff-param-list ->
# reverse-autodiff-expr-param-list ->
# gradient-expr-diff-param gradient-expr-diff-param-list?
Node('GradientExprParamList', kind='SyntaxCollection',
element='GradientExprDiffParam'),
Node('ReverseAutoDiffExprParamList', kind='SyntaxCollection',
element='ReverseAutoDiffExprParam'),

# gradient-expr-diff-param ->
# reverse-autodiff-expr-param ->
# differentiation-index-param ','?
Node('GradientExprDiffParam', kind='Syntax',
Node('ReverseAutoDiffExprParam', kind='Syntax',
description='''
A differentiation parameter: a period followed by an unsigned integer \
(e.g. `.0`).
Expand Down
2 changes: 2 additions & 0 deletions utils/gyb_syntax_support/Token.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,8 @@ def __init__(self, name, text):
is_keyword=True),
Token('PoundGradient', 'pound_gradient', text='#gradient',
is_keyword=True),
Token('PoundChainableGradient', 'pound_chainableGradient',
text='#chainableGradient', is_keyword=True),
Token('PoundValueAndGradient', 'pound_valueAndGradient',
text='#valueAndGradient', is_keyword=True),
Token('PoundAdjoint', 'pound_adjoint', text='#adjoint',
Expand Down