Skip to content
This repository was archived by the owner on Jul 1, 2023. It is now read-only.

Restructured the operators source files and added support for multiple new operators. #70

Merged
rxwei merged 60 commits into from
Apr 21, 2019
Merged

Restructured the operators source files and added support for multiple new operators. #70

Changes from 1 commit
Commits
Show all changes
60 commits
Select commit Hold shift + click to select a range
9885f38
Re-organized the operators source files.
eaplatanios Apr 1, 2019
3ce90c0
Added support for 'stacked', 'concatenated', 'gathered', 'batchGather…
eaplatanios Apr 1, 2019
19a3add
Reverted back to 4-space tabs.
eaplatanios Apr 1, 2019
b3f6281
Made some other minor changes.
eaplatanios Apr 1, 2019
111d96c
Added support or 'selecting'.
eaplatanios Apr 1, 2019
371021b
Added support for 'nonZeroIndices'.
eaplatanios Apr 1, 2019
112707b
Minor edits.
eaplatanios Apr 1, 2019
3594e0e
Addressed Richard's feedback.
eaplatanios Apr 1, 2019
adf20eb
Addressed Richard's comments.
eaplatanios Apr 1, 2019
4ae4e08
Addressed Richard's comments.
eaplatanios Apr 2, 2019
b0aba5d
Updated the convolution ops to support explicit paddings.
eaplatanios Apr 2, 2019
05704d0
Small edits.
eaplatanios Apr 2, 2019
a686a76
Updated the convolution ops to support explicit paddings.
eaplatanios Apr 2, 2019
cc46658
Small fix.
eaplatanios Apr 2, 2019
8494c04
Small fix.
eaplatanios Apr 2, 2019
976061f
Added a new tensor initializer from ranges of tensors.
eaplatanios Apr 2, 2019
5dfaaee
Added documentation string for the "explicit" padding scheme.
eaplatanios Apr 2, 2019
eda9514
More fixes.
eaplatanios Apr 3, 2019
77c1385
Merge branch 'conv-fix' of github.com:eaplatanios/swift-apis into con…
eaplatanios Apr 3, 2019
b41c8c4
Some fixes.
eaplatanios Apr 3, 2019
aed430a
Added 'zerosLike' and 'onesLike' tensor initializers.
eaplatanios Apr 12, 2019
5a093a8
Added a new 'stacking' tensor initializer and made some compatibility…
eaplatanios Apr 15, 2019
78a3eab
Merge remote-tracking branch 'upstream/master' into working
eaplatanios Apr 15, 2019
467a443
Added a new 'tiling' tensor initializer.
eaplatanios Apr 15, 2019
1faaef4
Minor edit.
eaplatanios Apr 15, 2019
94cf85f
Made some refactoring.
eaplatanios Apr 15, 2019
e0bbfc0
Bug fix.
eaplatanios Apr 15, 2019
b74079d
Merged upstream changes.
eaplatanios Apr 18, 2019
6c04368
Added support for the split op and its VJP.
eaplatanios Apr 19, 2019
ca8ce02
Added VJPs for stacking and tiling.
eaplatanios Apr 19, 2019
26e9123
Added VJP for concatenating.
eaplatanios Apr 19, 2019
87db644
Added the gathering VJP.
eaplatanios Apr 19, 2019
49bfe8d
Bug fixes.
eaplatanios Apr 19, 2019
10de441
Added an 'Optimizable' protocol.
eaplatanios Apr 19, 2019
64159f2
Merged upstream changes.
eaplatanios Apr 19, 2019
a630396
Moved some more activation functions from the stdlib.
eaplatanios Apr 19, 2019
c3243f4
Added log-softmax VJP.
eaplatanios Apr 19, 2019
4547a6d
Minor bug fix.
eaplatanios Apr 20, 2019
19cdbd9
Brought some initializers from stdlib.
eaplatanios Apr 20, 2019
a16d911
Brought some more stuff from the stdlib.
eaplatanios Apr 20, 2019
34b475a
Minor edit.
eaplatanios Apr 20, 2019
86072a4
Moved some more stuff to swift-apis.
eaplatanios Apr 20, 2019
bc0a581
Removed all the newly-added ops.
eaplatanios Apr 20, 2019
a91c00a
Moved some more stuff to swift-apis.
eaplatanios Apr 20, 2019
0ad9843
Moved some more stuff to swift-apis.
eaplatanios Apr 20, 2019
1120692
Added a README file to the 'Operators' source directory.
eaplatanios Apr 20, 2019
e7a04d2
Brought the gradient helper functions from the stdlib.
eaplatanios Apr 20, 2019
3ee21ff
Bug fixes.
eaplatanios Apr 20, 2019
ef1c73b
Brought the tensor tests from the stdlib.
eaplatanios Apr 20, 2019
0e06843
Minor bug fix.
eaplatanios Apr 20, 2019
eb407cf
Addressed Richard's comments.
eaplatanios Apr 20, 2019
f4b7e01
Minor edit.
eaplatanios Apr 20, 2019
b207e42
Reverted the change in the existing optimizer implementations.
eaplatanios Apr 20, 2019
3dcd46d
Added VJPs for some operations.
eaplatanios Apr 20, 2019
5548c56
Incorporated fix from stdlib.
eaplatanios Apr 21, 2019
89fb4e4
Addressed Richard's feedback.
eaplatanios Apr 21, 2019
61eae26
Changed the indentation in the 'PythonConversion.swift' file.
eaplatanios Apr 21, 2019
3cdd808
Changed the indentation in the 'Random.swift' file.
eaplatanios Apr 21, 2019
4b87827
Minor edit.
eaplatanios Apr 21, 2019
a5edd32
Tabs to spaces.
eaplatanios Apr 21, 2019
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
23 changes: 19 additions & 4 deletions Sources/DeepLearning/Operators/NN.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,8 @@ public extension Tensor where Scalar: TensorFlowFloatingPoint {
/// A padding scheme. Used by padding, convolution, and pooling ops.
// @_frozen // SR-9739
public enum Padding {
/// The "explicit" padding scheme.
case explicit(paddings: [Int32])
/// The "valid" padding scheme.
case valid
/// The "same" padding scheme.
Expand All @@ -94,12 +96,22 @@ public enum Padding {

public extension Padding {
@inlinable
var raw: Raw.Padding {
var raw: Raw.Padding2 {
switch self {
case .explicit: return .explicit
case .same: return .same
case .valid: return .valid
}
}

@inlinable
var explicitPaddings: [Int32] {
switch self {
case .explicit(let paddings): return paddings
case .same: return []
case .valid: return []
}
}
}

public extension Tensor where Scalar: TensorFlowFloatingPoint {
Expand All @@ -117,7 +129,8 @@ public extension Tensor where Scalar: TensorFlowFloatingPoint {
filter: filter,
outBackprop: self,
strides: [strides.0, strides.1, strides.2, strides.3],
padding: padding.raw)
padding: padding.raw,
explicitPaddings: padding.explicitPaddings)
}

/// TensorFlow builtin conv2d gradient helper for the filter.
Expand All @@ -134,7 +147,8 @@ public extension Tensor where Scalar: TensorFlowFloatingPoint {
filterSizes: filterSizes,
outBackprop: self,
strides: [strides.0, strides.1, strides.2, strides.3],
padding: padding.raw)
padding: padding.raw,
explicitPaddings: padding.explicitPaddings)
}

@inlinable
Expand Down Expand Up @@ -264,7 +278,8 @@ public extension Tensor where Scalar: FloatingPoint {
self,
filter: filter,
strides: [strides.0, strides.1, strides.2, strides.3],
padding: padding.raw)
padding: padding.raw,
explicitPaddings: padding.explicitPaddings)
}

/// Computes a 2-D max pooling, with the specified kernel sizes, strides, and
Expand Down