This repository has been archived by the owner on Jul 1, 2023. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 136
NFC: fix warnings related to VectorProtocol.VectorSpaceScalar
.
#1178
Open
dan-zheng
wants to merge
2
commits into
tensorflow:main
Choose a base branch
from
dan-zheng:fix-vectorspacescalar-warnings
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -33,8 +33,7 @@ import Numerics | |
public class RMSProp<Model: Differentiable>: Optimizer | ||
where | ||
Model.TangentVector: VectorProtocol & PointwiseMultiplicative | ||
& ElementaryFunctions & KeyPathIterable, | ||
Model.TangentVector.VectorSpaceScalar == Float | ||
& ElementaryFunctions & KeyPathIterable | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Nifty Vim search-and-replace command: Apparently the |
||
{ | ||
public typealias Model = Model | ||
/// The learning rate. | ||
|
@@ -108,8 +107,7 @@ where | |
public class AdaGrad<Model: Differentiable>: Optimizer | ||
where | ||
Model.TangentVector: VectorProtocol & PointwiseMultiplicative | ||
& ElementaryFunctions & KeyPathIterable, | ||
Model.TangentVector.VectorSpaceScalar == Float | ||
& ElementaryFunctions & KeyPathIterable | ||
{ | ||
public typealias Model = Model | ||
/// The learning rate. | ||
|
@@ -169,8 +167,7 @@ where | |
public class AdaDelta<Model: Differentiable>: Optimizer | ||
where | ||
Model.TangentVector: VectorProtocol & PointwiseMultiplicative | ||
& ElementaryFunctions & KeyPathIterable, | ||
Model.TangentVector.VectorSpaceScalar == Float | ||
& ElementaryFunctions & KeyPathIterable | ||
{ | ||
public typealias Model = Model | ||
/// The learning rate. | ||
|
@@ -319,8 +316,7 @@ where | |
public class Adam<Model: Differentiable>: Optimizer | ||
where | ||
Model.TangentVector: VectorProtocol & PointwiseMultiplicative | ||
& ElementaryFunctions & KeyPathIterable, | ||
Model.TangentVector.VectorSpaceScalar == Float | ||
& ElementaryFunctions & KeyPathIterable | ||
{ | ||
public typealias Model = Model | ||
/// The learning rate. | ||
|
@@ -403,8 +399,7 @@ where | |
public class AdaMax<Model: Differentiable & KeyPathIterable>: Optimizer | ||
where | ||
Model.TangentVector: VectorProtocol & PointwiseMultiplicative & ElementaryFunctions | ||
& KeyPathIterable, | ||
Model.TangentVector.VectorSpaceScalar == Float | ||
& KeyPathIterable | ||
{ | ||
public typealias Model = Model | ||
/// The learning rate. | ||
|
@@ -489,8 +484,7 @@ where | |
public class AMSGrad<Model: Differentiable & KeyPathIterable>: Optimizer | ||
where | ||
Model.TangentVector: VectorProtocol & PointwiseMultiplicative & ElementaryFunctions | ||
& KeyPathIterable, | ||
Model.TangentVector.VectorSpaceScalar == Float | ||
& KeyPathIterable | ||
{ | ||
public typealias Model = Model | ||
/// The learning rate. | ||
|
@@ -582,8 +576,7 @@ where | |
public class RAdam<Model: Differentiable>: Optimizer | ||
where | ||
Model.TangentVector: VectorProtocol & PointwiseMultiplicative & ElementaryFunctions | ||
& KeyPathIterable, | ||
Model.TangentVector.VectorSpaceScalar == Float | ||
& KeyPathIterable | ||
{ | ||
public typealias Model = Model | ||
/// The learning rate. | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Kokoro CI fails (for
TENSORFLOW_USE_STANDARD_TOOLCHAIN=NO
):It may be possible to fix this by adding an explicit
typealias VectorSpaceScalar = Float
definition forSequential.TangentVector
.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I tried doing this in 34fca6a but it didn't work, so I'm not sure what to try next.
Does anyone else have ideas? @BradLarson @compnerd
One option is to bite the bullet and drop support for the old baked-in-
TensorFlow
toolchains (which is what's causing the failure). I think that's a good option if we and the community are all on-board with it. That also allows us to drop custom internal support for CI and building OSS toolchains - we can just use GitHub Actions, which is much simpler.